This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e51944c Change pattern to prefix to make the intent clearer
new 039545d Merge branch 'master' of github.com:apache/camel
e51944c is described below
commit e51944cc597f93994d2780dce37c4264c8a742d0
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Fri Jul 17 14:41:41 2020 +0100
Change pattern to prefix to make the intent clearer
---
.../src/main/java/org/apache/camel/component/mail/MailBinding.java | 4 ++--
.../src/main/java/org/apache/camel/component/mail/MailConverters.java | 4 ++--
.../org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java | 4 ++--
.../org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java | 4 ++--
.../apache/camel/component/spring/ws/type/EndpointMappingType.java | 4 ++--
.../src/main/java/org/apache/camel/component/stomp/StompEndpoint.java | 4 ++--
core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
index 23337c5..cf901dd 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
@@ -642,8 +642,8 @@ public class MailBinding {
content = part.getContent();
}
// Perform a case insensitive "startsWith" check that
works for different locales
- String pattern = "text";
- if (part.getContentType().regionMatches(true, 0, pattern,
0, pattern.length())) {
+ String prefix = "text";
+ if (part.getContentType().regionMatches(true, 0, prefix,
0, prefix.length())) {
answer.put(Exchange.CONTENT_TYPE,
part.getContentType());
break;
}
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
index f88ce61..45f28e0 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
@@ -94,8 +94,8 @@ public final class MailConverters {
content = part.getContent();
}
// Perform a case insensitive "startsWith" check that works for
different locales
- String pattern = "text";
- if (part.getContentType().regionMatches(true, 0, pattern, 0,
pattern.length())) {
+ String prefix = "text";
+ if (part.getContentType().regionMatches(true, 0, prefix, 0,
prefix.length())) {
return part.getContent().toString();
}
}
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
index e112647..5e84664 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
@@ -551,8 +551,8 @@ public final class RestOpenApiEndpoint extends
DefaultEndpoint {
final String specificationScheme = specificationUri.getScheme();
// Perform a case insensitive "startsWith" check that works for
different locales
- String pattern = "http";
- if (specificationUri.isAbsolute() &&
specificationScheme.regionMatches(true, 0, pattern, 0, pattern.length())) {
+ String prefix = "http";
+ if (specificationUri.isAbsolute() &&
specificationScheme.regionMatches(true, 0, prefix, 0, prefix.length())) {
try {
return new URI(specificationUri.getScheme(),
specificationUri.getUserInfo(), specificationUri.getHost(),
specificationUri.getPort(), null, null, null).toString();
diff --git
a/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java
b/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java
index 2d03329..7e7398a 100644
---
a/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java
+++
b/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java
@@ -432,8 +432,8 @@ public final class RestSwaggerEndpoint extends
DefaultEndpoint {
final String specificationScheme = specificationUri.getScheme();
// Perform a case insensitive "startsWith" check that works for
different locales
- String pattern = Scheme.HTTP.toValue();
- if (specificationUri.isAbsolute() &&
specificationScheme.regionMatches(true, 0, pattern, 0, pattern.length())) {
+ String prefix = Scheme.HTTP.toValue();
+ if (specificationUri.isAbsolute() &&
specificationScheme.regionMatches(true, 0, prefix, 0, prefix.length())) {
try {
return new URI(specificationUri.getScheme(),
specificationUri.getUserInfo(), specificationUri.getHost(),
specificationUri.getPort(), null, null, null).toString();
diff --git
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/type/EndpointMappingType.java
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/type/EndpointMappingType.java
index f498c99..8e3eb92 100644
---
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/type/EndpointMappingType.java
+++
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/type/EndpointMappingType.java
@@ -50,8 +50,8 @@ public enum EndpointMappingType {
if (uri != null) {
for (EndpointMappingType type : EndpointMappingType.values()) {
// Perform a case insensitive "startsWith" check that works
for different locales
- String pattern = type.getPrefix();
- if (uri.regionMatches(true, 0, pattern, 0, pattern.length())) {
+ String prefix = type.getPrefix();
+ if (uri.regionMatches(true, 0, prefix, 0, prefix.length())) {
return type;
}
}
diff --git
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompEndpoint.java
b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompEndpoint.java
index 9f0a8d1..944c873 100644
---
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompEndpoint.java
+++
b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompEndpoint.java
@@ -189,8 +189,8 @@ public class StompEndpoint extends DefaultEndpoint
implements AsyncEndpoint, Hea
String headerName = entry.getKey();
Object headerValue = entry.getValue();
// Perform a case insensitive "startsWith" check that works for
different locales
- String pattern = "camel";
- if (!headerName.regionMatches(true, 0, pattern, 0,
pattern.length())
+ String prefix = "camel";
+ if (!headerName.regionMatches(true, 0, prefix, 0, prefix.length())
&& !headerFilterStrategy.applyFilterToCamelHeaders(headerName,
headerValue, exchange)) {
if (headerValue != null) {
frame.addHeader(new AsciiBuffer(headerName),
StompFrame.encodeHeader(headerValue.toString()));
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
index 656cd7b..e96c5aa 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
@@ -477,8 +477,8 @@ public final class IOHelper {
for (String value : values) {
value = value.trim();
// Perform a case insensitive "startsWith" check that works for
different locales
- String pattern = "charset=";
- if (value.regionMatches(true, 0, pattern, 0, pattern.length())) {
+ String prefix = "charset=";
+ if (value.regionMatches(true, 0, prefix, 0, prefix.length())) {
// Take the charset name
charset = value.substring(8);
}
