This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 240a973 Regen
240a973 is described below
commit 240a973f184e4c423958e3543d75b3d0350b9be1
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Apr 17 08:48:07 2018 +0200
Regen
---
.../apache/camel/catalog/AbstractCamelCatalog.java | 18 ++++++-------
.../camel/catalog/EndpointValidationResult.java | 30 +++++++++++-----------
.../org/apache/camel/catalog/JSonSchemaHelper.java | 2 +-
.../camel/catalog/SimpleValidationResult.java | 1 +
.../java/org/apache/camel/catalog/URISupport.java | 10 ++++----
.../camel/catalog/UnsafeUriCharactersEncoder.java | 4 +--
6 files changed, 33 insertions(+), 32 deletions(-)
diff --git
a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java
b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java
index 78333c2..2e82e74 100644
---
a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java
+++
b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java
@@ -548,7 +548,7 @@ public abstract class AbstractCamelCatalog {
// only if we support alternative syntax, and the uri contains the
username and password in the authority
// part of the uri, then we would need some special logic to capture
that information and strip those
// details from the uri, so we can continue parsing the uri using the
normal syntax
- Map<String, String> userInfoOptions = new LinkedHashMap<String,
String>();
+ Map<String, String> userInfoOptions = new LinkedHashMap<>();
if (alternativeSyntax != null && alternativeSyntax.contains("@")) {
// clip the scheme from the syntax
alternativeSyntax = after(alternativeSyntax, ":");
@@ -606,7 +606,7 @@ public abstract class AbstractCamelCatalog {
// parse the syntax and find the names of each option
Matcher matcher = SYNTAX_PATTERN.matcher(syntax);
- List<String> word = new ArrayList<String>();
+ List<String> word = new ArrayList<>();
while (matcher.find()) {
String s = matcher.group(1);
if (!scheme.equals(s)) {
@@ -617,7 +617,7 @@ public abstract class AbstractCamelCatalog {
String[] tokens = SYNTAX_PATTERN.split(syntax);
// find the position where each option start/end
- List<String> word2 = new ArrayList<String>();
+ List<String> word2 = new ArrayList<>();
int prev = 0;
int prevPath = 0;
@@ -664,7 +664,7 @@ public abstract class AbstractCamelCatalog {
boolean defaultValueAdded = false;
// now parse the uri to know which part isw what
- Map<String, String> options = new LinkedHashMap<String, String>();
+ Map<String, String> options = new LinkedHashMap<>();
// include the username and password from the userinfo section
if (!userInfoOptions.isEmpty()) {
@@ -712,7 +712,7 @@ public abstract class AbstractCamelCatalog {
}
}
- Map<String, String> answer = new LinkedHashMap<String, String>();
+ Map<String, String> answer = new LinkedHashMap<>();
// remove all options which are using default values and are not
required
for (Map.Entry<String, String> entry : options.entrySet()) {
@@ -832,7 +832,7 @@ public abstract class AbstractCamelCatalog {
private String doAsEndpointUri(String scheme, String json, String
ampersand, boolean encode) throws URISyntaxException {
List<Map<String, String>> rows =
JSonSchemaHelper.parseJsonSchema("properties", json, true);
- Map<String, String> copy = new HashMap<String, String>();
+ Map<String, String> copy = new HashMap<>();
for (Map<String, String> row : rows) {
String name = row.get("name");
String required = row.get("required");
@@ -942,7 +942,7 @@ public abstract class AbstractCamelCatalog {
// parse the syntax into each options
Matcher matcher = SYNTAX_PATTERN.matcher(originalSyntax);
- List<String> options = new ArrayList<String>();
+ List<String> options = new ArrayList<>();
while (matcher.find()) {
String s = matcher.group(1);
options.add(s);
@@ -955,7 +955,7 @@ public abstract class AbstractCamelCatalog {
// parse the syntax into each options
Matcher matcher2 = SYNTAX_PATTERN.matcher(syntax);
- List<String> options2 = new ArrayList<String>();
+ List<String> options2 = new ArrayList<>();
while (matcher2.find()) {
String s = matcher2.group(1);
s = s.replaceAll("BEGINCAMELPLACEHOLDER", "\\{\\{");
@@ -1267,7 +1267,7 @@ public abstract class AbstractCamelCatalog {
if ("log".equals(scheme)) {
String showAll = options.get("showAll");
if ("true".equals(showAll)) {
- Map<String, String> filtered = new LinkedHashMap<String,
String>();
+ Map<String, String> filtered = new LinkedHashMap<>();
// remove all the other showXXX options when showAll=true
for (Map.Entry<String, String> entry : options.entrySet()) {
String key = entry.getKey();
diff --git
a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
index 9bb98f0..63c201c 100644
---
a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
+++
b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
@@ -106,7 +106,7 @@ public class EndpointValidationResult implements
Serializable {
public void addUnknown(String name) {
if (unknown == null) {
- unknown = new LinkedHashSet<String>();
+ unknown = new LinkedHashSet<>();
}
if (!unknown.contains(name)) {
unknown.add(name);
@@ -116,14 +116,14 @@ public class EndpointValidationResult implements
Serializable {
public void addUnknownSuggestions(String name, String[] suggestions) {
if (unknownSuggestions == null) {
- unknownSuggestions = new LinkedHashMap<String, String[]>();
+ unknownSuggestions = new LinkedHashMap<>();
}
unknownSuggestions.put(name, suggestions);
}
public void addLenient(String name) {
if (lenient == null) {
- lenient = new LinkedHashSet<String>();
+ lenient = new LinkedHashSet<>();
}
if (!lenient.contains(name)) {
lenient.add(name);
@@ -132,7 +132,7 @@ public class EndpointValidationResult implements
Serializable {
public void addRequired(String name) {
if (required == null) {
- required = new LinkedHashSet<String>();
+ required = new LinkedHashSet<>();
}
if (!required.contains(name)) {
required.add(name);
@@ -142,7 +142,7 @@ public class EndpointValidationResult implements
Serializable {
public void addInvalidEnum(String name, String value) {
if (invalidEnum == null) {
- invalidEnum = new LinkedHashMap<String, String>();
+ invalidEnum = new LinkedHashMap<>();
}
if (!invalidEnum.containsKey(name)) {
invalidEnum.put(name, value);
@@ -152,21 +152,21 @@ public class EndpointValidationResult implements
Serializable {
public void addInvalidEnumChoices(String name, String[] choices) {
if (invalidEnumChoices == null) {
- invalidEnumChoices = new LinkedHashMap<String, String[]>();
+ invalidEnumChoices = new LinkedHashMap<>();
}
invalidEnumChoices.put(name, choices);
}
public void addInvalidEnumSuggestions(String name, String[] suggestions) {
if (invalidEnumSuggestions == null) {
- invalidEnumSuggestions = new LinkedHashMap<String, String[]>();
+ invalidEnumSuggestions = new LinkedHashMap<>();
}
invalidEnumSuggestions.put(name, suggestions);
}
public void addInvalidReference(String name, String value) {
if (invalidReference == null) {
- invalidReference = new LinkedHashMap<String, String>();
+ invalidReference = new LinkedHashMap<>();
}
if (!invalidReference.containsKey(name)) {
invalidReference.put(name, value);
@@ -176,7 +176,7 @@ public class EndpointValidationResult implements
Serializable {
public void addInvalidBoolean(String name, String value) {
if (invalidBoolean == null) {
- invalidBoolean = new LinkedHashMap<String, String>();
+ invalidBoolean = new LinkedHashMap<>();
}
if (!invalidBoolean.containsKey(name)) {
invalidBoolean.put(name, value);
@@ -186,7 +186,7 @@ public class EndpointValidationResult implements
Serializable {
public void addInvalidInteger(String name, String value) {
if (invalidInteger == null) {
- invalidInteger = new LinkedHashMap<String, String>();
+ invalidInteger = new LinkedHashMap<>();
}
if (!invalidInteger.containsKey(name)) {
invalidInteger.put(name, value);
@@ -196,7 +196,7 @@ public class EndpointValidationResult implements
Serializable {
public void addInvalidNumber(String name, String value) {
if (invalidNumber == null) {
- invalidNumber = new LinkedHashMap<String, String>();
+ invalidNumber = new LinkedHashMap<>();
}
if (!invalidNumber.containsKey(name)) {
invalidNumber.put(name, value);
@@ -206,14 +206,14 @@ public class EndpointValidationResult implements
Serializable {
public void addDefaultValue(String name, String value) {
if (defaultValues == null) {
- defaultValues = new LinkedHashMap<String, String>();
+ defaultValues = new LinkedHashMap<>();
}
defaultValues.put(name, value);
}
public void addNotConsumerOnly(String name) {
if (notConsumerOnly == null) {
- notConsumerOnly = new LinkedHashSet<String>();
+ notConsumerOnly = new LinkedHashSet<>();
}
if (!notConsumerOnly.contains(name)) {
notConsumerOnly.add(name);
@@ -223,7 +223,7 @@ public class EndpointValidationResult implements
Serializable {
public void addNotProducerOnly(String name) {
if (notProducerOnly == null) {
- notProducerOnly = new LinkedHashSet<String>();
+ notProducerOnly = new LinkedHashSet<>();
}
if (!notProducerOnly.contains(name)) {
notProducerOnly.add(name);
@@ -326,7 +326,7 @@ public class EndpointValidationResult implements
Serializable {
}
// for each invalid option build a reason message
- Map<String, String> options = new LinkedHashMap<String, String>();
+ Map<String, String> options = new LinkedHashMap<>();
if (unknown != null) {
for (String name : unknown) {
if (unknownSuggestions != null &&
unknownSuggestions.containsKey(name)) {
diff --git
a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/JSonSchemaHelper.java
b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/JSonSchemaHelper.java
index 965cbb0..c17b03e 100644
---
a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/JSonSchemaHelper.java
+++
b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/JSonSchemaHelper.java
@@ -399,7 +399,7 @@ public final class JSonSchemaHelper {
}
public static Set<String> getNames(List<Map<String, String>> rows) {
- Set<String> answer = new LinkedHashSet<String>();
+ Set<String> answer = new LinkedHashSet<>();
for (Map<String, String> row : rows) {
if (row.containsKey("name")) {
answer.add(row.get("name"));
diff --git
a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java
b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java
index b7fc2ad..d88b6d3 100644
---
a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java
+++
b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/SimpleValidationResult.java
@@ -20,6 +20,7 @@ package org.apache.camel.catalog;
* Kept to be backwards compatible,
* @deprecated Please use {@link LanguageValidationResult} instead.
*/
+@Deprecated
public class SimpleValidationResult extends LanguageValidationResult {
public SimpleValidationResult(String text) {
diff --git
a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/URISupport.java
b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/URISupport.java
index ea1ecd5..f2079c1 100644
---
a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/URISupport.java
+++
b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/URISupport.java
@@ -53,7 +53,7 @@ public final class URISupport {
}
public static Map<String, Object> extractProperties(Map<String, Object>
properties, String optionPrefix) {
- Map<String, Object> rc = new LinkedHashMap<String,
Object>(properties.size());
+ Map<String, Object> rc = new LinkedHashMap<>(properties.size());
for (Iterator<Map.Entry<String, Object>> it =
properties.entrySet().iterator(); it.hasNext();) {
Map.Entry<String, Object> entry = it.next();
@@ -97,7 +97,7 @@ public final class URISupport {
int idx = schemeSpecificPart.indexOf('?');
if (idx < 0) {
// return an empty map
- return new LinkedHashMap<String, Object>(0);
+ return new LinkedHashMap<>(0);
} else {
query = schemeSpecificPart.substring(idx + 1);
}
@@ -163,7 +163,7 @@ public final class URISupport {
if (isEmpty(uri)) {
// return an empty map
- return new LinkedHashMap<String, Object>(0);
+ return new LinkedHashMap<>(0);
}
// need to parse the uri query parameters manually as we cannot rely
on splitting by &,
@@ -171,7 +171,7 @@ public final class URISupport {
try {
// use a linked map so the parameters is in the same order
- Map<String, Object> rc = new LinkedHashMap<String, Object>();
+ Map<String, Object> rc = new LinkedHashMap<>();
boolean isKey = true;
boolean isValue = false;
@@ -289,7 +289,7 @@ public final class URISupport {
list = (List<String>) existing;
} else {
// create a new list to hold the multiple values
- list = new ArrayList<String>();
+ list = new ArrayList<>();
String s = existing != null ? existing.toString() : null;
if (s != null) {
list.add(s);
diff --git
a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
index 563bac2..04d7753 100644
---
a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
+++
b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
@@ -96,7 +96,7 @@ public final class UnsafeUriCharactersEncoder {
private static List<Pair> checkRAW(String s) {
Matcher matcher = RAW_PATTERN.matcher(s);
- List<Pair> answer = new ArrayList<Pair>();
+ List<Pair> answer = new ArrayList<>();
// Check all occurrences
while (matcher.find()) {
answer.add(new Pair(matcher.start(), matcher.end()));
@@ -137,7 +137,7 @@ public final class UnsafeUriCharactersEncoder {
if (checkRaw) {
rawPairs = checkRAW(s);
} else {
- rawPairs = new ArrayList<Pair>();
+ rawPairs = new ArrayList<>();
}
int n = s == null ? 0 : s.length();
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
