diff --git a/README.md b/README.md index a9ce9e4..7791f1b 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:5.0.0' ``` - Java8+ ```groovy -implementation 'com.fullcontact.client:java8:4.0.0' +implementation 'com.fullcontact.client:java8:5.0.0' ``` ### Maven users @@ -29,7 +29,7 @@ Add this dependency to your project's POM: com.fullcontact.client java11 - 4.0.0 + 5.0.0 ``` - Java8+ @@ -37,7 +37,7 @@ Add this dependency to your project's POM: com.fullcontact.client java8 - 4.0.0 + 5.0.0 ``` diff --git a/build.gradle b/build.gradle index c66b839..e22f10d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } group 'com.fullcontact.client' -version '4.0.0' +version '5.0.0' allprojects { diff --git a/java-common-artifacts/build.gradle b/java-common-artifacts/build.gradle index a39aba9..41f4851 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 '5.0.0' sourceCompatibility = 1.8 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..1fa74fb 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 = "5.0.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/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/Age.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Age.java index e1cb4d1..1c03273 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Age.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Age.java @@ -12,4 +12,6 @@ public class Age { private String range; private int value; private Date birthday; + private String ageIn2YearRanges; + private String exactAge; } 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/ChildrenInfo.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ChildrenInfo.java new file mode 100644 index 0000000..4600783 --- /dev/null +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/ChildrenInfo.java @@ -0,0 +1,31 @@ +package com.fullcontact.apilib.models.Response; + +import lombok.*; + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +public class ChildrenInfo { + private Gender gender; + private BirthDate birthDate; +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class Gender { + private String firstChild; + private String secondChild; + private String thirdChild; + private String fourthChild; +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class BirthDate { + private String firstChild; + private String secondChild; + private String thirdChild; + private String fourthChild; +} diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Collectibles.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Collectibles.java index de78523..bbb3cc4 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Collectibles.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Collectibles.java @@ -9,5 +9,9 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class Collectibles { - boolean general, coins, dolls, figurines, other, plates, sportsMemorabilia, stamps, fineArts; + private String dolls; + private String figurines; + private String any; + private String artAntique; + private String clubContinuity; } 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/Demographics.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Demographics.java index ee7e23a..bdbea6f 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Demographics.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Demographics.java @@ -9,6 +9,41 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class Demographics { - private String gender, maritalStatus, occupation, livingStatus; + private String gender; private Age age; + private Consumers consumers; + private HomeInfo homeInfo; + private Enthusiasts enthusiasts; + private MaritalInfo maritalInfo; + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class HomeInfo { + private String homeOwner; + private String homeOwnerIndicator; + } +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class Consumers { + private String valueScore; +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class Enthusiasts { + private String niches; + private String politicalParty; +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class MaritalInfo { + private String maritalStatus; + private String maritalStatusIndicator; } 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..3ea14ac 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 @@ -18,18 +17,16 @@ public class Details { private String gender; private Household household; private Demographics demographics; - private Finance finance; - private Census census; - private Survey survey; - private Buyer buyer; + private Survey surveys; private List emails, phones; private Profiles profiles; private Identifiers identifiers; - private Automotive automotive; private List locations; private List employment; private List photos; private List education; private List urls; private List interests; + private Triggers triggers; + private MarketTrends marketTrends; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/DietConcerns.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/DietConcerns.java index f196434..e79d616 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/DietConcerns.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/DietConcerns.java @@ -9,5 +9,7 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class DietConcerns { - private boolean general, loseWeight, eatNatural, vitaminSupplements, healthy; + private String naturalFoods; + private String diet; + private String weightControl; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/FamilyInfo.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/FamilyInfo.java index 4a12908..39ae8de 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/FamilyInfo.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/FamilyInfo.java @@ -9,5 +9,26 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class FamilyInfo { - private int totalAdults, totalChildren, totalPeopleInHousehold; + private String householdSize; + private String numberOfAdults; + private String numberOfChildren; + + private LifeCycles lifeCycles; +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class LifeCycles { + private String babyBoomers; + private String dualIncomeNoKids; + private String familyTies; + private String generationX; + private String millenials; + private String millenialsButFirstLetMeTakeASelfie; + private String millenialsGettinHitched; + private String millenialsIAmAnAdult; + private String millenialsLivesWithMom; + private String millenialsMomLife; + private String millenialsPuttingDownRoots; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Finance.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Finance.java index e24934c..d9fc0fd 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Finance.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Finance.java @@ -9,12 +9,26 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class Finance { - private String cashValueBalanceHouseholdEstimate, - financialDebtRangeEstimate, - householdIncomeEstimate, - netWorthRange, - bankCard, - retailCard; - private boolean activeLineOfCredit, bankruptcy; - private int discretionaryIncomeEstimate; + private String income; + private String incomeIndicator; + private String narrowBandIncome; + private String discretionarySpendingIncome; + private String firstMortgageAmountInThousands; + private String homeEquityLoanDate; + private String homeMarketValueTaxRecord; + private String homeEquityLoanInThousands; + private String homeEquityLoanIndicator; + private String investmentResources; + private String liquidResources; + private String mortgageInterestRateTypeOrRefinance; + private String mortgageLiability; + private String mortgageLoanTypeOrRefinance; + private String mortgageDate; + private String refinanceIndicator; + private String secondMortgageAmountInThousands; + private String shortTermLiability; + private String incomeIndex; + private String netWorth; + private String wealthResources; + private String paymentMethodCreditCard; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Hobby.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Hobby.java index 20564ca..a685902 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Hobby.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Hobby.java @@ -9,34 +9,26 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class Hobby { - private Gardening gardening; - private boolean general, - baking, - birdWatching, - cars, - cigarSmoking, - gourmetCooking, - cooking, - crafts, - casinoGambling, - homeImprovement, - homeStudyCourses, - knitting, - lotteries, - quilting, - selfImprovementCourses, - sewing, - theater, - woodworking, - wineAppreciation, - photography, - exercise3xPerWeek, - scrapBooking, - lowFatCooking, - careerAdvancementCourses, - jewelryMaking, - diy, - green, - socialNetworking, - spirituality; + private String baking; + private String cigarSmoking; + private String cooking; + private String crafts; + private String gardening; + private String homeStudyCourses; + private String quilting; + private String selfImprovementCourses; + private String woodworking; + private String photography; + private String careerAdvancementCourses; + + private String any; + private String automotiveWork; + private String birdFeedingOrWatching; + private String culturalArtsOrEvents; + private String gourmetFoods; + private String homeImprovementOrDIY; + private String motorcycleRiding; + private String scrapbooking; + private String sewingOrNeedleworkOrKnitting; + private String wine; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/HomeInfo.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/HomeInfo.java index 6c1806a..327fb62 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/HomeInfo.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/HomeInfo.java @@ -9,6 +9,20 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class HomeInfo { - private int homeValueEstimate, loanToValueEstimate, yearsInHome; private String dwellingType; + private String dwellingTypeIndicator; + private String householdEducation; + private String householdEducationIndicator; + private String maritalStatus; + private String lengthOfResidence; + private String lengthOfResidenceIndicator; + private String affluents; + private String currentLoanToValue; + private String homeHeatSource; + private String householdOccupation; + private String familyComposition; + private String homeMarketValue; + private String ownerToOwner; + private String rentertoOwner; + private String yearHomeBuilt; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Household.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Household.java index 14d5d56..7a8943b 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Household.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Household.java @@ -14,4 +14,5 @@ public class Household { private Finance finance; private LocationInfo locationInfo; private FamilyInfo familyInfo; + private ChildrenInfo childrenInfo; } 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/LocationInfo.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/LocationInfo.java index cb1ea7a..921ccb5 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/LocationInfo.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/LocationInfo.java @@ -9,11 +9,12 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class LocationInfo { - private String carrierRoute, - designatedMarketArea, - coreBasedStatisticalArea, - nielsenCountySize, - congressionalDistrict; - private int numericCountyCode; - private boolean seasonalAddress; + private String carrierRoute; + private String coreBasedStatisticalArea; + private String nielsenCountySize; + private String blockGroupNumber; + private String censusTractSuffix; + private String countyCode; + private String dsfSeasonCode; + private String nielsenCountySizeCode; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/MarketTrends.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/MarketTrends.java new file mode 100644 index 0000000..1826909 --- /dev/null +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/MarketTrends.java @@ -0,0 +1,483 @@ +package com.fullcontact.apilib.models.Response; + +import lombok.*; + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +public class MarketTrends { + private Switchers switchers; + private Seekers seekers; + private Enthusiasts enthusiasts; + private Attendees attendees; + private Buyers buyers; + private Chef chef; + private Customers customers; + private Consumers consumers; + private Donor donor; + private Owners owners; + private Travellers travellers; + private Readers readers; + private Voters voters; + private Subscribers subscribers; + private Planners planners; + private Purchasers purchasers; + private Spenders spenders; + private Shoppers shoppers; + private Stores stores; + private Users users; + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Switchers { + private String alcoholBeverage; + private String beerBrand; + private String breakfastMeatBrand; + private String chocolateCandyBrand; + private String cocaColaBrand; + private String coldCerealBrand; + private String energyDrink; + private String frozenFoodBrand; + private String householdCleaningProductsBrand; + private String insurance; + private String job; + private String mobilePhoneService; + private String naturalCheeseSlicesBrand; + private String naturalShreddedCheeseBrand; + private String nutritionalHealthBarBrand; + private String refrigeratedLunchMeatBrand; + private String snackBarGranolaBarBrand; + private String softDrinksBrand; + private String spiritsBrand; + private String yogurtBrand; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Seekers { + private String freshFood; + private String homeCleaningNewProduct; + private String laundryNewProduct; + private String onlineDegreeEducation; + private String personalCareNewProduct; + private String premiumNaturalHomeCleaners; + private String scent; + private String unscentedProduct; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Enthusiasts { + private String artHouseMovie; + private String barandLoungeFood; + private String baseball; + private String basketball; + private String brandLoyalists; + private String breakfastDining; + private String carryOut; + private String casualDining; + private String christianorGospelMusic; + private String cigarPipe; + private String coffee; + private String convenienceHomeCleaners; + private String countryMusic; + private String dinnerDining; + private String discountMovie; + private String domesticBeer; + private String extremeFitness; + private String fantasySports; + private String fineDining; + private String football; + private String freeStreaming; + private String frequentMovie; + private String gamingnonMobileDevices; + private String hardCider; + private String hardSeltzer; + private String hockey; + private String homeShoppingNetwork; + private String importBeer; + private String kroger; + private String latinMusic; + private String liquor; + private String lunchDining; + private String meditation; + private String mobileGaming; + private String openingWeekendMovie; + private String paidStreaming; + private String petsAreFamily; + private String quickServiceRestaurant; + private String redWine; + private String soccer; + private String target; + private String valueChains; + private String walmart; + private String whiteWine; + private String yogaPilates; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Attendees { + private String amusementPark; + private String culturalArtsEvents; + private String liveMusicConcert; + private String professionalSportsEvents; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Buyers { + private String autoInsuranceSelfServeOnline; + private String christmasOrnamentsCollectibles; + private String heavyFiberFocusedFood; + private String heavyGlutenFreeFood; + private String heavyLowFatFood; + private String onlineHomeCleaningProduct; + private String onlineInsurance; + private String onlineLaundryProduct; + private String onlinePersonalCareProduct; + private String onlinePetFood; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Chef { + private String experimental; + private String master; + private String realIngredient; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Customers { + private String aT_TCellPhoneCustomer; + private String amazonPrime; + private String annuity; + private String autoInsurancePremiumDiscountviaTelematicsCustomer; + private String cateringDelivery; + private String cateringPickUp; + private String certificatesofDeposit; + private String clicktoCartHomeDelivery; + private String clicktoCartPickUp; + private String communityBankCustomer; + private String convenience; + private String deposit; + private String directMediaPreference; + private String financialAdvisor; + private String frequentATM; + private String groceryLoyaltyCard; + private String interestCheckingPreference; + private String internationalWirelessorLandline; + private String internetResearchPreference; + private String lending; + private String loyalFinancialInstitution; + private String mensBigandTallApparel; + private String nationalBankCustomer; + private String newRoof; + private String onlineDeliveryRestaurant; + private String onlinePickUpRestaurant; + private String plantoPurchaseSmartHomeProducts; + private String qSRCash; + private String quantumUpgrade; + private String regionalBankCustomer; + private String restaurantLoyaltyCard; + private String selfInsuredDental; + private String smartHome; + private String socialMediaPreference; + private String sprintCellPhoneCustomer; + private String studentLoan; + private String subscriptionorAutoShipmentClothAccessories; + private String subscriptionorAutoShipmentFoodorBeverage; + private String subscriptionorAutoShipmentHouseholdProduct; + private String subscriptionorAutoShipmentPersonalCare; + private String subscriptionorAutoShipmentPetProducts; + private String subscriptionorAutoShipment; + private String tMobileCellPhoneCustomer; + private String vOIPLandline; + private String verizonCellPhoneCustomer; + private String wiredService; + private String womensPlusSizeApparel; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Consumers { + private String airlineUpgraders; + private String autoInsurance; + private String autoInsuranceAgentSold; + private String autoInsuranceCallCenterSold; + private String cableBundlecableinternethomephone; + private String casinoGamer; + private String coinsCollector; + private String conservativeInvestmentStyle; + private String contactlessPayApplication; + private String cordCutters; + private String creditCardAttritionHouseholds; + private String creditCardRevolvers; + private String creditUnionMember; + private String dietConsciousHouseholds; + private String doitYourselfer; + private String employerProvidedHealthInsurancePolicyHolders; + private String frequentOnlineMovieViewers; + private String freshFoodDelivery; + private String futureInvestors; + private String gamers; + private String gigEconomyEmployees; + private String groceryStoreFrequenters; + private String homeEntertainers; + private String homeRemodelers; + private String hotelLoyaltyProgramMembers; + private String intheMarkettoGetaHomeLoan; + private String intheMarkettoPurchaseaHome; + private String intendtoPurchaseaSamsungmobiledevice; + private String intendtopurchase5GService; + private String investmentTrustBankingPreference; + private String likelyCruiser; + private String likelyMortgageRefinancers; + private String likelyPlannedGivers; + private String likelytoSufferfromInsomnia; + private String likelytoUseanInvestmentBroker; + private String likelytohaveaMortgage; + private String longRoadTripTakers; + private String longTermCare; + private String lowInterestCreditCard; + private String lowSodium; + private String mealCombo; + private String mealKitDelivery; + private String medicaidPotentialQualifiedHousehold; + private String medicareDualEligibleHousehold; + private String medicarePlanDPrescriptionDrugHealth; + private String mobileBrowsers; + private String movieLoyaltyProgramMembers; + private String naturalGreenProductHomeCleaners; + private String non401kMutualFundInvestors; + private String non401kStocksBondsInvestors; + private String pandemicInRestaurantDiners; + private String pandemicLuxurySpenders; + private String pandemicRiskTolerant; + private String paychecktoPaycheck; + private String personalTraveler; + private String plantoPurchaseHomeSecuritySystems; + private String plantogetFitnessMembership; + private String rentersandAutoInsuranceJointPolicyHolders; + private String retailTexters; + private String retiredbutStillWorking; + private String satelliteBundlesatelliteinethomeorwireless; + private String selfPayHealthInsurance; + private String seniorCaregivers; + private String seniorLivingSearchers; + private String sociallyInfluenced; + private String technologyEarlyAdopters; + private String teleMedicine; + private String termLife; + private String underbanked; + private String uninsuredforHealth; + private String upcomingRetirees65andOlder; + private String vegetarians; + private String vehicleDIYrs; + private String weeklyOnlineBankers; + private String wellnessHouseholdsHealth; + private String wholeLife; + private String wiredLineVideoConnectors; + private String workforSmallCompanyOfferingHealthInsurance; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Donor { + private String animalWelfare; + private String cancer; + private String childrensCauses; + private String consistentReligious; + private String environmental; + private String highDollarOtherCausesnonReligious; + private String highDollarReligiousCauses; + private String liberalCauses; + private String university; + private String veteran; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Owners { + private String _401k; + private String androidSmartPhone; + private String appleSmartPhone; + private String boat; + private String educationSavingsPlan; + private String multiPolicyInsurance; + private String pet; + private String prepaidCard; + private String secondHome; + private String smartTV; + private String tablet; + private String timeshare; + private String veterinarianInfluencedPet; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Planners { + private String budgetMeal; + private String meal; + private String preShop; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Purchasers { + private String aCAHealthInsurance; + private String autoLoan; + private String brandDrivenHomeCleaners; + private String frequentMobile; + private String frequentOnlineMusic; + private String greenProduct; + private String homeWarranty; + private String impulse; + private String medicareAdvantagePlan; + private String midmarketTermLifeInsurance; + private String midmarketWholeLifeInsurance; + private String newLuxuryVehicle; + private String newnonLuxuryVehicle; + private String organicFood; + private String organicProduct; + private String petInsurance; + private String rV; + private String vehicle; + private String webSurferBrickMortar; + private String webandBrickMortarViewerOnline; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Readers { + private String avidBook; + private String bibleDevotional; + private String book; + private String entertainment; + private String label; + private String retailerCircular; + private String romance; + private String sports; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Shoppers { + private String bargainHotel; + private String bargain; + private String everydayLowPrice; + private String financialInstitution; + private String highend; + private String multiRetailer; + private String oneStop; + private String priceMatchers; + private String privateLabel; + private String quickShopAtWalmartOrTarget; + private String stockUp; + private String whatsOnSale; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Spenders { + private String pandemicDecreasedSpenders; + private String vacationSpenders; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Stores { + private String stockUpAtGroceryStores; + private String stockUpAtWalmart; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Subscribers { + private String cableTVPremium; + private String financialHealthNewsletter; + private String onlineMagazineNewspaper; + private String retailerEmail; + private String satelliteRadio; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Travellers { + private String business; + private String international; + private String rVTripTakers; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Users { + private String app; + private String brandMotivatedLaundry; + private String brandMotivatedPersonalCareProduct; + private String brandedRetailCreditCard; + private String convenienceDrivenPersonalCareProduct; + private String creditCardBalanceTransfer; + private String debitCardRewards; + private String debitCard; + private String groceryStoreApp; + private String heavyCoupon; + private String mobileBanking; + private String mobileShoppingList; + private String naturalProductPersonalCareProduct; + private String onlineBroker; + private String onlineSavings; + private String paperShoppingList; + private String premiumNaturalPersonalCareProduct; + private String priceMotivatedLaundryProduct; + private String priceMotivatedPersonalCareProduct; + private String primaryCellPhone; + private String publicTransportation; + private String restaurantApp; + private String restaurantLoyaltyApp; + private String rewardsCardCashBack; + private String rewardsCardOther; + private String smartPhone; + private String sociallyActiveonFacebook; + private String sociallyActiveonFacebookBrandLikers; + private String sociallyActiveonFacebookCategoryRecommenders; + private String sociallyActiveonPinterest; + private String sociallyActiveonTwitter; + private String solarRoofingInterest; + private String targetCartwheel; + private String uberOrLyft; + private String vehicleServiceCenter; + private String walmartSavingCatcher; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Voters { + private String democratic; + private String independent; + private String likely; + private String republican; + private String swing; + } +} 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; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Music.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Music.java index ecb0843..6a8a5a7 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Music.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Music.java @@ -9,15 +9,11 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class Music { - private boolean general, - christianOrGospel, - classical, - country, - jazz, - other, - rhythmAndBlues, - rock, - softRock, - swing, - alternative; + private String christianOrGospel; + private String classical; + private String country; + private String jazz; + private String any; + private String rythmAndBlues; + private String rockNRoll; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Own.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Own.java index 774293a..7671013 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Own.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Own.java @@ -9,12 +9,8 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class Own { - private boolean ownCat, - ownDog, - ownDigitalCamera, - ownHorse, - ownMotorcycle, - ownSwimmingPool, - ownAtv, - ownRv; + private String smartPhone; + private String cat; + private String dog; + private String pets; } 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..af1ed54 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,9 @@ 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 @@ -26,7 +24,6 @@ public class PersonResponse extends FCResponse { avatar, website; private Details details; - private Map extended; public Optional
getDetails() { return Optional.ofNullable(this.details); @@ -40,10 +37,6 @@ public Optional getBirthday() { return this.getDetails().map(Details::getAge).map(Age::getBirthday); } - public Optional getFinance() { - return this.getDetails().map(Details::getFinance); - } - public Optional getLocationInfo() { return this.getDetails().map(Details::getHousehold).map(Household::getLocationInfo); } @@ -88,42 +81,6 @@ public Optional> getInterestList() { return this.getDetails().map(Details::getInterests); } - public Optional getBuyerCatalog() { - return this.getDetails().map(Details::getBuyer).map(Buyer::getCatalog); - } - - public Optional getBuyerRetail() { - return this.getDetails().map(Details::getBuyer).map(Buyer::getRetail); - } - - public Optional getBuyerCatalogApparel() { - return this.getDetails() - .map(Details::getBuyer) - .map(Buyer::getCatalog) - .map(PurchaseBehavior::getApparel); - } - - public Optional getBuyerRetailApparel() { - return this.getDetails() - .map(Details::getBuyer) - .map(Buyer::getRetail) - .map(PurchaseBehavior::getApparel); - } - - public Optional getBuyerCatalogPayment() { - return this.getDetails() - .map(Details::getBuyer) - .map(Buyer::getCatalog) - .map(PurchaseBehavior::getPayment); - } - - public Optional getBuyerRetailPayment() { - return this.getDetails() - .map(Details::getBuyer) - .map(Buyer::getRetail) - .map(PurchaseBehavior::getPayment); - } - public Optional getHouseHoldPresence() { return this.getDetails().map(Details::getHousehold).map(Household::getPresence); } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Presence.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Presence.java index 8fbeb5e..693f384 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Presence.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Presence.java @@ -9,5 +9,33 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class Presence { - private String children, multigenerationalResident; + private String presenceOfChildren; + private String presenceOfChildrenIndicator; + + private Adult adult; + private Child child; +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class Adult { + private String age18to24; + private String age25to34; + private String age35to44; + private String age45to54; + private String age55to64; + private String age65to74; + private String age75above; +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class Child { + private String age0to2; + private String age11to15; + private String age16to17; + private String age3to5; + private String age6to10; } 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/Purchase.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Purchase.java index 9451b67..e12804a 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Purchase.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Purchase.java @@ -9,10 +9,19 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class Purchase { - private boolean homeDecorating, - beautyProducts, - clubStores, - fastFoods, - specialtyBeautyProducts, - usesCoupons; + private String artsCraftsRecency; + private String beautyAndSpaRecency; + private String beveragesRecency; + private String booksRecency; + private String clubContinuity; + private String gardenAndBackyardRecency; + private String homeDecorRecency; + private String sweepstakes; + private String maleApparelRecency; + private String musicVideosRecency; + private String specialtyFoodsAndGiftsRecency; + private String sportsAndOutdoorRecency; + private String toolsAndElectronicsRecency; + private String femaleAndMaleRecency; + private String femaleBrandAndFitRecency; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Reading.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Reading.java index 8a9401b..b28af4c 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Reading.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Reading.java @@ -9,35 +9,18 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class Reading { - private boolean likesToRead, - astrology, - bibleOrDevotional, - bestSellingFiction, - audiobooks, - childrens, - cooking, - computer, - countryLifestyle, - fashion, - history, - interiorDecorating, - health, - military, - mystery, - naturalHealthRemedies, - entertainment, - romance, - scienceFiction, - technology, - sports, - worldNewsOrPolitics, - suspense, - bestSellers, - bookClub, - comics, - financial, - homeAndGarden, - selfImprovement, - travel, - magazines; + private String bibleOrDevotional; + private String bestSellingFiction; + private String childrens; + private String fashion; + private String military; + private String entertainment; + private String romance; + private String sports; + private String books; + private String cookingOrCulinary; + private String countryOrLifestyle; + private String interior; + private String medicalOrHealth; + private String worldNews; } 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/Sporting.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Sporting.java index 02de657..14ab352 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Sporting.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Sporting.java @@ -9,29 +9,19 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class Sporting { - private boolean other, - campingOrHiking, - baseball, - boating, - basketball, - fishing, - americanFootball, - fitness, - golf, - hockey, - hunting, - nascar, - snowSkiing, - walking, - running, - scuba, - tennis, - weightLifting, - biking, - extremeSports, - motocross, - skateboarding, - snowboarding, - rollerblading, - interests; + private String campingOrHiking; + private String fishing; + private String golf; + private String nascar; + private String boatingOrSailing; + private String cycling; + private String fitnessExcercise; + private String bigGameHunting; + private String huntingOrShooting; + private String sportsMerchandiseOrActivewearRecency; + private String runningOrJogging; + private String skiingOrSnowboarding; + private String sportsParticipation; + private String walkingForHealth; + private String yogaOrPilates; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Survey.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Survey.java index 597ae80..b9849b1 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Survey.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Survey.java @@ -11,14 +11,92 @@ public class Survey { private Own own; private Collectibles collectibles; - private CreditCards creditCards; private DietConcerns dietConcerns; private Hobby hobby; + private Investments investments; private Music music; private Reading reading; private Sporting sporting; private Travel travel; - private boolean religious, grandchildren, onlinePurchaser, investments; - private Electronics electronics; private Purchase purchase; + private Donor donor; + private MailOrder mailOrder; + private Other other; + private Social social; +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class Investments { + private String juvenileLifeInsurance; + private String burialInsurance; + private String insurance; + private String investments; + private String lifeInsurance; + private String medicareCoverage; + private String mutualFunds; + private String stocksOrBonds; +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class Donor { + private String activeMilitary; + private String animalWelfare; + private String artsOrCultural; + private String cancer; + private String catholic; + private String childrens; + private String charitable; + private String humanitarian; + private String nativeAmerican; + private String otherReligious; + private String politicalConservative; + private String politicalLiberal; + private String veteran; + private String wildlifeEnvironmental; + private String worldRelief; +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class MailOrder { + private String any; + private String apparel; + private String books; + private String buyer; + private String childrensProducts; + private String food; + private String gifts; + private String healthOrBeautyProducts; + private String homeFurnishing; + private String jewelry; + private String magazines; + private String videosOrDVD; + private String womensPlusApparel; +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class Other { + private String electronics; + private String grandchildren; + private String militaryVeteran; + private String onlineHousehold; + private String scienceAndNewTechnology; + private String swimmingPool; +} + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +class Social { + private String facebookUser; + private String instagramUser; + private String pinterestUser; + private String twitterUser; } 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/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Travel.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Travel.java index a4e0765..f67885b 100644 --- a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Travel.java +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Travel.java @@ -9,16 +9,12 @@ @AllArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor public class Travel { - private boolean general, - usBusiness, - internationalBusiness, - usPersonal, - internationalPersonal, - casinoVacations, - familyVacations, - frequentFlyer, - timeshare, - vacationCruises, - attractionsOrThemeParks, - rv; + private String timeshare; + private String business; + private String cruiseShipVacation; + private String international; + private String leisure; + private String rvVacations; + private String travelInTheUSA; + private String traveler; } diff --git a/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Triggers.java b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Triggers.java new file mode 100644 index 0000000..50d4660 --- /dev/null +++ b/java-common-artifacts/src/main/java/com/fullcontact/apilib/models/Response/Triggers.java @@ -0,0 +1,43 @@ +package com.fullcontact.apilib.models.Response; + +import lombok.*; + +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor +public class Triggers { + private Type type; + private Date date; + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Date { + private String collegeGraduateChange; + private String emptyNesterChange; + private String firstChildChange; + private String homeMarketValueChange; + private String incomeChange; + private String newAdultChange; + private String newDriverChange; + private String newYoungAdultToChange; + private String nicheSwitch; + private String valueScoreChange; + } + + @Getter + @AllArgsConstructor(access = AccessLevel.PROTECTED) + @NoArgsConstructor + public static class Type { + private String collegeGraduate; + private String emptyNester; + private String homeMarketValue; + private String income; + private String newAdultToFile; + private String newFirstChild0to2YearsOld; + private String newPreDriver; + private String newYoungAdultToFile; + private String nicheSwitch; + private String valueScore; + } +} diff --git a/java11/README.md b/java11/README.md index 2a330fa..a8a46c9 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:5.0.0' ``` ### Maven users @@ -66,7 +66,7 @@ Add this dependency to your project's POM: com.fullcontact.client java11 - 4.0.0 + 5.0.0 ``` @@ -681,6 +681,8 @@ Assert.assertTrue(response.isEnabled()); ``` ## Changelog +- v5.0.0 - Updated Response for Person Enrich. +- 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/build.gradle b/java11/build.gradle index 2ddbd73..1300d92 100644 --- a/java11/build.gradle +++ b/java11/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'com.fullcontact.client' -version '4.0.0' +version '5.0.0' sourceCompatibility = 11 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/PersonResponseTest.java b/java11/src/test/java/com/fullcontact/apilib/enrich/PersonResponseTest.java index 8c11c30..30bd6cf 100644 --- a/java11/src/test/java/com/fullcontact/apilib/enrich/PersonResponseTest.java +++ b/java11/src/test/java/com/fullcontact/apilib/enrich/PersonResponseTest.java @@ -13,11 +13,12 @@ public void personResponseModelDeserializationTest() { FullContact.getFCResponse( HttpResponseTestObjects.httpResponseTestObjectProvider("tc_001"), PersonResponse.class); + Assert.assertTrue(response.isSuccessful()); Assert.assertEquals(200, response.getStatusCode()); Assert.assertEquals("OK", response.getMessage()); Assert.assertEquals("Marquita H Ross", response.getFullName()); - Assert.assertEquals("37-47", response.getAgeRange()); + Assert.assertEquals("40-49", response.getAgeRange()); Assert.assertEquals("Female", response.getGender()); Assert.assertEquals("San Francisco, California, United States", response.getLocation()); Assert.assertEquals("Senior Petroleum Manager", response.getTitle()); @@ -33,93 +34,12 @@ public void personResponseModelDeserializationTest() { Assert.assertEquals("Marquita", response.getDetails().get().getName().getGiven()); Assert.assertEquals("Ross", response.getDetails().get().getName().getFamily()); Assert.assertEquals("Marquita H Ross", response.getDetails().get().getName().getFull()); - Assert.assertEquals("35-44", response.getDetails().get().getAge().getRange()); + Assert.assertEquals("40-49", response.getDetails().get().getAge().getRange()); Assert.assertEquals(42, (int) response.getDetails().get().getAge().getValue()); Assert.assertEquals("Female", response.getDetails().get().getGender()); - Assert.assertEquals(2, response.getFamilyInfo().get().getTotalAdults()); - Assert.assertEquals(1, response.getFamilyInfo().get().getTotalChildren()); - Assert.assertEquals(3, response.getFamilyInfo().get().getTotalPeopleInHousehold()); - Assert.assertEquals( - "Multi Family Dwelling/Apartment", response.getHomeInfo().get().getDwellingType()); - Assert.assertEquals(513, response.getHomeInfo().get().getHomeValueEstimate()); - Assert.assertEquals(4, response.getHomeInfo().get().getLoanToValueEstimate()); - Assert.assertTrue(response.getLocationInfo().get().isSeasonalAddress()); - Assert.assertEquals("PO Box", response.getLocationInfo().get().getCarrierRoute()); - Assert.assertEquals("807", response.getLocationInfo().get().getDesignatedMarketArea()); - Assert.assertEquals( - "41860 - San Francisco-Oakland-Hayward, CA Metropolitan Statistical Area", - response.getLocationInfo().get().getCoreBasedStatisticalArea()); - Assert.assertEquals("AT_LARGE", response.getLocationInfo().get().getCongressionalDistrict()); - Assert.assertEquals(222, response.getLocationInfo().get().getNumericCountyCode()); - Assert.assertEquals( - "PRESENT", response.getHouseHoldPresence().get().getMultigenerationalResident()); - Assert.assertEquals("PRESENT", response.getHouseHoldPresence().get().getChildren()); - Assert.assertEquals( - 45, - response.getDetails().get().getHousehold().getFinance().getDiscretionaryIncomeEstimate()); - Assert.assertEquals( - "$150,000 - $199,999", - response.getDetails().get().getHousehold().getFinance().getHouseholdIncomeEstimate()); - Assert.assertEquals( - "$25,000 - $49,999", - response - .getDetails() - .get() - .getHousehold() - .getFinance() - .getCashValueBalanceHouseholdEstimate()); - Assert.assertEquals("Probable Homeowner", response.getDemographics().get().getLivingStatus()); - Assert.assertEquals( - "Professional - Engineer/Industrial", response.getDemographics().get().getOccupation()); - Assert.assertEquals("Multiple Bank Card", response.getFinance().get().getBankCard()); - Assert.assertEquals("Multiple Retail Card", response.getFinance().get().getRetailCard()); - Assert.assertTrue(response.getFinance().get().isActiveLineOfCredit()); - Assert.assertEquals(145, response.getDetails().get().getCensus().getBasicTractNumber()); - Assert.assertEquals(2, response.getDetails().get().getCensus().getBasicBlockGroup()); - Assert.assertEquals( - "High School Diploma", - response.getDetails().get().getCensus().getYear2010().getEducationLevel()); - Assert.assertEquals( - 90, response.getDetails().get().getCensus().getYear2010().getPercent().getHomeowner()); - Assert.assertEquals( - 35, response.getDetails().get().getCensus().getYear2010().getMedian().getHomeValue()); - Assert.assertEquals( - 17, - response - .getDetails() - .get() - .getCensus() - .getYear2010() - .getPopulationDensity() - .getCentileInUs()); - Assert.assertEquals( - 29, response.getDetails().get().getCensus().getYear2010().getSocioEconomicScore()); - Assert.assertTrue(response.getBuyerCatalogPayment().get().isCreditCard()); - Assert.assertTrue(response.getBuyerCatalogPayment().get().isHouseCharge()); - Assert.assertTrue(response.getBuyerCatalogPayment().get().isMasterCard()); - Assert.assertTrue(response.getBuyerCatalogApparel().get().isChildren()); - Assert.assertTrue(response.getBuyerCatalogApparel().get().isMen()); - Assert.assertTrue(response.getDetails().get().getBuyer().getCatalog().isBeauty()); - Assert.assertTrue(response.getDetails().get().getBuyer().getCatalog().isVideoEntertainment()); - Assert.assertTrue(response.getDetails().get().getBuyer().getRetail().isBeauty()); - Assert.assertTrue(response.getBuyerRetailApparel().get().isChildren()); - Assert.assertTrue(response.getDetails().get().getSurvey().getOwn().isOwnDigitalCamera()); - Assert.assertTrue(response.getDetails().get().getSurvey().getCollectibles().isCoins()); - Assert.assertTrue( - response.getDetails().get().getSurvey().getCreditCards().getPremium().isAmex()); - Assert.assertTrue(response.getDetails().get().getSurvey().getCreditCards().isDebit()); - Assert.assertTrue(response.getDetails().get().getSurvey().getDietConcerns().isHealthy()); - Assert.assertTrue(response.getDetails().get().getSurvey().getHobby().isCigarSmoking()); - Assert.assertTrue( - response.getDetails().get().getSurvey().getHobby().getGardening().isFlowers()); - Assert.assertTrue(response.getDetails().get().getSurvey().getHobby().isSpirituality()); - Assert.assertTrue(response.getDetails().get().getSurvey().isInvestments()); - Assert.assertTrue(response.getDetails().get().getSurvey().getMusic().isClassical()); - Assert.assertTrue(response.getDetails().get().getSurvey().getReading().isHistory()); - Assert.assertTrue(response.getDetails().get().getSurvey().getSporting().isFitness()); - Assert.assertTrue(response.getDetails().get().getSurvey().getTravel().isCasinoVacations()); - Assert.assertTrue(response.getDetails().get().getSurvey().getElectronics().isHomeTheater()); - Assert.assertTrue(response.getDetails().get().getSurvey().getPurchase().isUsesCoupons()); + Assert.assertEquals("MFDU", response.getHomeInfo().get().getDwellingType()); + Assert.assertEquals("C032", response.getLocationInfo().get().getCarrierRoute()); + Assert.assertEquals("24660", response.getLocationInfo().get().getCoreBasedStatisticalArea()); Assert.assertEquals( "marqross91", response.getDetails().get().getProfiles().getTwitter().getUsername()); Assert.assertEquals( @@ -140,9 +60,6 @@ public void personResponseModelDeserializationTest() { response.getDetails().get().getEducation().get(0).getName()); Assert.assertEquals( "http://marquitaas8.com/", response.getDetails().get().getUrls().get(0).getValue()); - Assert.assertEquals("9", response.getExtended().get("key_1")); - Assert.assertEquals("Q", response.getExtended().get("key_3")); - Assert.assertEquals("11", response.getExtended().get("key_5")); } @Test 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/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/completeCanaryResponse.json b/java11/src/test/resources/completeCanaryResponse.json index 6330d08..a2785bb 100644 --- a/java11/src/test/resources/completeCanaryResponse.json +++ b/java11/src/test/resources/completeCanaryResponse.json @@ -1,13 +1,12 @@ { "fullName": "Marquita H Ross", - "ageRange": "37-47", + "ageRange": "40-49", "gender": "Female", "location": "San Francisco, California, United States", "title": "Senior Petroleum Manager", "organization": "Mostow Co.", "twitter": "https://twitter.com/marqross91", "linkedin": "https://www.linkedin.com/in/marquita-ross-5b6b72192", - "facebook": null, "bio": "Senior Petroleum Manager at Mostow Co.", "avatar": "https://img.fullcontact.com/sandbox/1gagrO2K67_oc5DLG_siVCpYVE5UvCu2Z.png", "website": "http://marquitaas8.com/", @@ -18,247 +17,272 @@ "full": "Marquita H Ross" }, "age": { - "range": "35-44", + "range": "40-49", "value": 42 }, "gender": "Female", "household": { "familyInfo": { - "totalAdults": 2, - "totalChildren": 1, - "totalPeopleInHousehold": 3 + "householdSize": "4", + "numberOfAdults": "3", + "numberOfChildren": "3", + "lifeCycles": { + "babyBoomers": "Y", + "dualIncomeNoKids": "Y", + "generationX": "Y", + "millenialsButFirstLetMeTakeASelfie": "Y", + "millenialsGettinHitched": "Y", + "millenialsIAmAnAdult": "Y", + "millenialsLivesWithMom": "Y", + "millenialsMomLife": "Y", + "millenialsPuttingDownRoots": "Y" + } }, "homeInfo": { - "dwellingType": "Multi Family Dwelling/Apartment", - "homeValueEstimate": 513, - "loanToValueEstimate": 4 + "dwellingType": "MFDU", + "dwellingTypeIndicator": "S", + "householdEducation": "Unknown", + "householdEducationIndicator": "H", + "maritalStatus": "Both married and single", + "lengthOfResidence": "1-2 yrs", + "lengthOfResidenceIndicator": "S", + "affluents": "Gold", + "currentLoanToValue": "82", + "householdOccupation": "Business Owner", + "familyComposition": "1", + "homeMarketValue": "0253S", + "ownerToOwner": "Highly Likely", + "rentertoOwner": "Highly Likely", + "yearHomeBuilt": "1988" }, "locationInfo": { - "seasonalAddress": true, - "carrierRoute": "PO Box", - "designatedMarketArea": "807", - "coreBasedStatisticalArea": "41860 - San Francisco-Oakland-Hayward, CA Metropolitan Statistical Area", - "nielsenCountySize": "B - All counties in the next largest set of metropolitan areas which together account for 30% of U.S. households according to the 2000 Census. No non-metropolitan counties qualify as A or B counties.", - "congressionalDistrict": "AT_LARGE", - "numericCountyCode": 222 + "nielsenCountySize": "All counties in the largest metropolitan areas which together account for 40% of U.S. households according to the 2010 census.", + "carrierRoute": "C032", + "coreBasedStatisticalArea": "24660", + "blockGroupNumber": "8", + "censusTractSuffix": "5", + "countyCode": "81", + "dsfSeasonCode": "B" }, "presence": { - "multigenerationalResident": "PRESENT", - "children": "PRESENT" + "presenceOfChildren": "Y", + "presenceOfChildrenIndicator": "H", + "adult": { + "age18to24": "Male", + "age25to34": "Female", + "age35to44": "Male", + "age45to54": "Female", + "age55to64": "Male", + "age65to74": "Male", + "age75above": "Female" + }, + "child": { + "age0to2": "Male", + "age11to15": "Male", + "age16to17": "Female", + "age3to5": "Female", + "age6to10": "Female" + } }, "finance": { - "discretionaryIncomeEstimate": 45, - "financialDebtRangeEstimate": "$0", - "householdIncomeEstimate": "$150,000 - $199,999", - "netWorthRange": "$50,000 - $74,999", - "cashValueBalanceHouseholdEstimate": "$25,000 - $49,999" + "income": "$20,000 - $29,999", + "incomeIndicator": "H", + "narrowBandIncome": "$25,000 - $29,999", + "discretionarySpendingIncome": "$55,000 - $64,999", + "firstMortgageAmountInThousands": "383", + "homeEquityLoanDate": "201107", + "homeMarketValueTaxRecord": "150", + "homeEquityLoanInThousands": "539", + "homeEquityLoanIndicator": "1", + "investmentResources": "$15,000 - $24,999", + "liquidResources": "$100,000 or more", + "mortgageInterestRateTypeOrRefinance": "Fixed Rate Loan", + "mortgageLiability": "372", + "mortgageLoanTypeOrRefinance": "Conventional", + "mortgageDate": "200308", + "refinanceIndicator": "1", + "secondMortgageAmountInThousands": "120", + "shortTermLiability": "0", + "incomeIndex": "59", + "netWorth": "Under $25,000", + "wealthResources": "Less than $25,000", + "paymentMethodCreditCard": "Y" + }, + "childrenInfo": { + "gender": { + "firstChild": "Unknown Gender", + "secondChild": "Male", + "thirdChild": "Male", + "fourthChild": "Female" + }, + "birthDate": { + "firstChild": "201503", + "secondChild": "201703", + "thirdChild": "201803", + "fourthChild": "201903" + } } }, "demographics": { "gender": "Female", "age": { - "range": "35-44", + "range": "40-49", "value": 42 }, - "livingStatus": "Probable Homeowner", - "maritalStatus": "MARRIED", - "occupation": "Professional - Engineer/Industrial" + "consumers": { + "valueScore": "Best Profit Margin" + }, + "homeInfo": { + "homeOwner": "Unknown", + "homeOwnerIndicator": "S" + }, + "enthusiasts": { + "niches": "Already Affluent" + }, + "maritalInfo": { + "maritalStatus": "Married", + "maritalStatusIndicator": "S" + } }, - "survey": { + "surveys": { "own": { - "ownDigitalCamera": true, - "ownDog": true, - "ownSwimmingPool": true, - "ownRv": true + "smartPhone": "Y", + "cat": "Y", + "dog": "Y", + "pets": "Y" }, "collectibles": { - "general": true, - "coins": true, - "stamps": true - }, - "creditCards": { - "premium": { - "amex": true, - "store": true, - "visaOrMasterCard": true - }, - "regular": { - "amex": true, - "other": true, - "visaOrMasterCard": true - }, - "debit": true + "figurines": "Y", + "any": "Y", + "artAntique": "Y" }, "dietConcerns": { - "general": true, - "loseWeight": true, - "vitaminSupplements": true, - "healthy": true + "naturalFoods": "Y" }, "hobby": { - "general": true, - "baking": true, - "cigarSmoking": true, - "gourmetCooking": true, - "cooking": true, - "gardening": { - "general": true, - "flowers": true - }, - "homeImprovement": true, - "exercise3xPerWeek": true, - "lowFatCooking": true, - "diy": true, - "spirituality": true - }, - "onlinePurchaser": true, - "investments": true, + "baking": "Y", + "cooking": "Y", + "gardening": "Y", + "woodworking": "Y", + "careerAdvancementCourses": "Y", + "any": "Y", + "gourmetFoods": "Y", + "homeImprovementOrDIY": "Y", + "motorcycleRiding": "Y" + }, + "investments": { + "juvenileLifeInsurance": "Y", + "burialInsurance": "Y", + "insurance": "Y", + "investments": "Y", + "lifeInsurance": "Y", + "medicareCoverage": "Y", + "mutualFunds": "Y", + "stocksOrBonds": "Y" + }, "music": { - "general": true, - "christianOrGospel": true, - "classical": true, - "other": true, - "rhythmAndBlues": true + "christianOrGospel": "Y", + "jazz": "Y", + "rythmAndBlues": "Y" }, "reading": { - "likesToRead": true, - "bibleOrDevotional": true, - "bestSellingFiction": true, - "childrens": true, - "history": true, - "health": true, - "naturalHealthRemedies": true, - "entertainment": true, - "worldNewsOrPolitics": true, - "bestSellers": true, - "magazines": true + "bibleOrDevotional": "Y", + "childrens": "Y", + "fashion": "Y", + "entertainment": "Y", + "romance": "Y", + "sports": "Y", + "books": "Y", + "cookingOrCulinary": "Y", + "medicalOrHealth": "Y", + "worldNews": "Y" }, "sporting": { - "fitness": true, - "walking": true, - "running": true + "campingOrHiking": "Y", + "nascar": "Y", + "cycling": "Y", + "bigGameHunting": "Y", + "huntingOrShooting": "Y", + "sportsMerchandiseOrActivewearRecency": "7 - 12 months", + "sportsParticipation": "Y", + "walkingForHealth": "Y", + "yogaOrPilates": "Y" }, "travel": { - "general": true, - "usBusiness": true, - "casinoVacations": true, - "frequentFlyer": true - }, - "religious": true, - "electronics": { - "appleDevice": true, - "cableTv": true, - "highSpeedInternet": true, - "dvdPlayer": true, - "hdtv": true, - "homeTheater": true, - "other": true + "business": "Y", + "international": "Y", + "rvVacations": "Y", + "travelInTheUSA": "Y", + "traveler": "Y" }, "purchase": { - "homeDecorating": true, - "beautyProducts": true, - "clubStores": true, - "usesCoupons": true + "artsCraftsRecency": "0 - 6 months", + "beautyAndSpaRecency": "0 - 6 months", + "beveragesRecency": "7 - 12 months", + "booksRecency": "0 - 6 months", + "clubContinuity": "Y", + "gardenAndBackyardRecency": "13 - 18 months", + "homeDecorRecency": "7 - 12 months", + "sweepstakes": "Y", + "maleApparelRecency": "7 - 12 months", + "musicVideosRecency": "13 - 18 months", + "specialtyFoodsAndGiftsRecency": "7 - 12 months", + "sportsAndOutdoorRecency": "0 - 6 months", + "toolsAndElectronicsRecency": "7 - 12 months", + "femaleAndMaleRecency": "7 - 12 months", + "femaleBrandAndFitRecency": "0 - 6 months" + }, + "donor": { + "activeMilitary": "Y", + "animalWelfare": "Y", + "artsOrCultural": "Y", + "cancer": "Y", + "catholic": "Y", + "childrens": "Y", + "charitable": "Y", + "humanitarian": "Y", + "nativeAmerican": "Y", + "politicalConservative": "Y", + "politicalLiberal": "Y", + "veteran": "Y", + "worldRelief": "Y" + }, + "mailOrder": { + "any": "Y", + "books": "Y", + "buyer": "Y", + "food": "Y", + "healthOrBeautyProducts": "Y", + "homeFurnishing": "Y", + "jewelry": "Y", + "magazines": "Y", + "videosOrDVD": "Y", + "womensPlusApparel": "Y" + }, + "other": { + "grandchildren": "Y", + "militaryVeteran": "Y", + "swimmingPool": "Y" + }, + "social": { + "facebookUser": "Y", + "instagramUser": "Y", + "pinterestUser": "Y", + "twitterUser": "Y" } }, - "finance": { - "bankCard": "Multiple Bank Card", - "activeLineOfCredit": true, - "retailCard": "Multiple Retail Card" - }, - "census": { - "basicTractNumber": 145, - "basicBlockGroup": 2, - "year2010": { - "educationLevel": "High School Diploma", - "average": { - "numberOfCarsInHousehold": 2.3000000000000003 - }, - "percent": { - "abovePovertyLevel": 74, - "belowPovertyLevel": 28, - "black": 17, - "blueCollarEmployed": 35, - "divorcedOrSeparated": 14, - "hispanic": 43, - "homesBuiltSince2000": 52, - "homeowner": 90, - "householdsWithChildren": 38, - "married": 36, - "mobileHome": 45, - "movedToAreaSince2000": 21, - "salariedProfessional": 35, - "singleFamilyHome": 43, - "vehicleOwnership": 84, - "white": 35 - }, - "median": { - "ageOfHouseholder": 23, - "effectiveBuyingIncome": 18, - "homeValue": 35, - "householdIncome": 18, - "householdIncomeByState": 69 - }, - "populationDensity": { - "centileInState": 67, - "centileInUs": 17 - }, - "socioEconomicScore": 29 + "emails": [ + { + "label": "Work", + "md5": "e553346f9a9e8dbe56493a581706f318" } - }, - "buyer": { - "catalog": { - "payment": { - "amx": true, - "creditCard": true, - "houseCharge": true, - "masterCard": true, - "retailCard": true, - "visa": true - }, - "apparel": { - "general": true, - "children": true, - "men": true, - "mensBigTall": true, - "nonGenderSpecific": true, - "womenPetiteSize": true, - "womenPlusSize": true - }, - "beauty": true, - "books": true, - "childrenProducts": true, - "electronics": true, - "furniture": true, - "health": true, - "jewelry": true, - "music": true, - "stationery": true, - "travel": true, - "videoEntertainment": true - }, - "retail": { - "apparel": { - "general": true, - "children": true, - "women": true - }, - "beauty": true, - "books": true, - "childrenProducts": true, - "collectibles": true, - "foodBeverages": true, - "gift": true, - "health": true, - "homeFurnishings": true, - "jewelry": true, - "music": true, - "stationery": true, - "travel": true + ], + "phones": [ + { + "label": "work", + "value": "+13305336017" } - }, - "emails": [], - "phones": [], + ], "profiles": { "twitter": { "username": "marqross91", @@ -321,14 +345,372 @@ "value": "http://marquitaas8.com/" } ], - "interests": [] - }, - "extended": { - "key_1": "9", - "key_2": "H", - "key_3": "Q", - "key_4": "0", - "key_5": "11" + "interests": [], + "identifiers": { + "personIds": [ + "L0yG2Mp8Z4TVHxJK92GAxjWsTX6lrSfMBsQKvRsy5NzKnTm6" + ] + }, + "triggers": { + "type": { + "collegeGraduate": "Y", + "emptyNester": "N", + "homeMarketValue": "D", + "income": "D", + "newAdultToFile": "N", + "newFirstChild0to2YearsOld": "N", + "newPreDriver": "N", + "newYoungAdultToFile": "N", + "nicheSwitch": "Niche A", + "valueScore": "D" + }, + "date": { + "collegeGraduateChange": "200802", + "emptyNesterChange": "199804", + "firstChildChange": "200103", + "homeMarketValueChange": "200902", + "incomeChange": "200902", + "newAdultChange": "200503", + "newDriverChange": "201602", + "newYoungAdultToChange": "202008", + "nicheSwitch": "200212", + "valueScoreChange": "201308" + } + }, + "marketTrends": { + "switchers": { + "alcoholBeverage": "Likely", + "beerBrand": "Highly Likely", + "breakfastMeatBrand": "Unlikely", + "chocolateCandyBrand": "Likely", + "cocaColaBrand": "Unlikely", + "coldCerealBrand": "Likely", + "energyDrink": "Likely", + "frozenFoodBrand": "Highly Likely", + "householdCleaningProductsBrand": "Highly Likely", + "insurance": "Highly Likely", + "job": "Unlikely", + "naturalCheeseSlicesBrand": "Highly Likely", + "naturalShreddedCheeseBrand": "Unlikely", + "nutritionalHealthBarBrand": "Highly Likely", + "refrigeratedLunchMeatBrand": "Likely", + "snackBarGranolaBarBrand": "Likely", + "softDrinksBrand": "Unlikely", + "spiritsBrand": "Unlikely", + "yogurtBrand": "Highly Likely" + }, + "seekers": { + "freshFood": "Unlikely", + "homeCleaningNewProduct": "Likely", + "laundryNewProduct": "Unlikely", + "onlineDegreeEducation": "Likely", + "personalCareNewProduct": "Likely", + "premiumNaturalHomeCleaners": "Highly Likely", + "scent": "Unlikely", + "unscentedProduct": "Highly Likely" + }, + "enthusiasts": { + "artHouseMovie": "Unlikely", + "baseball": "Highly Likely", + "basketball": "Likely", + "brandLoyalists": "Highly Likely", + "carryOut": "Likely", + "casualDining": "Likely", + "christianorGospelMusic": "Likely", + "cigarPipe": "Likely", + "convenienceHomeCleaners": "Highly Likely", + "countryMusic": "Likely", + "discountMovie": "Unlikely", + "domesticBeer": "Likely", + "extremeFitness": "Likely", + "fantasySports": "Likely", + "football": "Likely", + "freeStreaming": "Highly Likely", + "frequentMovie": "Likely", + "gamingnonMobileDevices": "Highly Likely", + "hardCider": "Unlikely", + "hardSeltzer": "Highly Likely", + "hockey": "Highly Likely", + "homeShoppingNetwork": "Highly Likely", + "importBeer": "Highly Likely", + "kroger": "Unlikely", + "latinMusic": "Highly Likely", + "liquor": "Unlikely", + "mobileGaming": "Highly Likely", + "openingWeekendMovie": "Likely", + "paidStreaming": "Likely", + "petsAreFamily": "Highly Likely", + "quickServiceRestaurant": "Highly Likely", + "redWine": "Unlikely", + "soccer": "Highly Likely", + "target": "Likely", + "valueChains": "Highly Likely", + "walmart": "Highly Likely", + "whiteWine": "Highly Likely", + "yogaPilates": "Likely" + }, + "attendees": { + "amusementPark": "Highly Likely", + "culturalArtsEvents": "Unlikely", + "liveMusicConcert": "Unlikely", + "professionalSportsEvents": "Highly Likely" + }, + "buyers": { + "autoInsuranceSelfServeOnline": "Highly Likely", + "christmasOrnamentsCollectibles": "Unlikely", + "heavyFiberFocusedFood": "Likely", + "heavyGlutenFreeFood": "Unlikely", + "heavyLowFatFood": "Highly Likely", + "onlineHomeCleaningProduct": "Likely", + "onlineInsurance": "Likely", + "onlineLaundryProduct": "Highly Likely", + "onlinePersonalCareProduct": "Likely", + "onlinePetFood": "Unlikely" + }, + "chef": { + "experimental": "Likely", + "master": "Highly Likely", + "realIngredient": "Highly Likely" + }, + "customers": { + "amazonPrime": "Likely", + "annuity": "Unlikely", + "autoInsurancePremiumDiscountviaTelematicsCustomer": "Likely", + "certificatesofDeposit": "Unlikely", + "clicktoCartHomeDelivery": "Likely", + "clicktoCartPickUp": "Likely", + "communityBankCustomer": "Unlikely", + "convenience": "Highly Likely", + "deposit": "Highly Likely", + "directMediaPreference": "Highly Likely", + "financialAdvisor": "Unlikely", + "frequentATM": "Unlikely", + "groceryLoyaltyCard": "Likely", + "interestCheckingPreference": "Unlikely", + "internetResearchPreference": "Unlikely", + "lending": "Likely", + "loyalFinancialInstitution": "Unlikely", + "mensBigandTallApparel": "Unlikely", + "nationalBankCustomer": "Highly Likely", + "plantoPurchaseSmartHomeProducts": "Highly Likely", + "regionalBankCustomer": "Highly Likely", + "restaurantLoyaltyCard": "Likely", + "selfInsuredDental": "Unlikely", + "smartHome": "Unlikely", + "socialMediaPreference": "Unlikely", + "studentLoan": "Unlikely", + "subscriptionorAutoShipmentHouseholdProduct": "Likely", + "womensPlusSizeApparel": "Likely", + "qsrcash": "Likely" + }, + "consumers": { + "airlineUpgraders": "Highly Likely", + "autoInsurance": "Likely", + "autoInsuranceAgentSold": "Unlikely", + "autoInsuranceCallCenterSold": "Likely", + "cableBundlecableinternethomephone": "Likely", + "casinoGamer": "Highly Likely", + "coinsCollector": "Likely", + "conservativeInvestmentStyle": "Likely", + "contactlessPayApplication": "Highly Likely", + "cordCutters": "Highly Likely", + "creditCardAttritionHouseholds": "Likely", + "creditCardRevolvers": "Unlikely", + "creditUnionMember": "Likely", + "dietConsciousHouseholds": "Likely", + "doitYourselfer": "Highly Likely", + "employerProvidedHealthInsurancePolicyHolders": "Highly Likely", + "frequentOnlineMovieViewers": "Highly Likely", + "freshFoodDelivery": "Likely", + "futureInvestors": "Likely", + "gamers": "Unlikely", + "gigEconomyEmployees": "Likely", + "groceryStoreFrequenters": "Highly Likely", + "homeEntertainers": "Likely", + "homeRemodelers": "Unlikely", + "intheMarkettoGetaHomeLoan": "Likely", + "intheMarkettoPurchaseaHome": "Likely", + "intendtoPurchaseaSamsungmobiledevice": "Highly Likely", + "intendtopurchase5GService": "Likely", + "investmentTrustBankingPreference": "Highly Likely", + "likelyMortgageRefinancers": "Unlikely", + "likelyPlannedGivers": "Unlikely", + "likelytoUseanInvestmentBroker": "Unlikely", + "likelytohaveaMortgage": "Highly Likely", + "longRoadTripTakers": "Likely", + "longTermCare": "Unlikely", + "lowInterestCreditCard": "Likely", + "lowSodium": "Likely", + "mealKitDelivery": "Highly Likely", + "medicaidPotentialQualifiedHousehold": "Likely", + "medicareDualEligibleHousehold": "Likely", + "medicarePlanDPrescriptionDrugHealth": "Unlikely", + "mobileBrowsers": "Likely", + "movieLoyaltyProgramMembers": "Likely", + "naturalGreenProductHomeCleaners": "Unlikely", + "non401kMutualFundInvestors": "Likely", + "non401kStocksBondsInvestors": "Unlikely", + "pandemicLuxurySpenders": "Likely", + "pandemicRiskTolerant": "Likely", + "paychecktoPaycheck": "Unlikely", + "personalTraveler": "Likely", + "plantoPurchaseHomeSecuritySystems": "Highly Likely", + "plantogetFitnessMembership": "Likely", + "rentersandAutoInsuranceJointPolicyHolders": "Unlikely", + "retailTexters": "Unlikely", + "retiredbutStillWorking": "Likely", + "satelliteBundlesatelliteinethomeorwireless": "Likely", + "selfPayHealthInsurance": "Likely", + "seniorCaregivers": "Highly Likely", + "seniorLivingSearchers": "Unlikely", + "sociallyInfluenced": "Highly Likely", + "termLife": "Highly Likely", + "underbanked": "Unlikely", + "uninsuredforHealth": "Highly Likely", + "upcomingRetirees65andOlder": "Likely", + "vegetarians": "Highly Likely", + "vehicleDIYrs": "Highly Likely", + "weeklyOnlineBankers": "Highly Likely", + "wellnessHouseholdsHealth": "Unlikely", + "wholeLife": "Likely", + "wiredLineVideoConnectors": "Unlikely", + "workforSmallCompanyOfferingHealthInsurance": "Unlikely" + }, + "donor": { + "animalWelfare": "Highly Likely", + "cancer": "Highly Likely", + "childrensCauses": "Likely", + "consistentReligious": "Unlikely", + "environmental": "Unlikely", + "highDollarOtherCausesnonReligious": "Unlikely", + "highDollarReligiousCauses": "Likely", + "liberalCauses": "Likely", + "university": "Highly Likely", + "veteran": "Likely" + }, + "owners": { + "_401k": "Unlikely", + "androidSmartPhone": "Highly Likely", + "appleSmartPhone": "Unlikely", + "boat": "Likely", + "educationSavingsPlan": "Likely", + "multiPolicyInsurance": "Unlikely", + "prepaidCard": "Likely", + "secondHome": "Highly Likely", + "smartTV": "Likely", + "tablet": "Highly Likely", + "timeshare": "Likely", + "veterinarianInfluencedPet": "Unlikely" + }, + "travellers": { + "business": "Unlikely", + "rvtripTakers": "Highly Likely" + }, + "readers": { + "avidBook": "Likely", + "bibleDevotional": "Highly Likely", + "book": "Highly Likely", + "entertainment": "Highly Likely", + "label": "Likely", + "retailerCircular": "Unlikely", + "romance": "Unlikely", + "sports": "Highly Likely" + }, + "voters": { + "democratic": "Highly Likely", + "independent": "Unlikely", + "likely": "Highly Likely", + "republican": "Likely", + "swing": "Likely" + }, + "subscribers": { + "cableTVPremium": "Unlikely", + "financialHealthNewsletter": "Highly Likely", + "onlineMagazineNewspaper": "Unlikely", + "retailerEmail": "Likely", + "satelliteRadio": "Unlikely" + }, + "planners": { + "budgetMeal": "Highly Likely", + "meal": "Highly Likely", + "preShop": "Unlikely" + }, + "purchasers": { + "autoLoan": "Highly Likely", + "brandDrivenHomeCleaners": "Likely", + "frequentMobile": "Likely", + "frequentOnlineMusic": "Unlikely", + "greenProduct": "Unlikely", + "impulse": "Highly Likely", + "medicareAdvantagePlan": "Unlikely", + "midmarketTermLifeInsurance": "Unlikely", + "midmarketWholeLifeInsurance": "Unlikely", + "newLuxuryVehicle": "Unlikely", + "newnonLuxuryVehicle": "Highly Likely", + "organicFood": "Likely", + "organicProduct": "Highly Likely", + "petInsurance": "Unlikely", + "vehicle": "Likely", + "webSurferBrickMortar": "Highly Likely", + "webandBrickMortarViewerOnline": "Likely", + "rv": "Unlikely", + "acahealthInsurance": "Likely" + }, + "spenders": { + "pandemicDecreasedSpenders": "Unlikely", + "vacationSpenders": "Likely" + }, + "shoppers": { + "bargainHotel": "Likely", + "bargain": "Highly Likely", + "everydayLowPrice": "Highly Likely", + "financialInstitution": "Likely", + "multiRetailer": "Unlikely", + "oneStop": "Likely", + "priceMatchers": "Highly Likely", + "privateLabel": "Likely", + "stockUp": "Unlikely", + "whatsOnSale": "Unlikely" + }, + "stores": { + "stockUpAtWalmart": "Unlikely" + }, + "users": { + "app": "Highly Likely", + "brandMotivatedLaundry": "Unlikely", + "brandMotivatedPersonalCareProduct": "Likely", + "brandedRetailCreditCard": "Highly Likely", + "convenienceDrivenPersonalCareProduct": "Unlikely", + "creditCardBalanceTransfer": "Highly Likely", + "debitCardRewards": "Unlikely", + "debitCard": "Likely", + "groceryStoreApp": "Likely", + "heavyCoupon": "Likely", + "mobileBanking": "Likely", + "mobileShoppingList": "Likely", + "naturalProductPersonalCareProduct": "Likely", + "onlineBroker": "Unlikely", + "onlineSavings": "Highly Likely", + "paperShoppingList": "Unlikely", + "premiumNaturalPersonalCareProduct": "Unlikely", + "priceMotivatedLaundryProduct": "Unlikely", + "priceMotivatedPersonalCareProduct": "Likely", + "publicTransportation": "Unlikely", + "restaurantApp": "Unlikely", + "restaurantLoyaltyApp": "Highly Likely", + "rewardsCardCashBack": "Unlikely", + "rewardsCardOther": "Highly Likely", + "sociallyActiveonFacebook": "Unlikely", + "sociallyActiveonFacebookBrandLikers": "Unlikely", + "sociallyActiveonFacebookCategoryRecommenders": "Highly Likely", + "sociallyActiveonPinterest": "Likely", + "sociallyActiveonTwitter": "Unlikely", + "targetCartwheel": "Likely", + "uberOrLyft": "Likely", + "vehicleServiceCenter": "Highly Likely", + "walmartSavingCatcher": "Likely" + } + } }, "isSandboxProfile": true, "updated": "1970-01-01" 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/README.md b/java8/README.md index c760a64..d8f77a5 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:5.0.0' ``` ### Maven users @@ -66,7 +66,7 @@ Add this dependency to your project's POM: com.fullcontact.client java8 - 4.0.0 + 5.0.0 ``` @@ -679,6 +679,8 @@ Assert.assertTrue(response.isEnabled()); ``` ## Changelog +- v5.0.0 - Updated Response for Person Enrich. +- 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/build.gradle b/java8/build.gradle index a5f4fca..1970207 100644 --- a/java8/build.gradle +++ b/java8/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'com.fullcontact.client' -version '4.0.0' +version '5.0.0' sourceCompatibility = 1.8 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..0bce99a 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<>(); @@ -44,7 +43,7 @@ public void personResponseModelDeserializationTest() Assert.assertEquals(200, response.getStatusCode()); Assert.assertEquals("OK", response.getMessage()); Assert.assertEquals("Marquita H Ross", response.getFullName()); - Assert.assertEquals("37-47", response.getAgeRange()); + Assert.assertEquals("40-49", response.getAgeRange()); Assert.assertEquals("Female", response.getGender()); Assert.assertEquals("San Francisco, California, United States", response.getLocation()); Assert.assertEquals("Senior Petroleum Manager", response.getTitle()); @@ -60,93 +59,12 @@ public void personResponseModelDeserializationTest() Assert.assertEquals("Marquita", response.getDetails().get().getName().getGiven()); Assert.assertEquals("Ross", response.getDetails().get().getName().getFamily()); Assert.assertEquals("Marquita H Ross", response.getDetails().get().getName().getFull()); - Assert.assertEquals("35-44", response.getDetails().get().getAge().getRange()); + Assert.assertEquals("40-49", response.getDetails().get().getAge().getRange()); Assert.assertEquals(42, (int) response.getDetails().get().getAge().getValue()); Assert.assertEquals("Female", response.getDetails().get().getGender()); - Assert.assertEquals(2, response.getFamilyInfo().get().getTotalAdults()); - Assert.assertEquals(1, response.getFamilyInfo().get().getTotalChildren()); - Assert.assertEquals(3, response.getFamilyInfo().get().getTotalPeopleInHousehold()); - Assert.assertEquals( - "Multi Family Dwelling/Apartment", response.getHomeInfo().get().getDwellingType()); - Assert.assertEquals(513, response.getHomeInfo().get().getHomeValueEstimate()); - Assert.assertEquals(4, response.getHomeInfo().get().getLoanToValueEstimate()); - Assert.assertTrue(response.getLocationInfo().get().isSeasonalAddress()); - Assert.assertEquals("PO Box", response.getLocationInfo().get().getCarrierRoute()); - Assert.assertEquals("807", response.getLocationInfo().get().getDesignatedMarketArea()); - Assert.assertEquals( - "41860 - San Francisco-Oakland-Hayward, CA Metropolitan Statistical Area", - response.getLocationInfo().get().getCoreBasedStatisticalArea()); - Assert.assertEquals("AT_LARGE", response.getLocationInfo().get().getCongressionalDistrict()); - Assert.assertEquals(222, response.getLocationInfo().get().getNumericCountyCode()); - Assert.assertEquals( - "PRESENT", response.getHouseHoldPresence().get().getMultigenerationalResident()); - Assert.assertEquals("PRESENT", response.getHouseHoldPresence().get().getChildren()); - Assert.assertEquals( - 45, - response.getDetails().get().getHousehold().getFinance().getDiscretionaryIncomeEstimate()); - Assert.assertEquals( - "$150,000 - $199,999", - response.getDetails().get().getHousehold().getFinance().getHouseholdIncomeEstimate()); - Assert.assertEquals( - "$25,000 - $49,999", - response - .getDetails() - .get() - .getHousehold() - .getFinance() - .getCashValueBalanceHouseholdEstimate()); - Assert.assertEquals("Probable Homeowner", response.getDemographics().get().getLivingStatus()); - Assert.assertEquals( - "Professional - Engineer/Industrial", response.getDemographics().get().getOccupation()); - Assert.assertEquals("Multiple Bank Card", response.getFinance().get().getBankCard()); - Assert.assertEquals("Multiple Retail Card", response.getFinance().get().getRetailCard()); - Assert.assertTrue(response.getFinance().get().isActiveLineOfCredit()); - Assert.assertEquals(145, response.getDetails().get().getCensus().getBasicTractNumber()); - Assert.assertEquals(2, response.getDetails().get().getCensus().getBasicBlockGroup()); - Assert.assertEquals( - "High School Diploma", - response.getDetails().get().getCensus().getYear2010().getEducationLevel()); - Assert.assertEquals( - 90, response.getDetails().get().getCensus().getYear2010().getPercent().getHomeowner()); - Assert.assertEquals( - 35, response.getDetails().get().getCensus().getYear2010().getMedian().getHomeValue()); - Assert.assertEquals( - 17, - response - .getDetails() - .get() - .getCensus() - .getYear2010() - .getPopulationDensity() - .getCentileInUs()); - Assert.assertEquals( - 29, response.getDetails().get().getCensus().getYear2010().getSocioEconomicScore()); - Assert.assertTrue(response.getBuyerCatalogPayment().get().isCreditCard()); - Assert.assertTrue(response.getBuyerCatalogPayment().get().isHouseCharge()); - Assert.assertTrue(response.getBuyerCatalogPayment().get().isMasterCard()); - Assert.assertTrue(response.getBuyerCatalogApparel().get().isChildren()); - Assert.assertTrue(response.getBuyerCatalogApparel().get().isMen()); - Assert.assertTrue(response.getDetails().get().getBuyer().getCatalog().isBeauty()); - Assert.assertTrue(response.getDetails().get().getBuyer().getCatalog().isVideoEntertainment()); - Assert.assertTrue(response.getDetails().get().getBuyer().getRetail().isBeauty()); - Assert.assertTrue(response.getBuyerRetailApparel().get().isChildren()); - Assert.assertTrue(response.getDetails().get().getSurvey().getOwn().isOwnDigitalCamera()); - Assert.assertTrue(response.getDetails().get().getSurvey().getCollectibles().isCoins()); - Assert.assertTrue( - response.getDetails().get().getSurvey().getCreditCards().getPremium().isAmex()); - Assert.assertTrue(response.getDetails().get().getSurvey().getCreditCards().isDebit()); - Assert.assertTrue(response.getDetails().get().getSurvey().getDietConcerns().isHealthy()); - Assert.assertTrue(response.getDetails().get().getSurvey().getHobby().isCigarSmoking()); - Assert.assertTrue( - response.getDetails().get().getSurvey().getHobby().getGardening().isFlowers()); - Assert.assertTrue(response.getDetails().get().getSurvey().getHobby().isSpirituality()); - Assert.assertTrue(response.getDetails().get().getSurvey().isInvestments()); - Assert.assertTrue(response.getDetails().get().getSurvey().getMusic().isClassical()); - Assert.assertTrue(response.getDetails().get().getSurvey().getReading().isHistory()); - Assert.assertTrue(response.getDetails().get().getSurvey().getSporting().isFitness()); - Assert.assertTrue(response.getDetails().get().getSurvey().getTravel().isCasinoVacations()); - Assert.assertTrue(response.getDetails().get().getSurvey().getElectronics().isHomeTheater()); - Assert.assertTrue(response.getDetails().get().getSurvey().getPurchase().isUsesCoupons()); + Assert.assertEquals("MFDU", response.getHomeInfo().get().getDwellingType()); + Assert.assertEquals("C032", response.getLocationInfo().get().getCarrierRoute()); + Assert.assertEquals("24660", response.getLocationInfo().get().getCoreBasedStatisticalArea()); Assert.assertEquals( "marqross91", response.getDetails().get().getProfiles().getTwitter().getUsername()); Assert.assertEquals( @@ -167,9 +85,6 @@ public void personResponseModelDeserializationTest() response.getDetails().get().getEducation().get(0).getName()); Assert.assertEquals( "http://marquitaas8.com/", response.getDetails().get().getUrls().get(0).getValue()); - Assert.assertEquals("9", response.getExtended().get("key_1")); - Assert.assertEquals("Q", response.getExtended().get("key_3")); - Assert.assertEquals("11", response.getExtended().get("key_5")); } @Test 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<>(); 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/completeCanaryResponse.json b/java8/src/test/resources/completeCanaryResponse.json index 6330d08..a2785bb 100644 --- a/java8/src/test/resources/completeCanaryResponse.json +++ b/java8/src/test/resources/completeCanaryResponse.json @@ -1,13 +1,12 @@ { "fullName": "Marquita H Ross", - "ageRange": "37-47", + "ageRange": "40-49", "gender": "Female", "location": "San Francisco, California, United States", "title": "Senior Petroleum Manager", "organization": "Mostow Co.", "twitter": "https://twitter.com/marqross91", "linkedin": "https://www.linkedin.com/in/marquita-ross-5b6b72192", - "facebook": null, "bio": "Senior Petroleum Manager at Mostow Co.", "avatar": "https://img.fullcontact.com/sandbox/1gagrO2K67_oc5DLG_siVCpYVE5UvCu2Z.png", "website": "http://marquitaas8.com/", @@ -18,247 +17,272 @@ "full": "Marquita H Ross" }, "age": { - "range": "35-44", + "range": "40-49", "value": 42 }, "gender": "Female", "household": { "familyInfo": { - "totalAdults": 2, - "totalChildren": 1, - "totalPeopleInHousehold": 3 + "householdSize": "4", + "numberOfAdults": "3", + "numberOfChildren": "3", + "lifeCycles": { + "babyBoomers": "Y", + "dualIncomeNoKids": "Y", + "generationX": "Y", + "millenialsButFirstLetMeTakeASelfie": "Y", + "millenialsGettinHitched": "Y", + "millenialsIAmAnAdult": "Y", + "millenialsLivesWithMom": "Y", + "millenialsMomLife": "Y", + "millenialsPuttingDownRoots": "Y" + } }, "homeInfo": { - "dwellingType": "Multi Family Dwelling/Apartment", - "homeValueEstimate": 513, - "loanToValueEstimate": 4 + "dwellingType": "MFDU", + "dwellingTypeIndicator": "S", + "householdEducation": "Unknown", + "householdEducationIndicator": "H", + "maritalStatus": "Both married and single", + "lengthOfResidence": "1-2 yrs", + "lengthOfResidenceIndicator": "S", + "affluents": "Gold", + "currentLoanToValue": "82", + "householdOccupation": "Business Owner", + "familyComposition": "1", + "homeMarketValue": "0253S", + "ownerToOwner": "Highly Likely", + "rentertoOwner": "Highly Likely", + "yearHomeBuilt": "1988" }, "locationInfo": { - "seasonalAddress": true, - "carrierRoute": "PO Box", - "designatedMarketArea": "807", - "coreBasedStatisticalArea": "41860 - San Francisco-Oakland-Hayward, CA Metropolitan Statistical Area", - "nielsenCountySize": "B - All counties in the next largest set of metropolitan areas which together account for 30% of U.S. households according to the 2000 Census. No non-metropolitan counties qualify as A or B counties.", - "congressionalDistrict": "AT_LARGE", - "numericCountyCode": 222 + "nielsenCountySize": "All counties in the largest metropolitan areas which together account for 40% of U.S. households according to the 2010 census.", + "carrierRoute": "C032", + "coreBasedStatisticalArea": "24660", + "blockGroupNumber": "8", + "censusTractSuffix": "5", + "countyCode": "81", + "dsfSeasonCode": "B" }, "presence": { - "multigenerationalResident": "PRESENT", - "children": "PRESENT" + "presenceOfChildren": "Y", + "presenceOfChildrenIndicator": "H", + "adult": { + "age18to24": "Male", + "age25to34": "Female", + "age35to44": "Male", + "age45to54": "Female", + "age55to64": "Male", + "age65to74": "Male", + "age75above": "Female" + }, + "child": { + "age0to2": "Male", + "age11to15": "Male", + "age16to17": "Female", + "age3to5": "Female", + "age6to10": "Female" + } }, "finance": { - "discretionaryIncomeEstimate": 45, - "financialDebtRangeEstimate": "$0", - "householdIncomeEstimate": "$150,000 - $199,999", - "netWorthRange": "$50,000 - $74,999", - "cashValueBalanceHouseholdEstimate": "$25,000 - $49,999" + "income": "$20,000 - $29,999", + "incomeIndicator": "H", + "narrowBandIncome": "$25,000 - $29,999", + "discretionarySpendingIncome": "$55,000 - $64,999", + "firstMortgageAmountInThousands": "383", + "homeEquityLoanDate": "201107", + "homeMarketValueTaxRecord": "150", + "homeEquityLoanInThousands": "539", + "homeEquityLoanIndicator": "1", + "investmentResources": "$15,000 - $24,999", + "liquidResources": "$100,000 or more", + "mortgageInterestRateTypeOrRefinance": "Fixed Rate Loan", + "mortgageLiability": "372", + "mortgageLoanTypeOrRefinance": "Conventional", + "mortgageDate": "200308", + "refinanceIndicator": "1", + "secondMortgageAmountInThousands": "120", + "shortTermLiability": "0", + "incomeIndex": "59", + "netWorth": "Under $25,000", + "wealthResources": "Less than $25,000", + "paymentMethodCreditCard": "Y" + }, + "childrenInfo": { + "gender": { + "firstChild": "Unknown Gender", + "secondChild": "Male", + "thirdChild": "Male", + "fourthChild": "Female" + }, + "birthDate": { + "firstChild": "201503", + "secondChild": "201703", + "thirdChild": "201803", + "fourthChild": "201903" + } } }, "demographics": { "gender": "Female", "age": { - "range": "35-44", + "range": "40-49", "value": 42 }, - "livingStatus": "Probable Homeowner", - "maritalStatus": "MARRIED", - "occupation": "Professional - Engineer/Industrial" + "consumers": { + "valueScore": "Best Profit Margin" + }, + "homeInfo": { + "homeOwner": "Unknown", + "homeOwnerIndicator": "S" + }, + "enthusiasts": { + "niches": "Already Affluent" + }, + "maritalInfo": { + "maritalStatus": "Married", + "maritalStatusIndicator": "S" + } }, - "survey": { + "surveys": { "own": { - "ownDigitalCamera": true, - "ownDog": true, - "ownSwimmingPool": true, - "ownRv": true + "smartPhone": "Y", + "cat": "Y", + "dog": "Y", + "pets": "Y" }, "collectibles": { - "general": true, - "coins": true, - "stamps": true - }, - "creditCards": { - "premium": { - "amex": true, - "store": true, - "visaOrMasterCard": true - }, - "regular": { - "amex": true, - "other": true, - "visaOrMasterCard": true - }, - "debit": true + "figurines": "Y", + "any": "Y", + "artAntique": "Y" }, "dietConcerns": { - "general": true, - "loseWeight": true, - "vitaminSupplements": true, - "healthy": true + "naturalFoods": "Y" }, "hobby": { - "general": true, - "baking": true, - "cigarSmoking": true, - "gourmetCooking": true, - "cooking": true, - "gardening": { - "general": true, - "flowers": true - }, - "homeImprovement": true, - "exercise3xPerWeek": true, - "lowFatCooking": true, - "diy": true, - "spirituality": true - }, - "onlinePurchaser": true, - "investments": true, + "baking": "Y", + "cooking": "Y", + "gardening": "Y", + "woodworking": "Y", + "careerAdvancementCourses": "Y", + "any": "Y", + "gourmetFoods": "Y", + "homeImprovementOrDIY": "Y", + "motorcycleRiding": "Y" + }, + "investments": { + "juvenileLifeInsurance": "Y", + "burialInsurance": "Y", + "insurance": "Y", + "investments": "Y", + "lifeInsurance": "Y", + "medicareCoverage": "Y", + "mutualFunds": "Y", + "stocksOrBonds": "Y" + }, "music": { - "general": true, - "christianOrGospel": true, - "classical": true, - "other": true, - "rhythmAndBlues": true + "christianOrGospel": "Y", + "jazz": "Y", + "rythmAndBlues": "Y" }, "reading": { - "likesToRead": true, - "bibleOrDevotional": true, - "bestSellingFiction": true, - "childrens": true, - "history": true, - "health": true, - "naturalHealthRemedies": true, - "entertainment": true, - "worldNewsOrPolitics": true, - "bestSellers": true, - "magazines": true + "bibleOrDevotional": "Y", + "childrens": "Y", + "fashion": "Y", + "entertainment": "Y", + "romance": "Y", + "sports": "Y", + "books": "Y", + "cookingOrCulinary": "Y", + "medicalOrHealth": "Y", + "worldNews": "Y" }, "sporting": { - "fitness": true, - "walking": true, - "running": true + "campingOrHiking": "Y", + "nascar": "Y", + "cycling": "Y", + "bigGameHunting": "Y", + "huntingOrShooting": "Y", + "sportsMerchandiseOrActivewearRecency": "7 - 12 months", + "sportsParticipation": "Y", + "walkingForHealth": "Y", + "yogaOrPilates": "Y" }, "travel": { - "general": true, - "usBusiness": true, - "casinoVacations": true, - "frequentFlyer": true - }, - "religious": true, - "electronics": { - "appleDevice": true, - "cableTv": true, - "highSpeedInternet": true, - "dvdPlayer": true, - "hdtv": true, - "homeTheater": true, - "other": true + "business": "Y", + "international": "Y", + "rvVacations": "Y", + "travelInTheUSA": "Y", + "traveler": "Y" }, "purchase": { - "homeDecorating": true, - "beautyProducts": true, - "clubStores": true, - "usesCoupons": true + "artsCraftsRecency": "0 - 6 months", + "beautyAndSpaRecency": "0 - 6 months", + "beveragesRecency": "7 - 12 months", + "booksRecency": "0 - 6 months", + "clubContinuity": "Y", + "gardenAndBackyardRecency": "13 - 18 months", + "homeDecorRecency": "7 - 12 months", + "sweepstakes": "Y", + "maleApparelRecency": "7 - 12 months", + "musicVideosRecency": "13 - 18 months", + "specialtyFoodsAndGiftsRecency": "7 - 12 months", + "sportsAndOutdoorRecency": "0 - 6 months", + "toolsAndElectronicsRecency": "7 - 12 months", + "femaleAndMaleRecency": "7 - 12 months", + "femaleBrandAndFitRecency": "0 - 6 months" + }, + "donor": { + "activeMilitary": "Y", + "animalWelfare": "Y", + "artsOrCultural": "Y", + "cancer": "Y", + "catholic": "Y", + "childrens": "Y", + "charitable": "Y", + "humanitarian": "Y", + "nativeAmerican": "Y", + "politicalConservative": "Y", + "politicalLiberal": "Y", + "veteran": "Y", + "worldRelief": "Y" + }, + "mailOrder": { + "any": "Y", + "books": "Y", + "buyer": "Y", + "food": "Y", + "healthOrBeautyProducts": "Y", + "homeFurnishing": "Y", + "jewelry": "Y", + "magazines": "Y", + "videosOrDVD": "Y", + "womensPlusApparel": "Y" + }, + "other": { + "grandchildren": "Y", + "militaryVeteran": "Y", + "swimmingPool": "Y" + }, + "social": { + "facebookUser": "Y", + "instagramUser": "Y", + "pinterestUser": "Y", + "twitterUser": "Y" } }, - "finance": { - "bankCard": "Multiple Bank Card", - "activeLineOfCredit": true, - "retailCard": "Multiple Retail Card" - }, - "census": { - "basicTractNumber": 145, - "basicBlockGroup": 2, - "year2010": { - "educationLevel": "High School Diploma", - "average": { - "numberOfCarsInHousehold": 2.3000000000000003 - }, - "percent": { - "abovePovertyLevel": 74, - "belowPovertyLevel": 28, - "black": 17, - "blueCollarEmployed": 35, - "divorcedOrSeparated": 14, - "hispanic": 43, - "homesBuiltSince2000": 52, - "homeowner": 90, - "householdsWithChildren": 38, - "married": 36, - "mobileHome": 45, - "movedToAreaSince2000": 21, - "salariedProfessional": 35, - "singleFamilyHome": 43, - "vehicleOwnership": 84, - "white": 35 - }, - "median": { - "ageOfHouseholder": 23, - "effectiveBuyingIncome": 18, - "homeValue": 35, - "householdIncome": 18, - "householdIncomeByState": 69 - }, - "populationDensity": { - "centileInState": 67, - "centileInUs": 17 - }, - "socioEconomicScore": 29 + "emails": [ + { + "label": "Work", + "md5": "e553346f9a9e8dbe56493a581706f318" } - }, - "buyer": { - "catalog": { - "payment": { - "amx": true, - "creditCard": true, - "houseCharge": true, - "masterCard": true, - "retailCard": true, - "visa": true - }, - "apparel": { - "general": true, - "children": true, - "men": true, - "mensBigTall": true, - "nonGenderSpecific": true, - "womenPetiteSize": true, - "womenPlusSize": true - }, - "beauty": true, - "books": true, - "childrenProducts": true, - "electronics": true, - "furniture": true, - "health": true, - "jewelry": true, - "music": true, - "stationery": true, - "travel": true, - "videoEntertainment": true - }, - "retail": { - "apparel": { - "general": true, - "children": true, - "women": true - }, - "beauty": true, - "books": true, - "childrenProducts": true, - "collectibles": true, - "foodBeverages": true, - "gift": true, - "health": true, - "homeFurnishings": true, - "jewelry": true, - "music": true, - "stationery": true, - "travel": true + ], + "phones": [ + { + "label": "work", + "value": "+13305336017" } - }, - "emails": [], - "phones": [], + ], "profiles": { "twitter": { "username": "marqross91", @@ -321,14 +345,372 @@ "value": "http://marquitaas8.com/" } ], - "interests": [] - }, - "extended": { - "key_1": "9", - "key_2": "H", - "key_3": "Q", - "key_4": "0", - "key_5": "11" + "interests": [], + "identifiers": { + "personIds": [ + "L0yG2Mp8Z4TVHxJK92GAxjWsTX6lrSfMBsQKvRsy5NzKnTm6" + ] + }, + "triggers": { + "type": { + "collegeGraduate": "Y", + "emptyNester": "N", + "homeMarketValue": "D", + "income": "D", + "newAdultToFile": "N", + "newFirstChild0to2YearsOld": "N", + "newPreDriver": "N", + "newYoungAdultToFile": "N", + "nicheSwitch": "Niche A", + "valueScore": "D" + }, + "date": { + "collegeGraduateChange": "200802", + "emptyNesterChange": "199804", + "firstChildChange": "200103", + "homeMarketValueChange": "200902", + "incomeChange": "200902", + "newAdultChange": "200503", + "newDriverChange": "201602", + "newYoungAdultToChange": "202008", + "nicheSwitch": "200212", + "valueScoreChange": "201308" + } + }, + "marketTrends": { + "switchers": { + "alcoholBeverage": "Likely", + "beerBrand": "Highly Likely", + "breakfastMeatBrand": "Unlikely", + "chocolateCandyBrand": "Likely", + "cocaColaBrand": "Unlikely", + "coldCerealBrand": "Likely", + "energyDrink": "Likely", + "frozenFoodBrand": "Highly Likely", + "householdCleaningProductsBrand": "Highly Likely", + "insurance": "Highly Likely", + "job": "Unlikely", + "naturalCheeseSlicesBrand": "Highly Likely", + "naturalShreddedCheeseBrand": "Unlikely", + "nutritionalHealthBarBrand": "Highly Likely", + "refrigeratedLunchMeatBrand": "Likely", + "snackBarGranolaBarBrand": "Likely", + "softDrinksBrand": "Unlikely", + "spiritsBrand": "Unlikely", + "yogurtBrand": "Highly Likely" + }, + "seekers": { + "freshFood": "Unlikely", + "homeCleaningNewProduct": "Likely", + "laundryNewProduct": "Unlikely", + "onlineDegreeEducation": "Likely", + "personalCareNewProduct": "Likely", + "premiumNaturalHomeCleaners": "Highly Likely", + "scent": "Unlikely", + "unscentedProduct": "Highly Likely" + }, + "enthusiasts": { + "artHouseMovie": "Unlikely", + "baseball": "Highly Likely", + "basketball": "Likely", + "brandLoyalists": "Highly Likely", + "carryOut": "Likely", + "casualDining": "Likely", + "christianorGospelMusic": "Likely", + "cigarPipe": "Likely", + "convenienceHomeCleaners": "Highly Likely", + "countryMusic": "Likely", + "discountMovie": "Unlikely", + "domesticBeer": "Likely", + "extremeFitness": "Likely", + "fantasySports": "Likely", + "football": "Likely", + "freeStreaming": "Highly Likely", + "frequentMovie": "Likely", + "gamingnonMobileDevices": "Highly Likely", + "hardCider": "Unlikely", + "hardSeltzer": "Highly Likely", + "hockey": "Highly Likely", + "homeShoppingNetwork": "Highly Likely", + "importBeer": "Highly Likely", + "kroger": "Unlikely", + "latinMusic": "Highly Likely", + "liquor": "Unlikely", + "mobileGaming": "Highly Likely", + "openingWeekendMovie": "Likely", + "paidStreaming": "Likely", + "petsAreFamily": "Highly Likely", + "quickServiceRestaurant": "Highly Likely", + "redWine": "Unlikely", + "soccer": "Highly Likely", + "target": "Likely", + "valueChains": "Highly Likely", + "walmart": "Highly Likely", + "whiteWine": "Highly Likely", + "yogaPilates": "Likely" + }, + "attendees": { + "amusementPark": "Highly Likely", + "culturalArtsEvents": "Unlikely", + "liveMusicConcert": "Unlikely", + "professionalSportsEvents": "Highly Likely" + }, + "buyers": { + "autoInsuranceSelfServeOnline": "Highly Likely", + "christmasOrnamentsCollectibles": "Unlikely", + "heavyFiberFocusedFood": "Likely", + "heavyGlutenFreeFood": "Unlikely", + "heavyLowFatFood": "Highly Likely", + "onlineHomeCleaningProduct": "Likely", + "onlineInsurance": "Likely", + "onlineLaundryProduct": "Highly Likely", + "onlinePersonalCareProduct": "Likely", + "onlinePetFood": "Unlikely" + }, + "chef": { + "experimental": "Likely", + "master": "Highly Likely", + "realIngredient": "Highly Likely" + }, + "customers": { + "amazonPrime": "Likely", + "annuity": "Unlikely", + "autoInsurancePremiumDiscountviaTelematicsCustomer": "Likely", + "certificatesofDeposit": "Unlikely", + "clicktoCartHomeDelivery": "Likely", + "clicktoCartPickUp": "Likely", + "communityBankCustomer": "Unlikely", + "convenience": "Highly Likely", + "deposit": "Highly Likely", + "directMediaPreference": "Highly Likely", + "financialAdvisor": "Unlikely", + "frequentATM": "Unlikely", + "groceryLoyaltyCard": "Likely", + "interestCheckingPreference": "Unlikely", + "internetResearchPreference": "Unlikely", + "lending": "Likely", + "loyalFinancialInstitution": "Unlikely", + "mensBigandTallApparel": "Unlikely", + "nationalBankCustomer": "Highly Likely", + "plantoPurchaseSmartHomeProducts": "Highly Likely", + "regionalBankCustomer": "Highly Likely", + "restaurantLoyaltyCard": "Likely", + "selfInsuredDental": "Unlikely", + "smartHome": "Unlikely", + "socialMediaPreference": "Unlikely", + "studentLoan": "Unlikely", + "subscriptionorAutoShipmentHouseholdProduct": "Likely", + "womensPlusSizeApparel": "Likely", + "qsrcash": "Likely" + }, + "consumers": { + "airlineUpgraders": "Highly Likely", + "autoInsurance": "Likely", + "autoInsuranceAgentSold": "Unlikely", + "autoInsuranceCallCenterSold": "Likely", + "cableBundlecableinternethomephone": "Likely", + "casinoGamer": "Highly Likely", + "coinsCollector": "Likely", + "conservativeInvestmentStyle": "Likely", + "contactlessPayApplication": "Highly Likely", + "cordCutters": "Highly Likely", + "creditCardAttritionHouseholds": "Likely", + "creditCardRevolvers": "Unlikely", + "creditUnionMember": "Likely", + "dietConsciousHouseholds": "Likely", + "doitYourselfer": "Highly Likely", + "employerProvidedHealthInsurancePolicyHolders": "Highly Likely", + "frequentOnlineMovieViewers": "Highly Likely", + "freshFoodDelivery": "Likely", + "futureInvestors": "Likely", + "gamers": "Unlikely", + "gigEconomyEmployees": "Likely", + "groceryStoreFrequenters": "Highly Likely", + "homeEntertainers": "Likely", + "homeRemodelers": "Unlikely", + "intheMarkettoGetaHomeLoan": "Likely", + "intheMarkettoPurchaseaHome": "Likely", + "intendtoPurchaseaSamsungmobiledevice": "Highly Likely", + "intendtopurchase5GService": "Likely", + "investmentTrustBankingPreference": "Highly Likely", + "likelyMortgageRefinancers": "Unlikely", + "likelyPlannedGivers": "Unlikely", + "likelytoUseanInvestmentBroker": "Unlikely", + "likelytohaveaMortgage": "Highly Likely", + "longRoadTripTakers": "Likely", + "longTermCare": "Unlikely", + "lowInterestCreditCard": "Likely", + "lowSodium": "Likely", + "mealKitDelivery": "Highly Likely", + "medicaidPotentialQualifiedHousehold": "Likely", + "medicareDualEligibleHousehold": "Likely", + "medicarePlanDPrescriptionDrugHealth": "Unlikely", + "mobileBrowsers": "Likely", + "movieLoyaltyProgramMembers": "Likely", + "naturalGreenProductHomeCleaners": "Unlikely", + "non401kMutualFundInvestors": "Likely", + "non401kStocksBondsInvestors": "Unlikely", + "pandemicLuxurySpenders": "Likely", + "pandemicRiskTolerant": "Likely", + "paychecktoPaycheck": "Unlikely", + "personalTraveler": "Likely", + "plantoPurchaseHomeSecuritySystems": "Highly Likely", + "plantogetFitnessMembership": "Likely", + "rentersandAutoInsuranceJointPolicyHolders": "Unlikely", + "retailTexters": "Unlikely", + "retiredbutStillWorking": "Likely", + "satelliteBundlesatelliteinethomeorwireless": "Likely", + "selfPayHealthInsurance": "Likely", + "seniorCaregivers": "Highly Likely", + "seniorLivingSearchers": "Unlikely", + "sociallyInfluenced": "Highly Likely", + "termLife": "Highly Likely", + "underbanked": "Unlikely", + "uninsuredforHealth": "Highly Likely", + "upcomingRetirees65andOlder": "Likely", + "vegetarians": "Highly Likely", + "vehicleDIYrs": "Highly Likely", + "weeklyOnlineBankers": "Highly Likely", + "wellnessHouseholdsHealth": "Unlikely", + "wholeLife": "Likely", + "wiredLineVideoConnectors": "Unlikely", + "workforSmallCompanyOfferingHealthInsurance": "Unlikely" + }, + "donor": { + "animalWelfare": "Highly Likely", + "cancer": "Highly Likely", + "childrensCauses": "Likely", + "consistentReligious": "Unlikely", + "environmental": "Unlikely", + "highDollarOtherCausesnonReligious": "Unlikely", + "highDollarReligiousCauses": "Likely", + "liberalCauses": "Likely", + "university": "Highly Likely", + "veteran": "Likely" + }, + "owners": { + "_401k": "Unlikely", + "androidSmartPhone": "Highly Likely", + "appleSmartPhone": "Unlikely", + "boat": "Likely", + "educationSavingsPlan": "Likely", + "multiPolicyInsurance": "Unlikely", + "prepaidCard": "Likely", + "secondHome": "Highly Likely", + "smartTV": "Likely", + "tablet": "Highly Likely", + "timeshare": "Likely", + "veterinarianInfluencedPet": "Unlikely" + }, + "travellers": { + "business": "Unlikely", + "rvtripTakers": "Highly Likely" + }, + "readers": { + "avidBook": "Likely", + "bibleDevotional": "Highly Likely", + "book": "Highly Likely", + "entertainment": "Highly Likely", + "label": "Likely", + "retailerCircular": "Unlikely", + "romance": "Unlikely", + "sports": "Highly Likely" + }, + "voters": { + "democratic": "Highly Likely", + "independent": "Unlikely", + "likely": "Highly Likely", + "republican": "Likely", + "swing": "Likely" + }, + "subscribers": { + "cableTVPremium": "Unlikely", + "financialHealthNewsletter": "Highly Likely", + "onlineMagazineNewspaper": "Unlikely", + "retailerEmail": "Likely", + "satelliteRadio": "Unlikely" + }, + "planners": { + "budgetMeal": "Highly Likely", + "meal": "Highly Likely", + "preShop": "Unlikely" + }, + "purchasers": { + "autoLoan": "Highly Likely", + "brandDrivenHomeCleaners": "Likely", + "frequentMobile": "Likely", + "frequentOnlineMusic": "Unlikely", + "greenProduct": "Unlikely", + "impulse": "Highly Likely", + "medicareAdvantagePlan": "Unlikely", + "midmarketTermLifeInsurance": "Unlikely", + "midmarketWholeLifeInsurance": "Unlikely", + "newLuxuryVehicle": "Unlikely", + "newnonLuxuryVehicle": "Highly Likely", + "organicFood": "Likely", + "organicProduct": "Highly Likely", + "petInsurance": "Unlikely", + "vehicle": "Likely", + "webSurferBrickMortar": "Highly Likely", + "webandBrickMortarViewerOnline": "Likely", + "rv": "Unlikely", + "acahealthInsurance": "Likely" + }, + "spenders": { + "pandemicDecreasedSpenders": "Unlikely", + "vacationSpenders": "Likely" + }, + "shoppers": { + "bargainHotel": "Likely", + "bargain": "Highly Likely", + "everydayLowPrice": "Highly Likely", + "financialInstitution": "Likely", + "multiRetailer": "Unlikely", + "oneStop": "Likely", + "priceMatchers": "Highly Likely", + "privateLabel": "Likely", + "stockUp": "Unlikely", + "whatsOnSale": "Unlikely" + }, + "stores": { + "stockUpAtWalmart": "Unlikely" + }, + "users": { + "app": "Highly Likely", + "brandMotivatedLaundry": "Unlikely", + "brandMotivatedPersonalCareProduct": "Likely", + "brandedRetailCreditCard": "Highly Likely", + "convenienceDrivenPersonalCareProduct": "Unlikely", + "creditCardBalanceTransfer": "Highly Likely", + "debitCardRewards": "Unlikely", + "debitCard": "Likely", + "groceryStoreApp": "Likely", + "heavyCoupon": "Likely", + "mobileBanking": "Likely", + "mobileShoppingList": "Likely", + "naturalProductPersonalCareProduct": "Likely", + "onlineBroker": "Unlikely", + "onlineSavings": "Highly Likely", + "paperShoppingList": "Unlikely", + "premiumNaturalPersonalCareProduct": "Unlikely", + "priceMotivatedLaundryProduct": "Unlikely", + "priceMotivatedPersonalCareProduct": "Likely", + "publicTransportation": "Unlikely", + "restaurantApp": "Unlikely", + "restaurantLoyaltyApp": "Highly Likely", + "rewardsCardCashBack": "Unlikely", + "rewardsCardOther": "Highly Likely", + "sociallyActiveonFacebook": "Unlikely", + "sociallyActiveonFacebookBrandLikers": "Unlikely", + "sociallyActiveonFacebookCategoryRecommenders": "Highly Likely", + "sociallyActiveonPinterest": "Likely", + "sociallyActiveonTwitter": "Unlikely", + "targetCartwheel": "Likely", + "uberOrLyft": "Likely", + "vehicleServiceCenter": "Highly Likely", + "walmartSavingCatcher": "Likely" + } + } }, "isSandboxProfile": true, "updated": "1970-01-01" 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