From 715457ac955f85bacb1da3b3c31f408c091bd7e6 Mon Sep 17 00:00:00 2001 From: MananMukim Date: Fri, 26 Aug 2022 00:20:38 +0530 Subject: [PATCH 1/4] Updated Verify Activity and Match Response --- .../models/Response/ActivityResponse.java | 3 +++ .../apilib/models/Response/MatchResponse.java | 21 ++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ActivityResponse.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ActivityResponse.java index 80c3107..3511754 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ActivityResponse.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ActivityResponse.java @@ -8,4 +8,7 @@ @NoArgsConstructor public class ActivityResponse extends FCResponse { Double emails; + Double online; + Double social; + Double employment; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/MatchResponse.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/MatchResponse.java index f173b52..e734246 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/MatchResponse.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/MatchResponse.java @@ -7,16 +7,13 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class MatchResponse extends FCResponse { - private Boolean city, - region, - country, - continent, - postalCode, - familyName, - givenName, - phone, - email, - maid, - social, - nonId; + private String city; + private String region; + private String country; + private String postalCode; + private String familyName; + private String givenName; + private String phone; + private String email; + private Double risk; } From f6ed3be8aa6c8ee572872cd807946650390a30c4 Mon Sep 17 00:00:00 2001 From: MananMukim Date: Fri, 26 Aug 2022 00:21:28 +0530 Subject: [PATCH 2/4] Update Verify Response Test --- .../apilib/enrich/VerifyResponseTest.java | 18 +++++++-------- .../resources/verifyActivityResponse.json | 5 +++- .../test/resources/verifyMatchResponse.json | 17 +++++++------- .../apilib/enrich/VerifyResponseTest.java | 23 +++++++++---------- .../resources/verifyActivityResponse.json | 5 +++- .../test/resources/verifyMatchResponse.json | 17 +++++++------- 6 files changed, 46 insertions(+), 39 deletions(-) diff --git a/java11/src/test/java/com/fullcontact/apilib/enrich/VerifyResponseTest.java b/java11/src/test/java/com/fullcontact/apilib/enrich/VerifyResponseTest.java index 65813bc..7cb2b40 100644 --- a/java11/src/test/java/com/fullcontact/apilib/enrich/VerifyResponseTest.java +++ b/java11/src/test/java/com/fullcontact/apilib/enrich/VerifyResponseTest.java @@ -42,7 +42,10 @@ public void activityResponseModelDeserializationTest() { Assert.assertTrue(response.isSuccessful()); Assert.assertEquals(200, response.getStatusCode()); Assert.assertEquals("OK", response.getMessage()); - Assert.assertEquals("0.61", String.valueOf(response.getEmails())); + Assert.assertEquals("0.82", String.valueOf(response.getEmails())); + Assert.assertEquals("0.32", String.valueOf(response.getSocial())); + Assert.assertEquals("0.78", String.valueOf(response.getEmployment())); + Assert.assertEquals("0.91", String.valueOf(response.getOnline())); } @Test @@ -55,14 +58,11 @@ public void matchResponseModelDeserializationTest() { Assert.assertTrue(response.isSuccessful()); Assert.assertEquals(200, response.getStatusCode()); Assert.assertEquals("OK", response.getMessage()); - Assert.assertFalse(response.getEmail()); - Assert.assertFalse(response.getMaid()); - Assert.assertTrue(response.getGivenName()); - Assert.assertTrue(response.getFamilyName()); - Assert.assertTrue(response.getContinent()); - Assert.assertTrue(response.getPostalCode()); - Assert.assertTrue(response.getCountry()); - Assert.assertTrue(response.getCity()); + Assert.assertEquals("self", response.getEmail()); + Assert.assertEquals("household", response.getFamilyName()); + Assert.assertEquals("household", response.getPostalCode()); + Assert.assertEquals("household", response.getCountry()); + Assert.assertEquals("household", response.getCity()); } @Test diff --git a/java11/src/test/resources/verifyActivityResponse.json b/java11/src/test/resources/verifyActivityResponse.json index 014e8ac..64846bc 100644 --- a/java11/src/test/resources/verifyActivityResponse.json +++ b/java11/src/test/resources/verifyActivityResponse.json @@ -1,3 +1,6 @@ { - "emails": 0.61 + "emails" : 0.82, + "online" : 0.91, + "social" : 0.32, + "employment" : 0.78 } \ No newline at end of file diff --git a/java11/src/test/resources/verifyMatchResponse.json b/java11/src/test/resources/verifyMatchResponse.json index 7dbead4..3658603 100644 --- a/java11/src/test/resources/verifyMatchResponse.json +++ b/java11/src/test/resources/verifyMatchResponse.json @@ -1,10 +1,11 @@ { - "city": true, - "country": true, - "continent": true, - "postalCode": true, - "familyName": true, - "givenName": true, - "email": false, - "maid": false + "city" : "household", + "region" : "household", + "country" : "household", + "postalCode" : "household", + "givenName" : "unknown", + "familyName": "household", + "phone" : "tangled", + "email" : "self", + "risk" : 0.21 } \ No newline at end of file diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/VerifyResponseTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/VerifyResponseTest.java index 32f6f23..e628c29 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/VerifyResponseTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/VerifyResponseTest.java @@ -9,14 +9,13 @@ import com.fullcontact.apilib.models.Response.ActivityResponse; import com.fullcontact.apilib.models.Response.MatchResponse; import com.fullcontact.apilib.models.Response.SignalsResponse; +import java.util.HashMap; +import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.util.HashMap; -import java.util.concurrent.ExecutionException; - public class VerifyResponseTest { private static HashMap customHeader = new HashMap<>(); @@ -79,7 +78,10 @@ public void activityResponseModelDeserializationTest() Assert.assertTrue(response.isSuccessful()); Assert.assertEquals(200, response.getStatusCode()); Assert.assertEquals("OK", response.getMessage()); - Assert.assertEquals("0.61", String.valueOf(response.getEmails())); + Assert.assertEquals("0.82", String.valueOf(response.getEmails())); + Assert.assertEquals("0.32", String.valueOf(response.getSocial())); + Assert.assertEquals("0.78", String.valueOf(response.getEmployment())); + Assert.assertEquals("0.91", String.valueOf(response.getOnline())); } @Test @@ -110,14 +112,11 @@ public void matchResponseModelDeserializationTest() Assert.assertTrue(response.isSuccessful()); Assert.assertEquals(200, response.getStatusCode()); Assert.assertEquals("OK", response.getMessage()); - Assert.assertFalse(response.getEmail()); - Assert.assertFalse(response.getMaid()); - Assert.assertTrue(response.getGivenName()); - Assert.assertTrue(response.getFamilyName()); - Assert.assertTrue(response.getContinent()); - Assert.assertTrue(response.getPostalCode()); - Assert.assertTrue(response.getCountry()); - Assert.assertTrue(response.getCity()); + Assert.assertEquals("self", response.getEmail()); + Assert.assertEquals("household", response.getFamilyName()); + Assert.assertEquals("household", response.getPostalCode()); + Assert.assertEquals("household", response.getCountry()); + Assert.assertEquals("household", response.getCity()); } @Test diff --git a/java8/src/test/resources/verifyActivityResponse.json b/java8/src/test/resources/verifyActivityResponse.json index 014e8ac..64846bc 100644 --- a/java8/src/test/resources/verifyActivityResponse.json +++ b/java8/src/test/resources/verifyActivityResponse.json @@ -1,3 +1,6 @@ { - "emails": 0.61 + "emails" : 0.82, + "online" : 0.91, + "social" : 0.32, + "employment" : 0.78 } \ No newline at end of file diff --git a/java8/src/test/resources/verifyMatchResponse.json b/java8/src/test/resources/verifyMatchResponse.json index 7dbead4..3658603 100644 --- a/java8/src/test/resources/verifyMatchResponse.json +++ b/java8/src/test/resources/verifyMatchResponse.json @@ -1,10 +1,11 @@ { - "city": true, - "country": true, - "continent": true, - "postalCode": true, - "familyName": true, - "givenName": true, - "email": false, - "maid": false + "city" : "household", + "region" : "household", + "country" : "household", + "postalCode" : "household", + "givenName" : "unknown", + "familyName": "household", + "phone" : "tangled", + "email" : "self", + "risk" : 0.21 } \ No newline at end of file From 05466c42e3e5fa76707036eb38c276aea1ca4add Mon Sep 17 00:00:00 2001 From: MananMukim Date: Fri, 26 Aug 2022 00:24:42 +0530 Subject: [PATCH 3/4] Updated Version, Readme and Google Java Format update --- .../java/com/fullcontact/apilib/FCConstants.java | 2 +- .../apilib/auth/DefaultCredentialProvider.java | 4 ++-- .../apilib/models/Request/AudienceRequest.java | 5 ++--- .../apilib/models/Request/MultifieldRequest.java | 3 +-- .../models/Request/PermissionRequestBasic.java | 3 +-- .../apilib/models/Request/PersonRequest.java | 3 +-- .../apilib/models/Request/PurposeRequest.java | 3 +-- .../apilib/models/Request/ResolveRequest.java | 2 +- .../apilib/models/Request/TagsRequest.java | 5 ++--- .../apilib/models/Response/AudienceResponse.java | 3 +-- .../apilib/models/Response/CompanyDetails.java | 3 +-- .../apilib/models/Response/CompanyResponse.java | 2 -- .../apilib/models/Response/Details.java | 3 +-- .../apilib/models/Response/Identifiers.java | 3 +-- .../apilib/models/Response/Interest.java | 3 +-- .../apilib/models/Response/Ownership.java | 3 +-- .../Response/PermissionCurrentResponseMap.java | 3 +-- .../models/Response/PermissionResponse.java | 3 +-- .../models/Response/PermissionResponseList.java | 3 +-- .../apilib/models/Response/PersonResponse.java | 3 +-- .../apilib/models/Response/ProfileData.java | 3 +-- .../apilib/models/Response/ResolveResponse.java | 3 +-- .../models/Response/ResolveResponseWithTags.java | 3 +-- .../apilib/models/Response/SignalsResponse.java | 3 +-- .../apilib/models/Response/TagsResponse.java | 3 +-- java11/README.md | 5 +++-- .../fullcontact/apilib/enrich/FullContact.java | 7 ++++--- .../apilib/enrich/AudienceRequestBuildTest.java | 9 ++++----- .../apilib/enrich/AudienceResponseBuildTest.java | 3 +-- .../apilib/enrich/CompanyRequestBuildTest.java | 5 ++--- .../apilib/enrich/FullContactClientTest.java | 3 +-- .../apilib/enrich/HttpResponseTestObjects.java | 2 +- .../apilib/enrich/PermissionRequestTest.java | 9 ++++----- .../apilib/enrich/PersonRequestTest.java | 9 ++++----- .../apilib/enrich/ResolveRequestBuildTest.java | 9 ++++----- .../apilib/enrich/ResolveResponseTest.java | 3 +-- .../apilib/enrich/TagsRequestBuildTest.java | 9 ++++----- java8/README.md | 5 +++-- .../com/fullcontact/apilib/FullContactApi.java | 3 +-- .../apilib/enrich/FCOkHttpInterceptor.java | 5 +---- .../fullcontact/apilib/enrich/FullContact.java | 15 +++++++-------- .../fullcontact/apilib/test/MockInterceptor.java | 3 +-- .../apilib/enrich/AudienceRequestBuildTest.java | 9 ++++----- .../apilib/enrich/AudienceResponseTest.java | 7 +++---- .../apilib/enrich/CompanyEnrichResponse.java | 5 ++--- .../apilib/enrich/CompanyRequestBuildTest.java | 5 ++--- .../fullcontact/apilib/enrich/FCResponseTest.java | 5 ++--- .../apilib/enrich/FullContactClientTest.java | 3 +-- .../apilib/enrich/PermissionRequestTest.java | 9 ++++----- .../apilib/enrich/PermissionResponseTest.java | 5 ++--- .../apilib/enrich/PersonRequestTest.java | 9 ++++----- .../apilib/enrich/PersonResponseTest.java | 5 ++--- .../apilib/enrich/ResolveRequestBuildTest.java | 9 ++++----- .../apilib/enrich/ResolveResponseTest.java | 5 ++--- .../apilib/enrich/TagsRequestBuildTest.java | 9 ++++----- .../apilib/enrich/TagsResponseTest.java | 5 ++--- 56 files changed, 111 insertions(+), 160 deletions(-) diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/FCConstants.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/FCConstants.java index 97c0c45..c68b600 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/FCConstants.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/FCConstants.java @@ -5,7 +5,7 @@ /** Defines the constants used in FullContact client */ public class FCConstants { public static final String API_BASE_DEFAULT = "https://api.fullcontact.com/v3/"; - public static final String VERSION = "4.0.0"; + public static final String VERSION = "4.1.0"; // User Agent public static final String USER_AGENT_Java8 = "FullContact_Java8_Client_V" + VERSION; diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/auth/DefaultCredentialProvider.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/auth/DefaultCredentialProvider.java index e024482..3b32b59 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/auth/DefaultCredentialProvider.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/auth/DefaultCredentialProvider.java @@ -1,10 +1,10 @@ package com.fullcontact.apilib.auth; +import static com.fullcontact.apilib.auth.CredentialConstants.*; + import com.fullcontact.apilib.FullContactException; import lombok.Getter; -import static com.fullcontact.apilib.auth.CredentialConstants.*; - /** Default way of providing authentication through Environment variables */ @Getter public class DefaultCredentialProvider implements CredentialsProvider { diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/AudienceRequest.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/AudienceRequest.java index 693d183..cc825a9 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/AudienceRequest.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/AudienceRequest.java @@ -2,14 +2,13 @@ import com.fullcontact.apilib.FullContactException; import com.fullcontact.apilib.models.Tag; +import java.util.Collections; +import java.util.List; import lombok.Builder; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Singular; -import java.util.Collections; -import java.util.List; - @Builder(toBuilder = true) @EqualsAndHashCode @Getter diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/MultifieldRequest.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/MultifieldRequest.java index 6a45e0d..b4bb3c7 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/MultifieldRequest.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/MultifieldRequest.java @@ -4,11 +4,10 @@ import com.fullcontact.apilib.models.Location; import com.fullcontact.apilib.models.PersonName; import com.fullcontact.apilib.models.Profile; +import java.util.List; import lombok.*; import lombok.experimental.SuperBuilder; -import java.util.List; - @Getter @SuperBuilder(toBuilder = true) @AllArgsConstructor diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/PermissionRequestBasic.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/PermissionRequestBasic.java index adb1580..f4c329b 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/PermissionRequestBasic.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/PermissionRequestBasic.java @@ -1,11 +1,10 @@ package com.fullcontact.apilib.models.Request; import com.fullcontact.apilib.FullContactException; +import java.util.List; import lombok.*; import lombok.experimental.SuperBuilder; -import java.util.List; - @SuperBuilder(toBuilder = true) @EqualsAndHashCode @Getter diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/PersonRequest.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/PersonRequest.java index 4f97193..7da33e3 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/PersonRequest.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/PersonRequest.java @@ -1,13 +1,12 @@ package com.fullcontact.apilib.models.Request; import com.fullcontact.apilib.models.enums.Confidence; +import java.util.List; import lombok.Builder; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.experimental.SuperBuilder; -import java.util.List; - /** Class to create request for Person Enrich */ @Getter @EqualsAndHashCode(callSuper = true) diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/PurposeRequest.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/PurposeRequest.java index ec4ffc1..543843c 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/PurposeRequest.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/PurposeRequest.java @@ -1,12 +1,11 @@ package com.fullcontact.apilib.models.Request; import com.fullcontact.apilib.FullContactException; +import java.util.List; import lombok.Builder; import lombok.EqualsAndHashCode; import lombok.Getter; -import java.util.List; - @EqualsAndHashCode @Builder(toBuilder = true) @Getter diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/ResolveRequest.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/ResolveRequest.java index 1315bda..ad45ef9 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/ResolveRequest.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/ResolveRequest.java @@ -2,12 +2,12 @@ import com.fullcontact.apilib.FullContactException; import com.fullcontact.apilib.models.Tag; +import java.util.List; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Singular; import lombok.experimental.SuperBuilder; -import java.util.List; /** Class to create request for Resolve */ @Getter @EqualsAndHashCode(callSuper = true) diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/TagsRequest.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/TagsRequest.java index f83e466..19e07ad 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/TagsRequest.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Request/TagsRequest.java @@ -2,14 +2,13 @@ import com.fullcontact.apilib.FullContactException; import com.fullcontact.apilib.models.Tag; +import java.util.Collections; +import java.util.List; import lombok.Builder; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Singular; -import java.util.Collections; -import java.util.List; - @EqualsAndHashCode @Builder(toBuilder = true) @Getter diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/AudienceResponse.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/AudienceResponse.java index d5ab318..004c3cc 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/AudienceResponse.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/AudienceResponse.java @@ -1,10 +1,9 @@ package com.fullcontact.apilib.models.Response; -import lombok.*; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import lombok.*; @Getter @ToString diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/CompanyDetails.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/CompanyDetails.java index fcdf082..cda3642 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/CompanyDetails.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/CompanyDetails.java @@ -1,13 +1,12 @@ package com.fullcontact.apilib.models.Response; import com.fullcontact.apilib.models.Location; +import java.util.List; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import java.util.List; - @Getter @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/CompanyResponse.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/CompanyResponse.java index 8a8deb2..503849b 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/CompanyResponse.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/CompanyResponse.java @@ -2,8 +2,6 @@ import lombok.*; -import java.util.List; - @Getter @ToString @AllArgsConstructor(access = AccessLevel.PROTECTED) diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Details.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Details.java index 9b55f0c..96b6dfe 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Details.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Details.java @@ -2,13 +2,12 @@ import com.fullcontact.apilib.models.Location; import com.fullcontact.apilib.models.PersonName; +import java.util.List; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import java.util.List; - @Getter @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Identifiers.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Identifiers.java index b1ea508..a4599cd 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Identifiers.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Identifiers.java @@ -1,12 +1,11 @@ package com.fullcontact.apilib.models.Response; +import java.util.List; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import java.util.List; - @Getter @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Interest.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Interest.java index 4d15988..9e7fff9 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Interest.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Interest.java @@ -1,12 +1,11 @@ package com.fullcontact.apilib.models.Response; +import java.util.List; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import java.util.List; - @Getter @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Ownership.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Ownership.java index 497646a..8926ce5 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Ownership.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Ownership.java @@ -1,12 +1,11 @@ package com.fullcontact.apilib.models.Response; +import java.util.List; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import java.util.List; - @Getter @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PermissionCurrentResponseMap.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PermissionCurrentResponseMap.java index d71356c..8178aa0 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PermissionCurrentResponseMap.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PermissionCurrentResponseMap.java @@ -1,12 +1,11 @@ package com.fullcontact.apilib.models.Response; +import java.util.Map; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import java.util.Map; - @Getter @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PermissionResponse.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PermissionResponse.java index fef79fe..f24ddc9 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PermissionResponse.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PermissionResponse.java @@ -1,12 +1,11 @@ package com.fullcontact.apilib.models.Response; +import java.util.List; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import java.util.List; - @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PROTECTED) @Getter diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PermissionResponseList.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PermissionResponseList.java index 6652f4a..75be629 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PermissionResponseList.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PermissionResponseList.java @@ -1,12 +1,11 @@ package com.fullcontact.apilib.models.Response; +import java.util.List; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import java.util.List; - @Getter @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PersonResponse.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PersonResponse.java index 4a481e7..b13a18d 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PersonResponse.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/PersonResponse.java @@ -1,11 +1,10 @@ package com.fullcontact.apilib.models.Response; import com.fullcontact.apilib.models.Location; -import lombok.*; - import java.util.List; import java.util.Map; import java.util.Optional; +import lombok.*; @Getter @ToString diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ProfileData.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ProfileData.java index ba1e6aa..5015b63 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ProfileData.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ProfileData.java @@ -1,12 +1,11 @@ package com.fullcontact.apilib.models.Response; +import java.util.List; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import java.util.List; - @Getter @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ResolveResponse.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ResolveResponse.java index 40b6e4c..7fc6015 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ResolveResponse.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ResolveResponse.java @@ -1,9 +1,8 @@ package com.fullcontact.apilib.models.Response; import com.fullcontact.apilib.models.Tag; -import lombok.*; - import java.util.List; +import lombok.*; @Getter @ToString diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ResolveResponseWithTags.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ResolveResponseWithTags.java index d87a117..622ca06 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ResolveResponseWithTags.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ResolveResponseWithTags.java @@ -1,9 +1,8 @@ package com.fullcontact.apilib.models.Response; +import com.fullcontact.apilib.models.Tag; import java.util.List; import java.util.Map; - -import com.fullcontact.apilib.models.Tag; import lombok.*; @Getter diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/SignalsResponse.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/SignalsResponse.java index b1cb0ef..76616d7 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/SignalsResponse.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/SignalsResponse.java @@ -1,8 +1,7 @@ package com.fullcontact.apilib.models.Response; -import lombok.*; - import java.util.List; +import lombok.*; @Getter @ToString diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/TagsResponse.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/TagsResponse.java index 8720c81..a28e595 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/TagsResponse.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/TagsResponse.java @@ -1,9 +1,8 @@ package com.fullcontact.apilib.models.Response; import com.fullcontact.apilib.models.Tag; -import lombok.*; - import java.util.List; +import lombok.*; @Getter @ToString diff --git a/java11/README.md b/java11/README.md index 2a330fa..6cd37bf 100644 --- a/java11/README.md +++ b/java11/README.md @@ -55,7 +55,7 @@ at: https://platform.fullcontact.com/docs Add this dependency to your project's build file: ```groovy -implementation 'com.fullcontact.client:java11:4.0.0' +implementation 'com.fullcontact.client:java11:4.1.0' ``` ### Maven users @@ -66,7 +66,7 @@ Add this dependency to your project's POM: com.fullcontact.client java11 - 4.0.0 + 4.1.0 ``` @@ -681,6 +681,7 @@ Assert.assertTrue(response.isEnabled()); ``` ## Changelog +- v4.1.0 - Updated Verify Activity and Match Response. - v4.0.0 - Removed Company Search, Email Verification and verifiedPhysical support. Added Verify APIs. - v3.1.0 - Support got identity.mapResolve, panoramaId, generatePid. Remove 'expandedInterests' - v3.0.2 - Support for verifiedPhysical, expandedInterests, maxMaids, Epsilon data (in PersonResponse) diff --git a/java11/src/main/java/com/fullcontact/apilib/enrich/FullContact.java b/java11/src/main/java/com/fullcontact/apilib/enrich/FullContact.java index 5d504e1..72cce31 100644 --- a/java11/src/main/java/com/fullcontact/apilib/enrich/FullContact.java +++ b/java11/src/main/java/com/fullcontact/apilib/enrich/FullContact.java @@ -10,8 +10,6 @@ import com.fullcontact.apilib.retry.RetryHandler; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import lombok.Builder; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Type; import java.net.URI; @@ -28,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; +import lombok.Builder; /** * The FullContact class represents FullContact client. It supports V3 Person Enrich, Company Enrich @@ -81,7 +80,9 @@ private String[] processHeader(Map customHeaders) { headers.put("Authorization", "Bearer " + this.credentialsProvider.getApiKey()); headers.put("Content-Type", "application/json"); headers.put("User-Agent", FCConstants.USER_AGENT_Java11); - return headers.entrySet().stream() + return headers + .entrySet() + .stream() .filter(entry -> entry.getValue() != null) .flatMap(entry -> Stream.of(entry.getKey(), entry.getValue())) .collect(Collectors.toList()) diff --git a/java11/src/test/java/com/fullcontact/apilib/enrich/AudienceRequestBuildTest.java b/java11/src/test/java/com/fullcontact/apilib/enrich/AudienceRequestBuildTest.java index 2c116a3..4e96867 100644 --- a/java11/src/test/java/com/fullcontact/apilib/enrich/AudienceRequestBuildTest.java +++ b/java11/src/test/java/com/fullcontact/apilib/enrich/AudienceRequestBuildTest.java @@ -4,16 +4,15 @@ import com.fullcontact.apilib.models.Request.AudienceRequest; import com.fullcontact.apilib.models.Tag; import com.google.gson.Gson; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class AudienceRequestBuildTest { private static final Gson gson = new Gson(); diff --git a/java11/src/test/java/com/fullcontact/apilib/enrich/AudienceResponseBuildTest.java b/java11/src/test/java/com/fullcontact/apilib/enrich/AudienceResponseBuildTest.java index c46d7fe..9c1bb30 100644 --- a/java11/src/test/java/com/fullcontact/apilib/enrich/AudienceResponseBuildTest.java +++ b/java11/src/test/java/com/fullcontact/apilib/enrich/AudienceResponseBuildTest.java @@ -1,13 +1,12 @@ package com.fullcontact.apilib.enrich; import com.fullcontact.apilib.models.Response.AudienceResponse; +import java.io.IOException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.io.IOException; - public class AudienceResponseBuildTest { @Before public void init() { diff --git a/java11/src/test/java/com/fullcontact/apilib/enrich/CompanyRequestBuildTest.java b/java11/src/test/java/com/fullcontact/apilib/enrich/CompanyRequestBuildTest.java index d961e07..edbe763 100644 --- a/java11/src/test/java/com/fullcontact/apilib/enrich/CompanyRequestBuildTest.java +++ b/java11/src/test/java/com/fullcontact/apilib/enrich/CompanyRequestBuildTest.java @@ -2,12 +2,11 @@ import com.fullcontact.apilib.models.Request.CompanyRequest; import com.google.gson.Gson; -import org.junit.Assert; -import org.junit.Test; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; +import org.junit.Assert; +import org.junit.Test; public class CompanyRequestBuildTest { private static final Gson gson = new Gson(); diff --git a/java11/src/test/java/com/fullcontact/apilib/enrich/FullContactClientTest.java b/java11/src/test/java/com/fullcontact/apilib/enrich/FullContactClientTest.java index 3b108cf..2d41dae 100644 --- a/java11/src/test/java/com/fullcontact/apilib/enrich/FullContactClientTest.java +++ b/java11/src/test/java/com/fullcontact/apilib/enrich/FullContactClientTest.java @@ -2,12 +2,11 @@ import com.fullcontact.apilib.FullContactException; import com.fullcontact.apilib.auth.StaticApiKeyCredentialProvider; +import java.util.HashMap; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import java.util.HashMap; - public class FullContactClientTest { @Rule public ExpectedException exceptionRule = ExpectedException.none(); diff --git a/java11/src/test/java/com/fullcontact/apilib/enrich/HttpResponseTestObjects.java b/java11/src/test/java/com/fullcontact/apilib/enrich/HttpResponseTestObjects.java index b142516..80999d8 100644 --- a/java11/src/test/java/com/fullcontact/apilib/enrich/HttpResponseTestObjects.java +++ b/java11/src/test/java/com/fullcontact/apilib/enrich/HttpResponseTestObjects.java @@ -1,6 +1,5 @@ package com.fullcontact.apilib.enrich; -import javax.net.ssl.SSLSession; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.FileReader; @@ -12,6 +11,7 @@ import java.net.http.HttpResponse; import java.util.Optional; import java.util.zip.GZIPOutputStream; +import javax.net.ssl.SSLSession; public class HttpResponseTestObjects { diff --git a/java11/src/test/java/com/fullcontact/apilib/enrich/PermissionRequestTest.java b/java11/src/test/java/com/fullcontact/apilib/enrich/PermissionRequestTest.java index 5332853..a79be51 100644 --- a/java11/src/test/java/com/fullcontact/apilib/enrich/PermissionRequestTest.java +++ b/java11/src/test/java/com/fullcontact/apilib/enrich/PermissionRequestTest.java @@ -6,16 +6,15 @@ import com.fullcontact.apilib.models.Profile; import com.fullcontact.apilib.models.Request.*; import com.google.gson.Gson; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class PermissionRequestTest { private static final Gson gson = new Gson(); diff --git a/java11/src/test/java/com/fullcontact/apilib/enrich/PersonRequestTest.java b/java11/src/test/java/com/fullcontact/apilib/enrich/PersonRequestTest.java index f467f94..7e59df5 100644 --- a/java11/src/test/java/com/fullcontact/apilib/enrich/PersonRequestTest.java +++ b/java11/src/test/java/com/fullcontact/apilib/enrich/PersonRequestTest.java @@ -7,16 +7,15 @@ import com.fullcontact.apilib.models.Request.PersonRequest; import com.fullcontact.apilib.models.enums.Confidence; import com.google.gson.Gson; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class PersonRequestTest { private static final Gson gson = new Gson(); diff --git a/java11/src/test/java/com/fullcontact/apilib/enrich/ResolveRequestBuildTest.java b/java11/src/test/java/com/fullcontact/apilib/enrich/ResolveRequestBuildTest.java index 0f0357d..703c870 100644 --- a/java11/src/test/java/com/fullcontact/apilib/enrich/ResolveRequestBuildTest.java +++ b/java11/src/test/java/com/fullcontact/apilib/enrich/ResolveRequestBuildTest.java @@ -7,16 +7,15 @@ import com.fullcontact.apilib.models.Request.ResolveRequest; import com.fullcontact.apilib.models.Tag; import com.google.gson.Gson; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class ResolveRequestBuildTest { private static final Gson gson = new Gson(); diff --git a/java11/src/test/java/com/fullcontact/apilib/enrich/ResolveResponseTest.java b/java11/src/test/java/com/fullcontact/apilib/enrich/ResolveResponseTest.java index b33f8e2..ec1b4e1 100644 --- a/java11/src/test/java/com/fullcontact/apilib/enrich/ResolveResponseTest.java +++ b/java11/src/test/java/com/fullcontact/apilib/enrich/ResolveResponseTest.java @@ -2,13 +2,12 @@ import com.fullcontact.apilib.models.Response.ResolveResponse; import com.fullcontact.apilib.models.Response.ResolveResponseWithTags; +import java.util.HashMap; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.util.HashMap; - public class ResolveResponseTest { private static HashMap customHeader = new HashMap<>(); diff --git a/java11/src/test/java/com/fullcontact/apilib/enrich/TagsRequestBuildTest.java b/java11/src/test/java/com/fullcontact/apilib/enrich/TagsRequestBuildTest.java index 795890f..1f10f9f 100644 --- a/java11/src/test/java/com/fullcontact/apilib/enrich/TagsRequestBuildTest.java +++ b/java11/src/test/java/com/fullcontact/apilib/enrich/TagsRequestBuildTest.java @@ -4,16 +4,15 @@ import com.fullcontact.apilib.models.Request.TagsRequest; import com.fullcontact.apilib.models.Tag; import com.google.gson.Gson; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class TagsRequestBuildTest { private static final Gson gson = new Gson(); diff --git a/java8/README.md b/java8/README.md index c760a64..a789df9 100644 --- a/java8/README.md +++ b/java8/README.md @@ -55,7 +55,7 @@ at: https://platform.fullcontact.com/docs Add this dependency to your project's build file: ```groovy -implementation 'com.fullcontact.client:java8:4.0.0' +implementation 'com.fullcontact.client:java8:4.1.0' ``` ### Maven users @@ -66,7 +66,7 @@ Add this dependency to your project's POM: com.fullcontact.client java8 - 4.0.0 + 4.1.0 ``` @@ -679,6 +679,7 @@ Assert.assertTrue(response.isEnabled()); ``` ## Changelog +- v4.1.0 - Updated Verify Activity and Match Response. - v4.0.0 - Removed Company Search, Email Verification and verifiedPhysical support. Added Verify APIs. - v3.1.0 - Support got identity.mapResolve, panoramaId, generatePid. Remove 'expandedInterests' - v3.0.2 - Support for verifiedPhysical, expandedInterests, maxMaids, Epsilon data (in PersonResponse) diff --git a/java8/src/main/java/com/fullcontact/apilib/FullContactApi.java b/java8/src/main/java/com/fullcontact/apilib/FullContactApi.java index 18a7cb3..7077627 100644 --- a/java8/src/main/java/com/fullcontact/apilib/FullContactApi.java +++ b/java8/src/main/java/com/fullcontact/apilib/FullContactApi.java @@ -1,5 +1,6 @@ package com.fullcontact.apilib; +import java.util.concurrent.CompletableFuture; import okhttp3.RequestBody; import okhttp3.ResponseBody; import retrofit2.Response; @@ -8,8 +9,6 @@ import retrofit2.http.POST; import retrofit2.http.Query; -import java.util.concurrent.CompletableFuture; - /** * Defines all the Retrofit endpoints for the FullContact API. All requests are HTTP POST type with * Asynchronous processing and returns a CompletableFuture diff --git a/java8/src/main/java/com/fullcontact/apilib/enrich/FCOkHttpInterceptor.java b/java8/src/main/java/com/fullcontact/apilib/enrich/FCOkHttpInterceptor.java index 2e01778..b6442cf 100644 --- a/java8/src/main/java/com/fullcontact/apilib/enrich/FCOkHttpInterceptor.java +++ b/java8/src/main/java/com/fullcontact/apilib/enrich/FCOkHttpInterceptor.java @@ -1,13 +1,10 @@ package com.fullcontact.apilib.enrich; -import com.fullcontact.apilib.FCConstants; -import okhttp3.HttpUrl; +import java.io.IOException; import okhttp3.Interceptor; import okhttp3.Request; import okhttp3.Response; -import java.io.IOException; - public class FCOkHttpInterceptor implements Interceptor { @Override public Response intercept(Chain chain) throws IOException { diff --git a/java8/src/main/java/com/fullcontact/apilib/enrich/FullContact.java b/java8/src/main/java/com/fullcontact/apilib/enrich/FullContact.java index e31da1e..9ed45fc 100644 --- a/java8/src/main/java/com/fullcontact/apilib/enrich/FullContact.java +++ b/java8/src/main/java/com/fullcontact/apilib/enrich/FullContact.java @@ -13,14 +13,6 @@ import com.fullcontact.apilib.test.MockInterceptor; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import lombok.Builder; -import lombok.SneakyThrows; -import okhttp3.*; -import okhttp3.logging.HttpLoggingInterceptor; -import okio.Buffer; -import retrofit2.Response; -import retrofit2.Retrofit; - import java.io.IOException; import java.lang.reflect.Type; import java.util.ArrayList; @@ -30,6 +22,13 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import lombok.Builder; +import lombok.SneakyThrows; +import okhttp3.*; +import okhttp3.logging.HttpLoggingInterceptor; +import okio.Buffer; +import retrofit2.Response; +import retrofit2.Retrofit; /** * The FullContact class represents FullContact client. It supports V3 Person Enrich, Company Enrich diff --git a/java8/src/main/java/com/fullcontact/apilib/test/MockInterceptor.java b/java8/src/main/java/com/fullcontact/apilib/test/MockInterceptor.java index efa5d23..2eb136e 100644 --- a/java8/src/main/java/com/fullcontact/apilib/test/MockInterceptor.java +++ b/java8/src/main/java/com/fullcontact/apilib/test/MockInterceptor.java @@ -1,12 +1,11 @@ package com.fullcontact.apilib.test; -import okhttp3.*; - import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.FileReader; import java.io.IOException; import java.util.zip.GZIPOutputStream; +import okhttp3.*; public class MockInterceptor implements Interceptor { diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/AudienceRequestBuildTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/AudienceRequestBuildTest.java index 2c116a3..4e96867 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/AudienceRequestBuildTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/AudienceRequestBuildTest.java @@ -4,16 +4,15 @@ import com.fullcontact.apilib.models.Request.AudienceRequest; import com.fullcontact.apilib.models.Tag; import com.google.gson.Gson; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class AudienceRequestBuildTest { private static final Gson gson = new Gson(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/AudienceResponseTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/AudienceResponseTest.java index c2d2c78..5d38177 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/AudienceResponseTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/AudienceResponseTest.java @@ -6,15 +6,14 @@ import com.fullcontact.apilib.models.Request.AudienceRequest; import com.fullcontact.apilib.models.Response.AudienceResponse; import com.fullcontact.apilib.models.Tag; +import java.io.IOException; +import java.util.HashMap; +import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.io.IOException; -import java.util.HashMap; -import java.util.concurrent.ExecutionException; - public class AudienceResponseTest { private static HashMap customHeader = new HashMap<>(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/CompanyEnrichResponse.java b/java8/src/test/java/com/fullcontact/apilib/enrich/CompanyEnrichResponse.java index daa3ce9..daec1be 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/CompanyEnrichResponse.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/CompanyEnrichResponse.java @@ -5,14 +5,13 @@ import com.fullcontact.apilib.auth.StaticApiKeyCredentialProvider; import com.fullcontact.apilib.models.Request.CompanyRequest; import com.fullcontact.apilib.models.Response.CompanyResponse; +import java.util.HashMap; +import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.util.HashMap; -import java.util.concurrent.ExecutionException; - public class CompanyEnrichResponse { private static HashMap customHeader = new HashMap<>(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/CompanyRequestBuildTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/CompanyRequestBuildTest.java index d961e07..edbe763 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/CompanyRequestBuildTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/CompanyRequestBuildTest.java @@ -2,12 +2,11 @@ import com.fullcontact.apilib.models.Request.CompanyRequest; import com.google.gson.Gson; -import org.junit.Assert; -import org.junit.Test; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; +import org.junit.Assert; +import org.junit.Test; public class CompanyRequestBuildTest { private static final Gson gson = new Gson(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/FCResponseTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/FCResponseTest.java index 48631b4..4507f75 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/FCResponseTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/FCResponseTest.java @@ -6,14 +6,13 @@ import com.fullcontact.apilib.models.Request.PermissionRequest; import com.fullcontact.apilib.models.Request.PurposeRequest; import com.fullcontact.apilib.models.Response.FCResponse; +import java.util.HashMap; +import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.util.HashMap; -import java.util.concurrent.ExecutionException; - public class FCResponseTest { private static HashMap customHeader = new HashMap<>(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/FullContactClientTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/FullContactClientTest.java index 3b108cf..2d41dae 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/FullContactClientTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/FullContactClientTest.java @@ -2,12 +2,11 @@ import com.fullcontact.apilib.FullContactException; import com.fullcontact.apilib.auth.StaticApiKeyCredentialProvider; +import java.util.HashMap; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import java.util.HashMap; - public class FullContactClientTest { @Rule public ExpectedException exceptionRule = ExpectedException.none(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/PermissionRequestTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/PermissionRequestTest.java index e917c76..66a7a1e 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/PermissionRequestTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/PermissionRequestTest.java @@ -9,17 +9,16 @@ import com.fullcontact.apilib.models.Request.PermissionRequest; import com.fullcontact.apilib.models.Request.PurposeRequest; import com.google.gson.Gson; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class PermissionRequestTest { private static final Gson gson = new Gson(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/PermissionResponseTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/PermissionResponseTest.java index 233d605..43d2a62 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/PermissionResponseTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/PermissionResponseTest.java @@ -8,14 +8,13 @@ import com.fullcontact.apilib.models.Response.ConsentPurposeResponse; import com.fullcontact.apilib.models.Response.PermissionCurrentResponseMap; import com.fullcontact.apilib.models.Response.PermissionResponseList; +import java.util.HashMap; +import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.util.HashMap; -import java.util.concurrent.ExecutionException; - public class PermissionResponseTest { private static HashMap customHeader = new HashMap<>(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/PersonRequestTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/PersonRequestTest.java index 1cc28b9..9f5cce0 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/PersonRequestTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/PersonRequestTest.java @@ -7,16 +7,15 @@ import com.fullcontact.apilib.models.Request.PersonRequest; import com.fullcontact.apilib.models.enums.Confidence; import com.google.gson.Gson; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class PersonRequestTest { private static final Gson gson = new Gson(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/PersonResponseTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/PersonResponseTest.java index 5715670..6bf8529 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/PersonResponseTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/PersonResponseTest.java @@ -5,14 +5,13 @@ import com.fullcontact.apilib.auth.StaticApiKeyCredentialProvider; import com.fullcontact.apilib.models.Request.PersonRequest; import com.fullcontact.apilib.models.Response.PersonResponse; +import java.util.HashMap; +import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.util.HashMap; -import java.util.concurrent.ExecutionException; - public class PersonResponseTest { private static HashMap customHeader = new HashMap<>(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/ResolveRequestBuildTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/ResolveRequestBuildTest.java index 205bed7..6b65168 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/ResolveRequestBuildTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/ResolveRequestBuildTest.java @@ -7,16 +7,15 @@ import com.fullcontact.apilib.models.Request.ResolveRequest; import com.fullcontact.apilib.models.Tag; import com.google.gson.Gson; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class ResolveRequestBuildTest { private static final Gson gson = new Gson(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/ResolveResponseTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/ResolveResponseTest.java index edcc56c..5f18d00 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/ResolveResponseTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/ResolveResponseTest.java @@ -7,14 +7,13 @@ import com.fullcontact.apilib.models.Request.ResolveRequest; import com.fullcontact.apilib.models.Response.ResolveResponse; import com.fullcontact.apilib.models.Response.ResolveResponseWithTags; +import java.util.HashMap; +import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.util.HashMap; -import java.util.concurrent.ExecutionException; - public class ResolveResponseTest { private static HashMap customHeader = new HashMap<>(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/TagsRequestBuildTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/TagsRequestBuildTest.java index 3f7a312..480fd61 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/TagsRequestBuildTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/TagsRequestBuildTest.java @@ -4,16 +4,15 @@ import com.fullcontact.apilib.models.Request.TagsRequest; import com.fullcontact.apilib.models.Tag; import com.google.gson.Gson; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; public class TagsRequestBuildTest { private static final Gson gson = new Gson(); diff --git a/java8/src/test/java/com/fullcontact/apilib/enrich/TagsResponseTest.java b/java8/src/test/java/com/fullcontact/apilib/enrich/TagsResponseTest.java index d36803e..73edde5 100644 --- a/java8/src/test/java/com/fullcontact/apilib/enrich/TagsResponseTest.java +++ b/java8/src/test/java/com/fullcontact/apilib/enrich/TagsResponseTest.java @@ -6,14 +6,13 @@ import com.fullcontact.apilib.models.Request.TagsRequest; import com.fullcontact.apilib.models.Response.TagsResponse; import com.fullcontact.apilib.models.Tag; +import java.util.HashMap; +import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.util.HashMap; -import java.util.concurrent.ExecutionException; - public class TagsResponseTest { private static HashMap customHeader = new HashMap<>(); From 81fb2270b0d46efff39898fcf15a2184cab52d7f Mon Sep 17 00:00:00 2001 From: in1257 Date: Fri, 16 Sep 2022 07:46:05 +0530 Subject: [PATCH 4/4] updated version to 4.1.0 --- README.md | 8 ++++---- build.gradle | 2 +- java-common-artifacts/build.gradle | 2 +- java11/build.gradle | 2 +- java8/build.gradle | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a9ce9e4..3302b67 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,11 @@ Add this dependency to your project's build file: - Java11+ ```groovy -implementation 'com.fullcontact.client:java11:4.0.0' +implementation 'com.fullcontact.client:java11:4.1.0' ``` - Java8+ ```groovy -implementation 'com.fullcontact.client:java8:4.0.0' +implementation 'com.fullcontact.client:java8:4.1.0' ``` ### Maven users @@ -29,7 +29,7 @@ Add this dependency to your project's POM: com.fullcontact.client java11 - 4.0.0 + 4.1.0 ``` - Java8+ @@ -37,7 +37,7 @@ Add this dependency to your project's POM: com.fullcontact.client java8 - 4.0.0 + 4.1.0 ``` diff --git a/build.gradle b/build.gradle index c66b839..31ca175 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } group 'com.fullcontact.client' -version '4.0.0' +version '4.1.0' allprojects { diff --git a/java-common-artifacts/build.gradle b/java-common-artifacts/build.gradle index a39aba9..e903bb1 100644 --- a/java-common-artifacts/build.gradle +++ b/java-common-artifacts/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'com.fullcontact.client' -version '4.0.0' +version '4.1.0' sourceCompatibility = 1.8 diff --git a/java11/build.gradle b/java11/build.gradle index 2ddbd73..b4297a7 100644 --- a/java11/build.gradle +++ b/java11/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'com.fullcontact.client' -version '4.0.0' +version '4.1.0' sourceCompatibility = 11 diff --git a/java8/build.gradle b/java8/build.gradle index a5f4fca..20b2ad8 100644 --- a/java8/build.gradle +++ b/java8/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'com.fullcontact.client' -version '4.0.0' +version '4.1.0' sourceCompatibility = 1.8