[4/4] camel git commit: CAMEL-9925: Fixed CS errors

[dhirajsb]

CAMEL-9925: Fixed CS errors


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b69ab33a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b69ab33a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b69ab33a

Branch: refs/heads/camel-2.17.x
Commit: b69ab33a7c9dded49b97a0bd0e295110a66c6697
Parents: 8dfd66b
Author: Dhiraj Bokde 
Authored: Thu Apr 28 22:49:01 2016 -0700
Committer: Dhiraj Bokde 
Committed: Thu Apr 28 22:49:29 2016 -0700

--
 .../client/DefaultAnalyticsApiClient.java   | 48 ++--
 .../internal/client/DefaultRestClient.java  |  2 +-
 .../client/SalesforceSecurityHandler.java   |  9 ++--
 .../processor/AbstractSalesforceProcessor.java  |  2 +-
 .../internal/streaming/SubscriptionHelper.java  |  5 +-
 .../apache/camel/maven/CamelSalesforceMojo.java |  8 ++--
 6 files changed, 38 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b69ab33a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
index f6e72dc..29c7c70 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
@@ -61,16 +61,16 @@ public class DefaultAnalyticsApiClient extends 
AbstractClientBase implements Ana
 @Override
 public void getRecentReports(final RecentReportsResponseCallback callback) 
{
 
-final Request Request = getRequest(HttpMethod.GET, reportsUrl());
+final Request request = getRequest(HttpMethod.GET, reportsUrl());
 
-doHttpRequest(Request, new ClientResponseCallback() {
+doHttpRequest(request, new ClientResponseCallback() {
 @Override
 @SuppressWarnings("unchecked")
 public void onResponse(InputStream response, SalesforceException 
ex) {
 List recentReports = null;
 if (response != null) {
 try {
-recentReports = unmarshalResponse(response, Request,
+recentReports = unmarshalResponse(response, request,
 new TypeReference() {
 }
 );
@@ -86,14 +86,14 @@ public class DefaultAnalyticsApiClient extends 
AbstractClientBase implements Ana
 @Override
 public void getReportDescription(String reportId, final 
ReportDescriptionResponseCallback callback) {
 
-final Request Request = getRequest(HttpMethod.GET, 
reportsDescribeUrl(reportId));
+final Request request = getRequest(HttpMethod.GET, 
reportsDescribeUrl(reportId));
 
-doHttpRequest(Request, new ClientResponseCallback() {
+doHttpRequest(request, new ClientResponseCallback() {
 @Override
 public void onResponse(InputStream response, SalesforceException 
ex) {
 ReportDescription reportDescription = null;
 try {
-reportDescription = unmarshalResponse(response, Request, 
ReportDescription.class);
+reportDescription = unmarshalResponse(response, request, 
ReportDescription.class);
 } catch (SalesforceException e) {
 ex = e;
 }
@@ -107,28 +107,28 @@ public class DefaultAnalyticsApiClient extends 
AbstractClientBase implements Ana
   final ReportResultsResponseCallback 
callback) {
 
 final boolean useGet = reportMetadata == null;
-final Request Request = getRequest(
+final Request request = getRequest(
 useGet ? HttpMethod.GET : HttpMethod.POST, reportsUrl(reportId, 
includeDetails));
 
 // set POST data
 if (!useGet) {
 try {
 // wrap reportMetadata in a map
-final HashMap request = new HashMap();
-request.put("reportMetadata", reportMetadata);
-marshalRequest(request, Request);
+final HashMap input = new HashMap();
+

camel git commit: CAMEL-9925: Fixed CS errors

[dhirajsb]

Repository: camel
Updated Branches:
  refs/heads/master ec90c0b4b -> 09ff7ed1a


CAMEL-9925: Fixed CS errors


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/09ff7ed1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/09ff7ed1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/09ff7ed1

Branch: refs/heads/master
Commit: 09ff7ed1a5203eb7bfe1d404dc7454e1cae6bbe2
Parents: ec90c0b
Author: Dhiraj Bokde 
Authored: Thu Apr 28 22:49:01 2016 -0700
Committer: Dhiraj Bokde 
Committed: Thu Apr 28 22:49:01 2016 -0700

--
 .../client/DefaultAnalyticsApiClient.java   | 48 ++--
 .../internal/client/DefaultRestClient.java  |  2 +-
 .../client/SalesforceSecurityHandler.java   |  9 ++--
 .../processor/AbstractSalesforceProcessor.java  |  2 +-
 .../internal/streaming/SubscriptionHelper.java  |  5 +-
 .../apache/camel/maven/CamelSalesforceMojo.java |  8 ++--
 6 files changed, 38 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/09ff7ed1/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
index f6e72dc..29c7c70 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
@@ -61,16 +61,16 @@ public class DefaultAnalyticsApiClient extends 
AbstractClientBase implements Ana
 @Override
 public void getRecentReports(final RecentReportsResponseCallback callback) 
{
 
-final Request Request = getRequest(HttpMethod.GET, reportsUrl());
+final Request request = getRequest(HttpMethod.GET, reportsUrl());
 
-doHttpRequest(Request, new ClientResponseCallback() {
+doHttpRequest(request, new ClientResponseCallback() {
 @Override
 @SuppressWarnings("unchecked")
 public void onResponse(InputStream response, SalesforceException 
ex) {
 List recentReports = null;
 if (response != null) {
 try {
-recentReports = unmarshalResponse(response, Request,
+recentReports = unmarshalResponse(response, request,
 new TypeReference() {
 }
 );
@@ -86,14 +86,14 @@ public class DefaultAnalyticsApiClient extends 
AbstractClientBase implements Ana
 @Override
 public void getReportDescription(String reportId, final 
ReportDescriptionResponseCallback callback) {
 
-final Request Request = getRequest(HttpMethod.GET, 
reportsDescribeUrl(reportId));
+final Request request = getRequest(HttpMethod.GET, 
reportsDescribeUrl(reportId));
 
-doHttpRequest(Request, new ClientResponseCallback() {
+doHttpRequest(request, new ClientResponseCallback() {
 @Override
 public void onResponse(InputStream response, SalesforceException 
ex) {
 ReportDescription reportDescription = null;
 try {
-reportDescription = unmarshalResponse(response, Request, 
ReportDescription.class);
+reportDescription = unmarshalResponse(response, request, 
ReportDescription.class);
 } catch (SalesforceException e) {
 ex = e;
 }
@@ -107,28 +107,28 @@ public class DefaultAnalyticsApiClient extends 
AbstractClientBase implements Ana
   final ReportResultsResponseCallback 
callback) {
 
 final boolean useGet = reportMetadata == null;
-final Request Request = getRequest(
+final Request request = getRequest(
 useGet ? HttpMethod.GET : HttpMethod.POST, reportsUrl(reportId, 
includeDetails));
 
 // set POST data
 if (!useGet) {
 try {
 // wrap reportMetadata in a map
-final HashMap request = new HashMap();
-request.put("reportMetadata", reportMetadata);
-marshalRequest(request, Request);
+final