You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/07/28 13:24:38 UTC
[8/9] camel git commit: Fixed style errors on multiple modules
Fixed style errors on multiple modules
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bad9fc2c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bad9fc2c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bad9fc2c
Branch: refs/heads/master
Commit: bad9fc2c7ee6fe863453afe298b18e9c6fcc8569
Parents: 3a34d25
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Thu Jul 28 13:23:07 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 15:24:18 2016 +0200
----------------------------------------------------------------------
.../influxdb/CamelInfluxDbException.java | 4 +-
.../mime/multipart/MimeMultipartDataFormat.java | 5 +-
.../rabbitmq/RabbitMQDeclareSupport.java | 8 +--
.../salesforce/SalesforceConsumer.java | 2 +-
.../client/DefaultAnalyticsApiClient.java | 54 ++++++++++----------
.../internal/client/DefaultRestClient.java | 15 +++---
.../internal/processor/XmlRestProcessor.java | 2 +-
.../apache/camel/maven/CamelSalesforceMojo.java | 2 +-
.../ZipkinConditionalAutoConfiguration.java | 16 ++++++
.../catalog/UnsafeUriCharactersEncoder.java | 2 +-
10 files changed, 63 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
----------------------------------------------------------------------
diff --git a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
index ea50714..84352de 100644
--- a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
+++ b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.influxdb;
public class CamelInfluxDbException extends RuntimeException {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public CamelInfluxDbException(String message, Throwable cause) {
+ public CamelInfluxDbException(String message, Throwable cause) {
super(message, cause);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
index 0af87fb..73beac0 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.regex.Pattern;
-
import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.mail.BodyPart;
@@ -254,7 +253,7 @@ public class MimeMultipartDataFormat implements DataFormat {
Header header = headers.nextElement();
camelAttachment.addHeader(header.getName(), header.getValue());
}
- camelMessage.addAttachmentObject(getAttachmentKey(bp), camelAttachment);
+ camelMessage.addAttachmentObject(getAttachmentKey(bp), camelAttachment);
}
}
if (content instanceof BodyPart) {
@@ -289,7 +288,7 @@ public class MimeMultipartDataFormat implements DataFormat {
String key = bp.getFileName();
// if there is no file name we use the Content-ID header
if (key == null && bp instanceof MimeBodyPart) {
- key = ((MimeBodyPart)bp).getContentID();
+ key = ((MimeBodyPart) bp).getContentID();
if (key != null && key.startsWith("<") && key.length() > 2) {
// strip <>
key = key.substring(1, key.length() - 1);
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
index f22592d..5707312 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
@@ -82,7 +82,7 @@ public class RabbitMQDeclareSupport {
private boolean shouldDeclareQueue() {
return !endpoint.isSkipQueueDeclare() && endpoint.getQueue() != null;
}
-
+
private boolean shouldDeclareExchange() {
return !endpoint.isSkipExchangeDeclare();
}
@@ -90,13 +90,13 @@ public class RabbitMQDeclareSupport {
private boolean shouldBindQueue() {
return !endpoint.isSkipQueueBind();
}
-
+
private void populateQueueArgumentsFromConfigurer(final Map<String, Object> queueArgs) {
if (endpoint.getQueueArgsConfigurer() != null) {
endpoint.getQueueArgsConfigurer().configurArgs(queueArgs);
}
}
-
+
private void declareExchange(final Channel channel, final String exchange, final String exchangeType, final Map<String, Object> exchangeArgs) throws IOException {
channel.exchangeDeclare(exchange, exchangeType, endpoint.isDurable(), endpoint.isAutoDelete(), exchangeArgs);
}
@@ -104,7 +104,7 @@ public class RabbitMQDeclareSupport {
private void declareAndBindQueue(final Channel channel, final String queue, final String exchange, final String routingKey, final Map<String, Object> arguments)
throws IOException {
channel.queueDeclare(queue, endpoint.isDurable(), false, endpoint.isAutoDelete(), arguments);
- if(shouldBindQueue()){
+ if (shouldBindQueue()) {
channel.queueBind(queue, exchange, emptyIfNull(routingKey));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index be0ed52..83772e6 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -27,8 +27,8 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.salesforce.internal.client.DefaultRestClient;
import org.apache.camel.component.salesforce.api.utils.JsonUtils;
+import org.apache.camel.component.salesforce.internal.client.DefaultRestClient;
import org.apache.camel.component.salesforce.internal.client.RestClient;
import org.apache.camel.component.salesforce.internal.streaming.PushTopicHelper;
import org.apache.camel.component.salesforce.internal.streaming.SubscriptionHelper;
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/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 5d0a860..3461c14 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
@@ -26,7 +26,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.component.salesforce.SalesforceHttpClient;
-import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.apache.camel.component.salesforce.api.SalesforceException;
import org.apache.camel.component.salesforce.api.dto.RestError;
import org.apache.camel.component.salesforce.api.dto.analytics.reports.AsyncReportResults;
@@ -35,6 +34,7 @@ import org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportDes
import org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportInstance;
import org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata;
import org.apache.camel.component.salesforce.api.dto.analytics.reports.SyncReportResults;
+import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.apache.camel.component.salesforce.internal.SalesforceSession;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.api.Response;
@@ -73,8 +73,8 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
if (response != null) {
try {
recentReports = unmarshalResponse(response, request,
- new TypeReference<List<RecentReport>>() {
- }
+ new TypeReference<List<RecentReport>>() {
+ }
);
} catch (SalesforceException e) {
ex = e;
@@ -110,7 +110,7 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
final boolean useGet = reportMetadata == null;
final Request request = getRequest(
- useGet ? HttpMethod.GET : HttpMethod.POST, reportsUrl(reportId, includeDetails));
+ useGet ? HttpMethod.GET : HttpMethod.POST, reportsUrl(reportId, includeDetails));
// set POST data
if (!useGet) {
@@ -144,7 +144,7 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
final ReportInstanceResponseCallback callback) {
final Request request = getRequest(HttpMethod.POST,
- reportInstancesUrl(reportId, includeDetails));
+ reportInstancesUrl(reportId, includeDetails));
// set POST data
if (reportMetadata != null) {
@@ -186,8 +186,8 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
if (response != null) {
try {
reportInstances = unmarshalResponse(response, request,
- new TypeReference<List<ReportInstance>>() {
- }
+ new TypeReference<List<ReportInstance>>() {
+ }
);
} catch (SalesforceException e) {
ex = e;
@@ -202,7 +202,7 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
public void getReportResults(String reportId, String instanceId, final ReportResultsResponseCallback callback) {
final Request request = getRequest(HttpMethod.GET,
- reportInstancesUrl(reportId, instanceId));
+ reportInstancesUrl(reportId, instanceId));
doHttpRequest(request, new ClientResponseCallback() {
@Override
@@ -228,7 +228,7 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
}
private String reportsUrl(String reportId) {
- return reportsUrl() + "/" + reportId;
+ return reportsUrl() + "/" + reportId;
}
private String reportsUrl(String reportId, Boolean includeDetails) {
@@ -242,7 +242,7 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
private String reportInstancesUrl(String reportId, Boolean includeDetails) {
return includeDetails == null ? reportInstancesUrl(reportId)
- : reportInstancesUrl(reportId) + INCLUDE_DETAILS_QUERY_PARAM + includeDetails;
+ : reportInstancesUrl(reportId) + INCLUDE_DETAILS_QUERY_PARAM + includeDetails;
}
private String reportInstancesUrl(String reportId, String instanceId) {
@@ -262,25 +262,25 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
if (responseContent != null) {
// unmarshal RestError
final List<RestError> errors = objectMapper.readValue(responseContent,
- new TypeReference<List<RestError>>() {
- });
+ new TypeReference<List<RestError>>() {
+ });
return new SalesforceException(errors, statusCode);
}
} catch (UnsupportedEncodingException e) {
// log and ignore
String msg = "Unexpected Error parsing JSON error response body + ["
- + responseContent + "] : " + e.getMessage();
+ + responseContent + "] : " + e.getMessage();
log.warn(msg, e);
} catch (IOException e) {
// log and ignore
String msg = "Unexpected Error parsing JSON error response body + ["
- + responseContent + "] : " + e.getMessage();
+ + responseContent + "] : " + e.getMessage();
log.warn(msg, e);
}
// just report HTTP status info
String message = String.format("Unexpected error: %s, with content: %s",
- response.getReason(), responseContent);
+ response.getReason(), responseContent);
return new SalesforceException(message, statusCode);
}
@@ -303,28 +303,28 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
request.content(new BytesContentProvider(objectMapper.writeValueAsBytes(input)));
} catch (IOException e) {
throw new SalesforceException(
- String.format("Error marshaling request for {%s:%s} : %s",
- request.getMethod(), request.getURI(), e.getMessage()),
- e);
+ String.format("Error marshaling request for {%s:%s} : %s",
+ request.getMethod(), request.getURI(), e.getMessage()),
+ e);
}
}
private <T> T unmarshalResponse(InputStream response, Request request,
- TypeReference<T> responseTypeReference)
- throws SalesforceException {
+ TypeReference<T> responseTypeReference)
+ throws SalesforceException {
try {
return objectMapper.readValue(response, responseTypeReference);
} catch (IOException e) {
throw new SalesforceException(
- String.format("Error unmarshaling response {%s:%s} : %s",
- request.getMethod(), request.getURI(), e.getMessage()),
- e);
+ String.format("Error unmarshaling response {%s:%s} : %s",
+ request.getMethod(), request.getURI(), e.getMessage()),
+ e);
}
}
private <T> T unmarshalResponse(InputStream response, Request request, Class<T> responseClass)
- throws SalesforceException {
+ throws SalesforceException {
if (response == null) {
return null;
@@ -334,9 +334,9 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
return objectMapper.readValue(response, responseClass);
} catch (IOException e) {
throw new SalesforceException(
- String.format("Error unmarshaling response {%s:%s} : %s",
- request.getMethod(), request.getURI(), e.getMessage()),
- e);
+ String.format("Error unmarshaling response {%s:%s} : %s",
+ request.getMethod(), request.getURI(), e.getMessage()),
+ e);
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
index d71bf30..f39673b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
@@ -29,10 +29,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.thoughtworks.xstream.XStream;
import org.apache.camel.component.salesforce.SalesforceHttpClient;
-import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.apache.camel.component.salesforce.api.SalesforceException;
import org.apache.camel.component.salesforce.api.SalesforceMultipleChoicesException;
import org.apache.camel.component.salesforce.api.dto.RestError;
+import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.apache.camel.component.salesforce.internal.PayloadFormat;
import org.apache.camel.component.salesforce.internal.SalesforceSession;
import org.apache.camel.component.salesforce.internal.dto.RestChoices;
@@ -59,7 +59,7 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
private XStream xStream;
public DefaultRestClient(SalesforceHttpClient httpClient, String version, PayloadFormat format, SalesforceSession session)
- throws SalesforceException {
+ throws SalesforceException {
super(version, session, httpClient);
this.format = format;
@@ -100,7 +100,8 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
// return list of choices as error message for 300
if (statusCode == HttpStatus.MULTIPLE_CHOICES_300) {
if (PayloadFormat.JSON.equals(format)) {
- choices = objectMapper.readValue(responseContent, new TypeReference<List<String>>() { });
+ choices = objectMapper.readValue(responseContent, new TypeReference<List<String>>() {
+ });
} else {
RestChoices restChoices = new RestChoices();
xStream.fromXML(responseContent, restChoices);
@@ -111,8 +112,8 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
final List<RestError> restErrors;
if (PayloadFormat.JSON.equals(format)) {
restErrors = objectMapper.readValue(
- responseContent, new TypeReference<List<RestError>>() {
- }
+ responseContent, new TypeReference<List<RestError>>() {
+ }
);
} else {
RestErrors errors = new RestErrors();
@@ -378,7 +379,7 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
if (requestDto != null) {
request.content(new InputStreamContentProvider(requestDto));
request.header(HttpHeader.CONTENT_TYPE,
- PayloadFormat.JSON.equals(format) ? APPLICATION_JSON_UTF8 : APPLICATION_XML_UTF8);
+ PayloadFormat.JSON.equals(format) ? APPLICATION_JSON_UTF8 : APPLICATION_XML_UTF8);
}
// requires authorization token
@@ -395,7 +396,7 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
}
private String apexCallUrl(String apexUrl, Map<String, Object> queryParams)
- throws UnsupportedEncodingException, URISyntaxException {
+ throws UnsupportedEncodingException, URISyntaxException {
if (queryParams != null && !queryParams.isEmpty()) {
apexUrl = URISupport.appendParametersToURI(apexUrl, queryParams);
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
index 2b4c7af..418e2fd 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
@@ -36,7 +36,6 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.salesforce.SalesforceEndpoint;
-import org.apache.camel.component.salesforce.api.utils.DateTimeConverter;
import org.apache.camel.component.salesforce.api.SalesforceException;
import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase;
import org.apache.camel.component.salesforce.api.dto.CreateSObjectResult;
@@ -46,6 +45,7 @@ import org.apache.camel.component.salesforce.api.dto.SObjectBasicInfo;
import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
import org.apache.camel.component.salesforce.api.dto.SearchResults;
import org.apache.camel.component.salesforce.api.dto.Versions;
+import org.apache.camel.component.salesforce.api.utils.DateTimeConverter;
import org.apache.camel.component.salesforce.internal.client.XStreamUtils;
import org.eclipse.jetty.util.StringUtil;
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index 4830286..88e6b92 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -49,10 +49,10 @@ import org.apache.camel.component.salesforce.api.dto.PickListValue;
import org.apache.camel.component.salesforce.api.dto.SObject;
import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
import org.apache.camel.component.salesforce.api.dto.SObjectField;
+import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.apache.camel.component.salesforce.internal.PayloadFormat;
import org.apache.camel.component.salesforce.internal.SalesforceSession;
import org.apache.camel.component.salesforce.internal.client.DefaultRestClient;
-import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.apache.camel.component.salesforce.internal.client.RestClient;
import org.apache.camel.component.salesforce.internal.client.SyncResponseCallback;
import org.apache.camel.util.IntrospectionSupport;
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java b/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java
index 28fd554..3a2f9d3 100644
--- a/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java
+++ b/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.zipkin.starter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
index 3ba0490..563bac2 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
@@ -32,7 +32,7 @@ public final class UnsafeUriCharactersEncoder {
private static BitSet unsafeCharactersHttp;
private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
'D', 'E', 'F', 'a', 'b', 'c', 'd', 'e', 'f'};
- private static Pattern RAW_PATTERN = Pattern.compile("RAW\\([^\\)]+\\)");
+ private static final Pattern RAW_PATTERN = Pattern.compile("RAW\\([^\\)]+\\)");
static {
unsafeCharactersRfc1738 = new BitSet(256);