diff --git a/pom.xml b/pom.xml index 55ef8a8..881bf58 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,12 @@ 2.11.0 3.1 0.12 + 3.7.0 + 3.0.1 + 3.0.0-M1 + 3.0.2 + 3.0.2 + 2.20.1 @@ -127,31 +133,21 @@ - - - - - org.apache.maven.plugins - maven-site-plugin - 3.0 - - - - org.apache.maven.plugins maven-compiler-plugin - 3.0 + ${maven-compiler-plugin.version} - ${project.build.sourceEncoding} - ${jdk.version} - ${jdk.version} - + ${jdk.version} + ${jdk.version} + ${project.build.sourceEncoding} + org.apache.maven.plugins maven-source-plugin + ${maven-source-plugin.version} attach-sources @@ -161,10 +157,23 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + attach-javadocs + + jar + + + + org.apache.maven.plugins maven-resources-plugin - 2.4.3 + ${maven-resources-plugin.version} ${project.build.sourceEncoding} @@ -172,7 +181,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.2 + ${maven-jar-plugin.version} @@ -184,111 +193,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.12 - - - org.apache.maven.surefire - surefire-junit47 - 2.12 - - - - -XX:-UseSplitVerifier - - **/*.class - - - - - org.apache.maven.plugins - maven-site-plugin - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.4 - - index - project-team - license - mailing-list - dependencies - dependency-convergence - plugin-management - cim - issue-tracking - scm - summary - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.12 - - - org.codehaus.mojo - cobertura-maven-plugin - 2.5.1 - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - - - TODO - - - @*[Tt][oO][dD][oO]:* - regEx - - - FIXME - exact - - - - - Deprecated - - - @deprecated - ignoreCase - - - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - 2.7.1 - - true - 100 - 3 - - ${jdk.version} - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - - + ${maven-surefire-plugin.version} org.apache.rat @@ -316,41 +221,6 @@ - - - org.springframework.maven.release - Spring Maven Release Repository - http://maven.springframework.org/release - - true - - - false - - - - - org.springframework.maven.snapshot - Spring Maven Snapshot Repository - http://maven.springframework.org/snapshot - - false - - - true - - - - - org.springframework.maven.milestone - Spring Maven Milestone Repository - http://maven.springframework.org/milestone - - false - - - - The Apache Software License, Version 2.0 @@ -359,4 +229,16 @@ + + https://github.com/jottley/spring-social-salesforce + scm:git:git@github.com:jottley/spring-social-salesforce.git + scm:git:git@github.com:jottley/spring-social-salesforce.git + + + GitHub + https://github.com/jottley/spring-social-salesforce/issues + + + https://travis-ci.org/jottley/spring-social-salesforce + diff --git a/src/main/java/org/springframework/social/salesforce/api/ChatterOperations.java b/src/main/java/org/springframework/social/salesforce/api/ChatterOperations.java index 582dcf4..272fdaa 100644 --- a/src/main/java/org/springframework/social/salesforce/api/ChatterOperations.java +++ b/src/main/java/org/springframework/social/salesforce/api/ChatterOperations.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce + * Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ public interface ChatterOperations { /** * Retrieves the given user's profile * - * @param userId + * @param userId The salesforce Id of the user * @return user profile */ public SalesforceProfile getUserProfile(String userId); @@ -47,7 +47,7 @@ public interface ChatterOperations { /** * Retrieves the given user's status * - * @param userId + * @param userId The salesforce Id of the user * @return status */ public Status getStatus(String userId); @@ -55,7 +55,7 @@ public interface ChatterOperations { /** * Updates current user's status with the given message * - * @param message + * @param message The message to be posted as the current user's status * @return status */ public Status updateStatus(String message); @@ -63,8 +63,8 @@ public interface ChatterOperations { /** * Updates the given user's status with the given message * - * @param userId - * @param message + * @param userId The salesforce Id of the user + * @param message The message to be posted as the current user's status * @return status */ public Status updateStatus(String userId, String message); diff --git a/src/main/java/org/springframework/social/salesforce/api/QueryOperations.java b/src/main/java/org/springframework/social/salesforce/api/QueryOperations.java index e8074c8..4b3c0ac 100644 --- a/src/main/java/org/springframework/social/salesforce/api/QueryOperations.java +++ b/src/main/java/org/springframework/social/salesforce/api/QueryOperations.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce + * Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,9 @@ public interface QueryOperations { /** * Execute SOQL query and return the first page of results + * + * @param query The SOQL query to execute + * @return QueryResult */ QueryResult query(String query); @@ -34,6 +37,9 @@ public interface QueryOperations { /** * Execute SOQL query and return all results. + * + * @param query The SOQL query to execute + * @return QueryResult */ QueryResult queryAll(String query); diff --git a/src/main/java/org/springframework/social/salesforce/api/SalesforceRequestException.java b/src/main/java/org/springframework/social/salesforce/api/SalesforceRequestException.java index c21f07f..d4f6051 100644 --- a/src/main/java/org/springframework/social/salesforce/api/SalesforceRequestException.java +++ b/src/main/java/org/springframework/social/salesforce/api/SalesforceRequestException.java @@ -23,8 +23,8 @@ import org.springframework.social.salesforce.connect.SalesforceServiceProvider; /** - * Encapsulates the error response sent by salesforce. - *

+ * Encapsulates the error response sent by Salesforce. + *
* * @see diff --git a/src/main/java/org/springframework/social/salesforce/api/SearchOperations.java b/src/main/java/org/springframework/social/salesforce/api/SearchOperations.java index 1d73935..99194c3 100644 --- a/src/main/java/org/springframework/social/salesforce/api/SearchOperations.java +++ b/src/main/java/org/springframework/social/salesforce/api/SearchOperations.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce + * Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,9 @@ public interface SearchOperations { /** * Execute SOSL Query and retrieve results + * + * @param soslQuery The SOSL Query to execute + * @return List of ResultItem */ List search(String soslQuery); diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/QueryTemplate.java b/src/main/java/org/springframework/social/salesforce/api/impl/QueryTemplate.java index ced46a5..f9fb659 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/QueryTemplate.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/QueryTemplate.java @@ -57,7 +57,7 @@ public QueryResult nextPage(String pathOrToken) { } /** - * Pages through the result set and aggregates all sObjects into the single result set.

+ * Pages through the result set and aggregates all sObjects into the single result set.
* USUAL WARNINGS ABOUT RESULT SET SIZE APPLY * @see org.springframework.social.salesforce.api.QueryOperations#queryAll(java.lang.String) */ diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/ApiVersionMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/ApiVersionMixin.java index e4ed5c9..c5c4c38 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/ApiVersionMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/ApiVersionMixin.java @@ -15,12 +15,14 @@ */ package org.springframework.social.salesforce.api.impl.json; +import org.springframework.social.salesforce.api.ApiVersion; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** - * {@see org.springframework.social.salesforce.api.ApiVersion} Mixin for api v23.0. + * {@link ApiVersion} * * @author Umut Utkan * @author Jared Ottley diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/FieldMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/FieldMixin.java index 3669cdd..3d77dcf 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/FieldMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/FieldMixin.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce + * Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,12 +18,14 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; + +import org.springframework.social.salesforce.api.Field; import org.springframework.social.salesforce.api.PickListEntry; import java.util.List; /** - * {@see org.springframework.social.salesforce.api.Field} Mixin for api v23.0. + * {@link Field} * * @author Umut Utkan */ diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/PhotoMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/PhotoMixin.java index f3c6f6c..d6d93c0 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/PhotoMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/PhotoMixin.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce + * Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,15 @@ package org.springframework.social.salesforce.api.impl.json; +import org.springframework.social.salesforce.api.Photo; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** - * {@see org.springframework.social.salesforce.api.Photo} Mixin for api v23.0. + * {@link Photo} * * @author Umut Utkan */ diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/PickListEntryMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/PickListEntryMixin.java index 48ef4aa..09e4e3b 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/PickListEntryMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/PickListEntryMixin.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce + * Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,15 @@ package org.springframework.social.salesforce.api.impl.json; +import org.springframework.social.salesforce.api.PickListEntry; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** - * {@see org.springframework.social.salesforce.api.PickListEntry} Mixin for api v23.0. + * {@link PickListEntry} * * @author Umut Utkan */ diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/QueryResultMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/QueryResultMixin.java index 14efaba..e303b7f 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/QueryResultMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/QueryResultMixin.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce + * Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,12 +18,14 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; + +import org.springframework.social.salesforce.api.QueryResult; import org.springframework.social.salesforce.api.ResultItem; import java.util.List; /** - * {@see org.springframework.social.salesforce.api.QueryResult} Mixin for api v23.0. + * {@link QueryResult} * * @author Umut Utkan */ diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/RecordTypeInfoMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/RecordTypeInfoMixin.java index 7252927..a9dda13 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/RecordTypeInfoMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/RecordTypeInfoMixin.java @@ -16,13 +16,15 @@ package org.springframework.social.salesforce.api.impl.json; +import org.springframework.social.salesforce.api.RecordTypeInfo; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** - * {@see org.springframework.social.salesforce.api.RecordTypeInfo} Mixin for api v23.0. + * {@link RecordTypeInfo} * * @author Umut Utkan */ diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/RelationshipMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/RelationshipMixin.java index beec5fd..615e57a 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/RelationshipMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/RelationshipMixin.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce + * Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,15 @@ package org.springframework.social.salesforce.api.impl.json; +import org.springframework.social.salesforce.api.Relationship; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** - * {@see org.springframework.social.salesforce.api.Relationship} Mixin for api v23.0. + * {@link Relationship} * * @author Umut Utkan */ diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/ResultItemDeserializer.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/ResultItemDeserializer.java index a7a8102..1b272fd 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/ResultItemDeserializer.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/ResultItemDeserializer.java @@ -29,14 +29,14 @@ import java.util.Map; /** - * Deserializer for {@see org.springframework.social.salesforce.api.ResultItem} + * Deserializer for {@link ResultItem} * * @author Umut Utkan */ public class ResultItemDeserializer extends JsonDeserializer { - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public ResultItem deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/ResultItemMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/ResultItemMixin.java index 2e1b9f9..951e5a2 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/ResultItemMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/ResultItemMixin.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce + * Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,13 @@ package org.springframework.social.salesforce.api.impl.json; +import org.springframework.social.salesforce.api.ResultItem; + import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** - * {@see org.springframework.social.salesforce.api.ResultItem} Mixin for api v23.0. + * {@link ResultItem} * * @author Umut Utkan */ diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/SObjectDetailMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/SObjectDetailMixin.java index 5578b40..fb11d82 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/SObjectDetailMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/SObjectDetailMixin.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce + * Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,11 +20,12 @@ import org.springframework.social.salesforce.api.Field; import org.springframework.social.salesforce.api.RecordTypeInfo; import org.springframework.social.salesforce.api.Relationship; +import org.springframework.social.salesforce.api.SObjectDetail; import java.util.List; /** - * {@see org.springframework.social.salesforce.api.SObjectDetail} Mixin for api v23.0. + * {@link SObjectDetail} * * @author Umut Utkan */ diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/SObjectSummaryMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/SObjectSummaryMixin.java index ef36929..f1dd75d 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/SObjectSummaryMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/SObjectSummaryMixin.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce + * Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,10 @@ import java.util.Map; +import org.springframework.social.salesforce.api.SObjectSummary; + /** - * {@see org.springframework.social.salesforce.api.SObjectSummary} Mixin for api v23.0. + * {@link SObjectSummary} * * @author Umut Utkan */ diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/SalesforceProfileMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/SalesforceProfileMixin.java index 5abfeb8..90baf6c 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/SalesforceProfileMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/SalesforceProfileMixin.java @@ -19,10 +19,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import org.springframework.social.salesforce.api.Photo; +import org.springframework.social.salesforce.api.SalesforceProfile; /** - * {@see org.springframework.social.salesforce.api.SalesforceProfile} Mixin for api v23.0. - * + * {@link SalesforceProfile} + * * @author Umut Utkan * @author Alexandra Leahu */ diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/SalesforceUserDetailsMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/SalesforceUserDetailsMixin.java index adeedfe..71c2d7e 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/SalesforceUserDetailsMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/SalesforceUserDetailsMixin.java @@ -15,12 +15,15 @@ */ package org.springframework.social.salesforce.api.impl.json; + +import org.springframework.social.salesforce.api.SalesforceUserDetails; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** - * {@see org.springframework.social.salesforce.api.UserDetails} Mixin for api v23.0. + * {@link SalesforceUserDetails} * @author Alexandra Leahu */ @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/org/springframework/social/salesforce/api/impl/json/StatusMixin.java b/src/main/java/org/springframework/social/salesforce/api/impl/json/StatusMixin.java index 4582992..fe2cf8c 100644 --- a/src/main/java/org/springframework/social/salesforce/api/impl/json/StatusMixin.java +++ b/src/main/java/org/springframework/social/salesforce/api/impl/json/StatusMixin.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016 https://github.com/jottley/spring-social-salesforce + * Copyright (C) 2017 https://github.com/jottley/spring-social-salesforce * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,10 @@ import java.util.List; import java.util.Map; +import org.springframework.social.salesforce.api.Status; + /** - * {@see org.springframework.social.salesforce.api.Status} Mixin for api v23.0. + * {@link Status} * * @author Umut Utkan */ diff --git a/src/main/java/org/springframework/social/salesforce/connect/SalesforceOAuth2Template.java b/src/main/java/org/springframework/social/salesforce/connect/SalesforceOAuth2Template.java index 52857e1..fd26b48 100644 --- a/src/main/java/org/springframework/social/salesforce/connect/SalesforceOAuth2Template.java +++ b/src/main/java/org/springframework/social/salesforce/connect/SalesforceOAuth2Template.java @@ -26,7 +26,7 @@ /** * Salesforce OAuth2Template implementation. - *

+ * * The reason to extend is to extract non-standard instance_url from Salesforce's oauth token response. * * @author Umut Utkan