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/12/04 20:16:54 UTC
[1/2] camel git commit: CAMEL-10086 Naming fixes + license updated in
2 java classes
Repository: camel
Updated Branches:
refs/heads/master 6ef6f81a2 -> e0ff3755e
CAMEL-10086 Naming fixes + license updated in 2 java classes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e0ff3755
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e0ff3755
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e0ff3755
Branch: refs/heads/master
Commit: e0ff3755efc141714aa48ae4c0d1024249dfd0cf
Parents: 575f169
Author: aefox <al...@gmail.com>
Authored: Sun Dec 4 21:09:32 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Dec 4 21:16:41 2016 +0100
----------------------------------------------------------------------
.../camel/component/aws/ddbstream/DdbStreamConsumerTest.java | 4 ++--
.../dropbox/validator/DropboxConfigurationValidator.java | 4 ++--
.../apache/camel/component/jasypt/JasyptPropertiesParser.java | 4 ++--
.../org/apache/camel/component/sparkrest/SparkComponent.java | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e0ff3755/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
index 36d7f3e..29340b9 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
@@ -173,7 +173,7 @@ public class DdbStreamConsumerTest {
private final Map<String, String> shardIterators;
private final Map<String, Collection<Record>> answers;
- private final Pattern SHARD_ITERATOR_PATTERN = Pattern.compile("shard_iterator_d_0*(\\d+)");
+ private final Pattern shardIteratorPattern = Pattern.compile("shard_iterator_d_0*(\\d+)");
GetRecordsAnswer(Map<String, String> shardIterators, Map<String, Collection<Record>> answers) {
this.shardIterators = shardIterators;
@@ -187,7 +187,7 @@ public class DdbStreamConsumerTest {
// A null 'nextShardIterator' indicates that the shard has finished
// and we should move onto the next shard.
String nextShardIterator = shardIterators.get(shardIterator);
- Matcher m = SHARD_ITERATOR_PATTERN.matcher(shardIterator);
+ Matcher m = shardIteratorPattern.matcher(shardIterator);
Collection<Record> ans = answers.get(shardIterator);
if (nextShardIterator == null && m.matches()) { // last shard iterates forever.
Integer num = Integer.parseInt(m.group(1));
http://git-wip-us.apache.org/repos/asf/camel/blob/e0ff3755/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
index 222635b..f45f7c1 100755
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
@@ -28,7 +28,7 @@ import static org.apache.camel.component.dropbox.util.DropboxConstants.DROPBOX_F
public final class DropboxConfigurationValidator {
- private static final Pattern pattern = Pattern.compile("/*?(\\S+)/*?", Pattern.CASE_INSENSITIVE);
+ private static final Pattern PATTERN = Pattern.compile("/*?(\\S+)/*?", Pattern.CASE_INSENSITIVE);
private DropboxConfigurationValidator() { }
@@ -117,7 +117,7 @@ public final class DropboxConfigurationValidator {
}
private static void validatePathInUnix(String path) throws DropboxException {
- Matcher matcher = pattern.matcher(path);
+ Matcher matcher = PATTERN.matcher(path);
if (!matcher.matches()) {
throw new DropboxException(path + " is not a valid path, must be in UNIX form!");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e0ff3755/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
----------------------------------------------------------------------
diff --git a/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java b/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
index 78282cb..60f2fef 100755
--- a/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
+++ b/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
@@ -39,7 +39,7 @@ public class JasyptPropertiesParser extends DefaultPropertiesParser {
public static final String JASYPT_SUFFIX_TOKEN = ")";
private static final String JASYPT_REGEX = JASYPT_PREFIX_TOKEN.replace("(", "\\(") + "(.+?)" + JASYPT_SUFFIX_TOKEN.replace(")", "\\)");
- private static final Pattern pattern = Pattern.compile(JASYPT_REGEX);
+ private static final Pattern PATTERN = Pattern.compile(JASYPT_REGEX);
private StringEncryptor encryptor;
private String password;
@@ -53,7 +53,7 @@ public class JasyptPropertiesParser extends DefaultPropertiesParser {
log.trace(format("Parsing property '%s=%s'", key, value));
if (value != null) {
initEncryptor();
- Matcher matcher = pattern.matcher(value);
+ Matcher matcher = PATTERN.matcher(value);
while (matcher.find()) {
log.trace(format("Decrypting part '%s'", matcher.group(0)));
String decrypted = encryptor.decrypt(matcher.group(1));
http://git-wip-us.apache.org/repos/asf/camel/blob/e0ff3755/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
index 6a64e87..a8d0329 100644
--- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
+++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
@@ -36,7 +36,7 @@ import org.apache.camel.util.URISupport;
public class SparkComponent extends UriEndpointComponent implements RestConsumerFactory, RestApiConsumerFactory {
- private static final Pattern pattern = Pattern.compile("\\{(.*?)\\}");
+ private static final Pattern PATTERN = Pattern.compile("\\{(.*?)\\}");
private int port = 4567;
private String ipAddress;
@@ -299,7 +299,7 @@ public class SparkComponent extends UriEndpointComponent implements RestConsumer
if (ObjectHelper.isNotEmpty(path)) {
// spark-rest uses :name syntax instead of {name} so we need to replace those
- Matcher matcher = pattern.matcher(path);
+ Matcher matcher = PATTERN.matcher(path);
path = matcher.replaceAll(":$1");
}
[2/2] camel git commit: CAMEL-10086 moved Pattern.compile usages into
static variables
Posted by da...@apache.org.
CAMEL-10086 moved Pattern.compile usages into static variables
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/575f1693
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/575f1693
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/575f1693
Branch: refs/heads/master
Commit: 575f169358db1262926e7a5388629170efa9c358
Parents: 6ef6f81
Author: aefox <al...@gmail.com>
Authored: Sun Dec 4 19:10:25 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Dec 4 21:16:41 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/converter/TimePatternConverter.java | 11 +++++------
.../atmos/validator/AtmosConfigurationValidator.java | 5 +++--
.../component/aws/ddbstream/DdbStreamConsumerTest.java | 3 ++-
.../dropbox/validator/DropboxConfigurationValidator.java | 3 ++-
.../camel/component/file/remote/OsgiParserFactory.java | 2 +-
.../camel/component/jasypt/JasyptPropertiesParser.java | 11 +++++------
.../camel/test/junit/rule/mllp/MllpServerResource.java | 6 +++---
.../java/org/apache/camel/maven/CamelSalesforceMojo.java | 9 ++++++---
.../apache/camel/component/sparkrest/SparkComponent.java | 2 +-
.../apache/camel/component/splunk/SplunkEndpoint.java | 10 +++++-----
.../apache/camel/component/twitter/TwitterHelper.java | 10 +++++-----
.../component/yammer/scribe/JsonTokenExtractor.java | 4 ++--
.../yammer/utils/YammerAccessCodeGenerator.java | 2 --
.../org/apache/camel/catalog/TimePatternConverter.java | 11 +++++------
.../camel/itest/springboot/util/ArquillianPackager.java | 5 +++--
15 files changed, 48 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java b/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java
index ffc061a..8fb97ba 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java
@@ -30,10 +30,10 @@ import org.slf4j.LoggerFactory;
@Converter
public final class TimePatternConverter {
private static final Logger LOG = LoggerFactory.getLogger(TimePatternConverter.class);
- private static final String NUMBERS_ONLY_STRING_PATTERN = "^[-]?(\\d)+$";
- private static final String HOUR_REGEX_PATTERN = "((\\d)*(\\d))h(our(s)?)?";
- private static final String MINUTES_REGEX_PATTERN = "((\\d)*(\\d))m(in(ute(s)?)?)?";
- private static final String SECONDS_REGEX_PATTERN = "((\\d)*(\\d))s(ec(ond)?(s)?)?";
+ private static final Pattern NUMBERS_ONLY_STRING_PATTERN = Pattern.compile("^[-]?(\\d)+$", Pattern.CASE_INSENSITIVE);
+ private static final Pattern HOUR_REGEX_PATTERN = Pattern.compile("((\\d)*(\\d))h(our(s)?)?", Pattern.CASE_INSENSITIVE);
+ private static final Pattern MINUTES_REGEX_PATTERN = Pattern.compile("((\\d)*(\\d))m(in(ute(s)?)?)?", Pattern.CASE_INSENSITIVE);
+ private static final Pattern SECONDS_REGEX_PATTERN = Pattern.compile("((\\d)*(\\d))s(ec(ond)?(s)?)?", Pattern.CASE_INSENSITIVE);
/**
* Utility classes should not have a public constructor.
@@ -124,8 +124,7 @@ public final class TimePatternConverter {
}
}
- private static Matcher createMatcher(String regexPattern, String source) {
- Pattern pattern = Pattern.compile(regexPattern, Pattern.CASE_INSENSITIVE);
+ private static Matcher createMatcher(Pattern pattern, String source) {
return pattern.matcher(source);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java
----------------------------------------------------------------------
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java
index ec16fad..7cbc681 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java
@@ -29,6 +29,8 @@ import static org.apache.camel.component.atmos.util.AtmosConstants.ATMOS_FILE_SE
public final class AtmosConfigurationValidator {
+ private static final Pattern UNIX_PATH_PATTERN = Pattern.compile("/*?(\\S+)/*?", Pattern.CASE_INSENSITIVE);
+
private AtmosConfigurationValidator() {
}
@@ -118,8 +120,7 @@ public final class AtmosConfigurationValidator {
}
private static void validatePathInUnix(String path) throws AtmosException {
- Pattern pattern = Pattern.compile("/*?(\\S+)/*?", Pattern.CASE_INSENSITIVE);
- Matcher matcher = pattern.matcher(path);
+ Matcher matcher = UNIX_PATH_PATTERN.matcher(path);
if (!matcher.matches()) {
throw new AtmosException(path + " is not a valid path, must be in UNIX form!");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
index c91fc86..36d7f3e 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
@@ -173,6 +173,7 @@ public class DdbStreamConsumerTest {
private final Map<String, String> shardIterators;
private final Map<String, Collection<Record>> answers;
+ private final Pattern SHARD_ITERATOR_PATTERN = Pattern.compile("shard_iterator_d_0*(\\d+)");
GetRecordsAnswer(Map<String, String> shardIterators, Map<String, Collection<Record>> answers) {
this.shardIterators = shardIterators;
@@ -186,7 +187,7 @@ public class DdbStreamConsumerTest {
// A null 'nextShardIterator' indicates that the shard has finished
// and we should move onto the next shard.
String nextShardIterator = shardIterators.get(shardIterator);
- Matcher m = Pattern.compile("shard_iterator_d_0*(\\d+)").matcher(shardIterator);
+ Matcher m = SHARD_ITERATOR_PATTERN.matcher(shardIterator);
Collection<Record> ans = answers.get(shardIterator);
if (nextShardIterator == null && m.matches()) { // last shard iterates forever.
Integer num = Integer.parseInt(m.group(1));
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
index 41b430e..222635b 100755
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/validator/DropboxConfigurationValidator.java
@@ -28,6 +28,8 @@ import static org.apache.camel.component.dropbox.util.DropboxConstants.DROPBOX_F
public final class DropboxConfigurationValidator {
+ private static final Pattern pattern = Pattern.compile("/*?(\\S+)/*?", Pattern.CASE_INSENSITIVE);
+
private DropboxConfigurationValidator() { }
/**
@@ -115,7 +117,6 @@ public final class DropboxConfigurationValidator {
}
private static void validatePathInUnix(String path) throws DropboxException {
- Pattern pattern = Pattern.compile("/*?(\\S+)/*?", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
if (!matcher.matches()) {
throw new DropboxException(path + " is not a valid path, must be in UNIX form!");
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/OsgiParserFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/OsgiParserFactory.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/OsgiParserFactory.java
index dbb0281..b810f1e 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/OsgiParserFactory.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/OsgiParserFactory.java
@@ -40,7 +40,7 @@ import org.apache.commons.net.ftp.parser.VMSVersioningFTPEntryParser;
* OsgiParserFactory
*
* commons-net DefaultFTPFileEntryParserFactory uses Class.forName, and fails
- * to load custom ParserFactories in OSGI. This class is an alternative ParserFactory
+ * to load custom ParserFactories in OSGI. This class is an alternative ParserFactory
* that can be used when Camel is used in an OSGI environment.
*/
public class OsgiParserFactory extends DefaultFTPFileEntryParserFactory {
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
----------------------------------------------------------------------
diff --git a/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java b/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
index f089533..78282cb 100755
--- a/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
+++ b/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
@@ -31,22 +31,21 @@ import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
* A {@link org.apache.camel.component.properties.PropertiesParser} which is using
* <a href="http://www.jasypt.org/">Jasypt</a> to decrypt encrypted values.
* <p/>
- * The parts of the values which should be decrpted must be enclosed in the prefix and suffix token.
+ * The parts of the values which should be decrypted must be enclosed in the prefix and suffix token.
*/
public class JasyptPropertiesParser extends DefaultPropertiesParser {
public static final String JASYPT_PREFIX_TOKEN = "ENC(";
public static final String JASYPT_SUFFIX_TOKEN = ")";
+ private static final String JASYPT_REGEX = JASYPT_PREFIX_TOKEN.replace("(", "\\(") + "(.+?)" + JASYPT_SUFFIX_TOKEN.replace(")", "\\)");
+ private static final Pattern pattern = Pattern.compile(JASYPT_REGEX);
+
private StringEncryptor encryptor;
private String password;
private String algorithm;
- private Pattern pattern;
-
public JasyptPropertiesParser() {
- String regex = JASYPT_PREFIX_TOKEN.replace("(", "\\(") + "(.+?)" + JASYPT_SUFFIX_TOKEN.replace(")", "\\)");
- pattern = Pattern.compile(regex);
}
@Override
@@ -73,7 +72,7 @@ public class JasyptPropertiesParser extends DefaultPropertiesParser {
pbeStringEncryptor.setAlgorithm(algorithm);
log.debug(format("Initialized encryptor using %s algorithm and provided password", algorithm));
} else {
- log.debug(format("Initialized encryptor using default algorithm and provided password"));
+ log.debug("Initialized encryptor using default algorithm and provided password");
}
encryptor = pbeStringEncryptor;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
----------------------------------------------------------------------
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
index fe1ad40..1ee2d6e 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
@@ -167,11 +167,11 @@ public class MllpServerResource extends ExternalResource {
}
public boolean sendApplicationRejectAcknowledgement(String hl7Message) {
- return evaluatePatten(hl7Message, this.sendApplicationErrorAcknowledgementPattern);
+ return evaluatePattern(hl7Message, this.sendApplicationErrorAcknowledgementPattern);
}
public boolean sendApplicationErrorAcknowledgement(String hl7Message) {
- return evaluatePatten(hl7Message, this.sendApplicationRejectAcknowledgementPattern);
+ return evaluatePattern(hl7Message, this.sendApplicationRejectAcknowledgementPattern);
}
public boolean sendApplicationRejectAcknowledgement(int messageCount) {
@@ -221,7 +221,7 @@ public class MllpServerResource extends ExternalResource {
}
}
- private boolean evaluatePatten(String hl7Message, Pattern pattern) {
+ private boolean evaluatePattern(String hl7Message, Pattern pattern) {
boolean retValue = false;
if (null != pattern && pattern.matcher(hl7Message).matches()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/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 5b6ce07..811f5d0 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
@@ -91,6 +91,9 @@ public class CamelSalesforceMojo extends AbstractMojo {
private static final String JAVA_EXT = ".java";
private static final String PACKAGE_NAME_PATTERN = "(\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*\\.)+\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*";
+ private static final Pattern MATCH_EVERYTHING_PATTERN = Pattern.compile(".*");
+ private static final Pattern MATCH_NOTHING_PATTERN = Pattern.compile("^$");
+
private static final String SOBJECT_POJO_VM = "/sobject-pojo.vm";
private static final String SOBJECT_POJO_OPTIONAL_VM = "/sobject-pojo-optional.vm";
private static final String SOBJECT_QUERY_RECORDS_VM = "/sobject-query-records.vm";
@@ -448,10 +451,10 @@ public class CamelSalesforceMojo extends AbstractMojo {
incPattern = Pattern.compile(includePattern.trim());
} else if (includedNames.isEmpty()) {
// include everything by default if no include names are set
- incPattern = Pattern.compile(".*");
+ incPattern = MATCH_EVERYTHING_PATTERN;
} else {
// include nothing by default if include names are set
- incPattern = Pattern.compile("^$");
+ incPattern = MATCH_NOTHING_PATTERN;
}
// check whether a pattern is in effect
@@ -460,7 +463,7 @@ public class CamelSalesforceMojo extends AbstractMojo {
excPattern = Pattern.compile(excludePattern.trim());
} else {
// exclude nothing by default
- excPattern = Pattern.compile("^$");
+ excPattern = MATCH_NOTHING_PATTERN;
}
final Set<String> acceptedNames = new HashSet<String>();
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
index 9c20221..6a64e87 100644
--- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
+++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
@@ -36,7 +36,7 @@ import org.apache.camel.util.URISupport;
public class SparkComponent extends UriEndpointComponent implements RestConsumerFactory, RestApiConsumerFactory {
- private final Pattern pattern = Pattern.compile("\\{(.*?)\\}");
+ private static final Pattern pattern = Pattern.compile("\\{(.*?)\\}");
private int port = 4567;
private String ipAddress;
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java
index 2e21432..034a26b 100644
--- a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java
+++ b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java
@@ -38,6 +38,9 @@ import org.slf4j.LoggerFactory;
public class SplunkEndpoint extends ScheduledPollEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(SplunkEndpoint.class);
+ private static final Pattern SPLUNK_SCHEMA_PATTERN = Pattern.compile("splunk:(//)*");
+ private static final Pattern SPLUNK_OPTIONS_PATTER = Pattern.compile("\\?.*");
+
private Service service;
@UriParam
private SplunkConfiguration configuration;
@@ -91,11 +94,8 @@ public class SplunkEndpoint extends ScheduledPollEndpoint {
}
private static String[] splitUri(String uri) {
- Pattern p1 = Pattern.compile("splunk:(//)*");
- Pattern p2 = Pattern.compile("\\?.*");
-
- uri = p1.matcher(uri).replaceAll("");
- uri = p2.matcher(uri).replaceAll("");
+ uri = SPLUNK_SCHEMA_PATTERN.matcher(uri).replaceAll("");
+ uri = SPLUNK_OPTIONS_PATTER.matcher(uri).replaceAll("");
return uri.split("/");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterHelper.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterHelper.java
index de503a5..9266a5a 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterHelper.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterHelper.java
@@ -40,6 +40,9 @@ import org.apache.camel.component.twitter.producer.UserProducer;
import twitter4j.User;
public final class TwitterHelper {
+ private static final Pattern TWITTER_SCHEMA_PATTERN = Pattern.compile("twitter:(//)*");
+ private static final Pattern TWITTER_OPTIONS_PATTERN = Pattern.compile("\\?.*");
+
private TwitterHelper() {
}
@@ -151,11 +154,8 @@ public final class TwitterHelper {
}
private static String[] splitUri(String uri) {
- Pattern p1 = Pattern.compile("twitter:(//)*");
- Pattern p2 = Pattern.compile("\\?.*");
-
- uri = p1.matcher(uri).replaceAll("");
- uri = p2.matcher(uri).replaceAll("");
+ uri = TWITTER_SCHEMA_PATTERN.matcher(uri).replaceAll("");
+ uri = TWITTER_OPTIONS_PATTERN.matcher(uri).replaceAll("");
return uri.split("/");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/scribe/JsonTokenExtractor.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/scribe/JsonTokenExtractor.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/scribe/JsonTokenExtractor.java
index a9aca8b..a883617 100644
--- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/scribe/JsonTokenExtractor.java
+++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/scribe/JsonTokenExtractor.java
@@ -24,12 +24,12 @@ import org.scribe.extractors.AccessTokenExtractor;
import org.scribe.model.Token;
import org.scribe.utils.Preconditions;
-
public class JsonTokenExtractor implements AccessTokenExtractor {
+ private static final Pattern DEFAULT_ACCESS_TOKEN_PATTERN = Pattern.compile("\"access_token\":\\s*\"(\\S*?)\"");
private Pattern accessTokenPattern;
public JsonTokenExtractor() {
- accessTokenPattern = Pattern.compile("\"access_token\":\\s*\"(\\S*?)\"");
+ accessTokenPattern = DEFAULT_ACCESS_TOKEN_PATTERN;
}
public JsonTokenExtractor(String tokenRegex) {
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/utils/YammerAccessCodeGenerator.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/utils/YammerAccessCodeGenerator.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/utils/YammerAccessCodeGenerator.java
index a83364fa..745d3dc 100644
--- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/utils/YammerAccessCodeGenerator.java
+++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/utils/YammerAccessCodeGenerator.java
@@ -24,11 +24,9 @@ import org.scribe.model.Token;
import org.scribe.model.Verifier;
import org.scribe.oauth.OAuthService;
-
/**
* Use this to get an access token from yammer. You will need the
* consumer key and secret key for your app registered with yammer to do this.
- *
*/
public final class YammerAccessCodeGenerator {
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/platforms/catalog/src/main/java/org/apache/camel/catalog/TimePatternConverter.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/TimePatternConverter.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/TimePatternConverter.java
index 3f08d45..4ed843a 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/TimePatternConverter.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/TimePatternConverter.java
@@ -23,10 +23,10 @@ import java.util.regex.Pattern;
* This class is a copy from camel-core so we can use it independent to validate uris with time patterns
*/
public final class TimePatternConverter {
- private static final String NUMBERS_ONLY_STRING_PATTERN = "^[-]?(\\d)+$";
- private static final String HOUR_REGEX_PATTERN = "((\\d)*(\\d))h(our(s)?)?";
- private static final String MINUTES_REGEX_PATTERN = "((\\d)*(\\d))m(in(ute(s)?)?)?";
- private static final String SECONDS_REGEX_PATTERN = "((\\d)*(\\d))s(ec(ond)?(s)?)?";
+ private static final Pattern NUMBERS_ONLY_STRING_PATTERN = Pattern.compile("^[-]?(\\d)+$", Pattern.CASE_INSENSITIVE);
+ private static final Pattern HOUR_REGEX_PATTERN = Pattern.compile("((\\d)*(\\d))h(our(s)?)?", Pattern.CASE_INSENSITIVE);
+ private static final Pattern MINUTES_REGEX_PATTERN = Pattern.compile("((\\d)*(\\d))m(in(ute(s)?)?)?", Pattern.CASE_INSENSITIVE);
+ private static final Pattern SECONDS_REGEX_PATTERN = Pattern.compile("((\\d)*(\\d))s(ec(ond)?(s)?)?", Pattern.CASE_INSENSITIVE);
/**
* Utility classes should not have a public constructor.
@@ -114,8 +114,7 @@ public final class TimePatternConverter {
}
}
- private static Matcher createMatcher(String regexPattern, String source) {
- Pattern pattern = Pattern.compile(regexPattern, Pattern.CASE_INSENSITIVE);
+ private static Matcher createMatcher(Pattern pattern, String source) {
return pattern.matcher(source);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/575f1693/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
index ef91a1a..f2c9d8f 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
@@ -91,6 +91,8 @@ public final class ArquillianPackager {
private static final String LIB_FOLDER = "/BOOT-INF/lib";
private static final String CLASSES_FOLDER = "BOOT-INF/classes";
+ private static final Pattern PROP_PATTERN = Pattern.compile("(\\$\\{[^}]*\\})");
+
private ArquillianPackager() {
}
@@ -469,8 +471,7 @@ public final class ArquillianPackager {
pom = pom.replace("<!-- DEPENDENCIES -->", dependencies.toString());
Map<String, String> resolvedProperties = new TreeMap<>();
- Pattern propPattern = Pattern.compile("(\\$\\{[^}]*\\})");
- Matcher m = propPattern.matcher(pom);
+ Matcher m = PROP_PATTERN.matcher(pom);
while (m.find()) {
String property = m.group();
String resolved = DependencyResolver.resolveModuleOrParentProperty(new File(new File(config.getModuleBasePath()), "pom.xml"), property);