test: adopt functional tests to new API

Author: ilfa

examples/src/main/java/com/fingerprint/example/FunctionalTests.java

@@ -19,7 +19,7 @@ public static void main(String... args) {
         String FPJS_REQUEST_ID_TO_UPDATE = System.getenv("FPJS_REQUEST_ID_TO_UPDATE");
         String FPJS_VISITOR_ID_TO_DELETE = System.getenv("FPJS_VISITOR_ID_TO_DELETE");
         String FPJS_VISITOR_ID = "";
-        String FPJS_REQUEST_ID = "";
+        String FPJS_EVENT_ID = "";
 
         // Create a new instance of the API client
         ApiClient client = Configuration.getDefaultApiClient(FPJS_API_SECRET, FPJS_API_REGION != null ? FPJS_API_REGION : "us");
@@ -30,17 +30,18 @@ public static void main(String... args) {
 
         // Search events
         try {
-            final SearchEventsResponse events = api.searchEvents(2, new FingerprintApi.SearchEventsOptionalParams()
+            final EventSearch events = api.searchEvents(new FingerprintApi.SearchEventsOptionalParams()
+                    .setLimit(2)
                     .setStart(start)
                     .setEnd(end)
             );
             if (events.getEvents().isEmpty()) {
                 System.err.println("FingerprintApi.searchEvents: is empty");
                 System.exit(1);
             }
-            Identification firstEventIdentificationData = events.getEvents().get(0).getProducts().getIdentification().getData();
-            FPJS_VISITOR_ID = firstEventIdentificationData.getVisitorId();
-            FPJS_REQUEST_ID = firstEventIdentificationData.getRequestId();
+            Event firstEvent = events.getEvents().get(0);
+            FPJS_VISITOR_ID = firstEvent.getIdentification().getVisitorId();
+            FPJS_EVENT_ID = firstEvent.getEventId();
             System.out.println(events.getEvents());
         } catch (ApiException e) {
             System.err.println("Exception when calling FingerprintApi.searchEvents:" + e.getMessage());
@@ -49,30 +50,21 @@ public static void main(String... args) {
 
         // Get identification event
         try {
-            final EventsGetResponse event = api.getEvent(FPJS_REQUEST_ID);
+            final Event event = api.getEvent(FPJS_EVENT_ID);
             System.out.println(event);
         } catch (ApiException e) {
             System.err.println("Exception when calling FingerprintApi.getEvent:" + e.getMessage());
             System.exit(1);
         }
 
-        // Get visitor history
-        try {
-            final VisitorsGetResponse visits = api.getVisits(FPJS_VISITOR_ID, null, null, null, null, null);
-            System.out.println(visits);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FingerprintApi.getEvent:" + e.getMessage());
-            System.exit(1);
-        }
-
         // Update identification event
 
         if (FPJS_REQUEST_ID_TO_UPDATE != null) {
             try {
                 final HashMap<String, Object> tags = new HashMap() {{
                     put("timestamp", new Timestamp(new Date().getTime()));
                 }};
-                api.updateEvent(FPJS_REQUEST_ID_TO_UPDATE, new EventsUpdateRequest().tag(tags));
+                api.updateEvent(FPJS_REQUEST_ID_TO_UPDATE, new EventUpdate().tags(tags));
             } catch (ApiException e) {
                 System.err.println("Exception when calling FingerprintApi.updateEvent:" + e.getMessage());
                 System.exit(1);
@@ -92,7 +84,8 @@ public static void main(String... args) {
 
         // Check that old events are still match expected format
         try {
-            final SearchEventsResponse oldEvents = api.searchEvents(2, new FingerprintApi.SearchEventsOptionalParams()
+            final EventSearch oldEvents = api.searchEvents(new FingerprintApi.SearchEventsOptionalParams()
+                    .setLimit(2)
                     .setStart(start)
                     .setEnd(end)
                     .setReverse(true)
@@ -101,17 +94,16 @@ public static void main(String... args) {
                 System.err.println("FingerprintApi.searchEvents: is empty for old events");
                 System.exit(1);
             }
-            Identification oldEventIdentificationData = oldEvents.getEvents().get(0).getProducts().getIdentification().getData();
-            String FPJS_OLD_VISITOR_ID = oldEventIdentificationData.getVisitorId();
-            String FPJS_OLD_REQUEST_ID = oldEventIdentificationData.getRequestId();
+            Event oldEvent = oldEvents.getEvents().get(0);
+            String FPJS_OLD_VISITOR_ID = oldEvent.getIdentification().getVisitorId();
+            String FPJS_OLD_EVENT_ID = oldEvent.getEventId();
 
-            if (FPJS_VISITOR_ID.equals(FPJS_OLD_VISITOR_ID) || FPJS_REQUEST_ID.equals(FPJS_OLD_REQUEST_ID)) {
+            if (FPJS_VISITOR_ID.equals(FPJS_OLD_VISITOR_ID) || FPJS_EVENT_ID.equals(FPJS_OLD_EVENT_ID)) {
                 System.err.println("Old events are identical to new");
                 System.exit(1);
             }
 
-            api.getEvent(FPJS_OLD_REQUEST_ID);
-            api.getVisits(FPJS_OLD_VISITOR_ID, null, null, null, null, null);
+            api.getEvent(FPJS_OLD_EVENT_ID);
             System.out.println("Old events are good");
         } catch (ApiException e) {
             System.err.println("Exception when trying to read old data:" + e.getMessage());

examples/src/main/java/com/fingerprint/example/SealedResults.java

@@ -1,7 +1,7 @@
 package com.fingerprint.example;
 
 import com.fingerprint.Sealed;
-import com.fingerprint.model.EventsGetResponse;
+import com.fingerprint.model.Event;
 
 import java.util.Base64;
 
@@ -10,7 +10,7 @@ public static void main(String... args) throws Exception {
         String SEALED_RESULT = System.getenv("BASE64_SEALED_RESULT");
         String SEALED_KEY = System.getenv("BASE64_KEY");
 
-        final EventsGetResponse event = Sealed.unsealEventResponse(
+        final Event event = Sealed.unsealEventResponse(
                 Base64.getDecoder().decode(SEALED_RESULT),
                 new Sealed.DecryptionKey[]{
                         new Sealed.DecryptionKey(