rename internal company object

Author: dehora

intercom-java/src/main/java/io/intercom/api/Company.java

@@ -34,7 +34,7 @@ public static Company create(Company company) throws InvalidException, Authoriza
 
     public static Company update(Company company) throws InvalidException, AuthorizationException {
         // because the data is asymmetric on the plan field
-        final CompanyStringPlan entity = new CompanyStringPlan();
+        final CompanyWithStringPlan entity = new CompanyWithStringPlan();
         entity.setCompanyID(company.getCompanyID());
         entity.setName(company.getName());
         entity.setSessionCount(company.getSessionCount());

…a/io/intercom/api/CompanyStringPlan.java …/intercom/api/CompanyWithStringPlan.javaintercom-java/src/main/java/io/intercom/api/CompanyStringPlan.java renamed to intercom-java/src/main/java/io/intercom/api/CompanyWithStringPlan.java intercom-java/src/main/java/io/intercom/api/CompanyStringPlan.java renamed to intercom-java/src/main/java/io/intercom/api/CompanyWithStringPlan.java

@@ -10,7 +10,7 @@
 @SuppressWarnings("UnusedDeclaration")
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
 @JsonIgnoreProperties(ignoreUnknown = true)
-class CompanyStringPlan extends TypedData {
+class CompanyWithStringPlan extends TypedData {
 
     @JsonProperty("id")
     private String id;
@@ -37,7 +37,7 @@ class CompanyStringPlan extends TypedData {
     @JsonProperty("custom_attributes")
     private Map<String, CustomAttribute> customAttributes = Maps.newHashMap();
 
-    public CompanyStringPlan() {
+    public CompanyWithStringPlan() {
     }
 
     public String getType() {

intercom-java/src/main/java/io/intercom/api/User.java

@@ -20,13 +20,13 @@ public class User extends TypedData implements Replier {
 
     private static final Map<String, String> SENTINEL = Maps.newHashMap();
 
-    private static List<CompanyStringPlan> buildUserUpdateCompanies(User user) {
+    private static List<CompanyWithStringPlan> buildUserUpdateCompanies(User user) {
         // restrictions on the company data that can be sent via a user update
-        final ArrayList<CompanyStringPlan> updatableCompanies = Lists.newArrayList();
+        final ArrayList<CompanyWithStringPlan> updatableCompanies = Lists.newArrayList();
         if (user.getCompanyCollection() != null) {
             final List<Company> companies = user.getCompanyCollection().getPageItems();
             for (Company company : companies) {
-                final CompanyStringPlan updatableCompany = new CompanyStringPlan();
+                final CompanyWithStringPlan updatableCompany = new CompanyWithStringPlan();
                 updatableCompany.setCompanyID(company.getCompanyID());
                 updatableCompany.setName(company.getName());
                 updatableCompany.setSessionCount(company.getSessionCount());
@@ -131,7 +131,7 @@ static UserUpdate buildFrom(User user) {
         private String lastSeenUserAgent;
 
         @JsonProperty("companies")
-        private List<CompanyStringPlan> companyCollection;
+        private List<CompanyWithStringPlan> companyCollection;
 
         @JsonProperty("last_request_at")
         private long lastRequestAt;
@@ -195,7 +195,7 @@ public String getLastSeenUserAgent() {
             return lastSeenUserAgent;
         }
 
-        public List<CompanyStringPlan> getCompanyCollection() {
+        public List<CompanyWithStringPlan> getCompanyCollection() {
             return companyCollection;
         }