You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2018/04/17 12:41:42 UTC
[camel] 04/04: polish
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0cc235105f2b48c4551a83bc6028564fcbf279d7
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Tue Apr 17 14:40:35 2018 +0200
polish
---
.../maven/connector/model/EndpointOptionModel.java | 1 -
.../maven/connector/util/JSonSchemaHelper.java | 2 -
.../component/connector/ConnectorComponent.java | 1 +
.../camel/component/connector/ConnectorModel.java | 3 --
.../camel/catalog/karaf/KarafRuntimeProvider.java | 8 ++--
.../springboot/SpringBootRuntimeProvider.java | 8 ++--
.../apache/camel/catalog/DefaultCamelCatalog.java | 34 +++++++--------
.../camel/catalog/DefaultRuntimeProvider.java | 8 ++--
.../org/apache/camel/catalog/CamelCatalogTest.java | 24 +++++------
.../camel/commands/AbstractCamelController.java | 2 +-
.../commands/AbstractLocalCamelController.java | 38 ++++++++--------
.../camel/commands/ComponentListCommand.java | 2 +-
.../camel/commands/ContextInflightCommand.java | 2 +-
.../apache/camel/commands/ContextListCommand.java | 2 +-
.../camel/commands/EndpointStatisticCommand.java | 2 +-
.../camel/commands/RestRegistryListCommand.java | 2 +-
.../apache/camel/commands/RouteListCommand.java | 2 +-
.../camel/commands/DummyCamelController.java | 6 +--
.../jolokia/DefaultJolokiaCamelController.java | 50 +++++++++++-----------
.../cxf/jaxrs/testbean/CustomerService.java | 6 +--
.../camel/component/cxf/jaxrs/testbean/Order.java | 2 +-
.../test/cxf/blueprint/CxfEndpointBeansTest.java | 2 +-
.../builder/AddComponentInConfigureBuilder.java | 6 +--
.../tools/apt/CoreEipAnnotationProcessor.java | 40 ++++++++---------
.../tools/apt/EndpointAnnotationProcessor.java | 20 ++++-----
.../camel/tools/apt/SpringAnnotationProcessor.java | 12 +++---
.../camel/tools/apt/model/ComponentOption.java | 2 -
.../camel/tools/apt/model/EndpointOption.java | 2 -
.../apache/camel/tools/apt/model/EndpointPath.java | 2 -
.../tools/apt/EndpointOptionComparatorTest.java | 2 +-
.../maven/AbstractApiMethodGeneratorMojo.java | 4 +-
.../apache/camel/maven/DocumentGeneratorMojo.java | 34 +++++++--------
.../camel/maven/FileApiMethodGeneratorMojo.java | 2 +-
.../camel/maven/JavadocApiMethodGeneratorMojo.java | 6 +--
.../java/org/apache/camel/maven/JavadocParser.java | 4 +-
.../org/apache/camel/component/test/TestProxy.java | 2 +-
.../camel/maven/ApiComponentGeneratorMojoTest.java | 2 +-
37 files changed, 166 insertions(+), 181 deletions(-)
diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/EndpointOptionModel.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/EndpointOptionModel.java
index 07d536a..5c97a2b 100644
--- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/EndpointOptionModel.java
+++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/EndpointOptionModel.java
@@ -66,7 +66,6 @@ public class EndpointOptionModel extends OptionModel {
}
public String getShortJavaType(int watermark) {
- String group = getGroup();
String type = getType();
String javaType = getJavaType();
diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java
index f507e4b..bc9d606 100644
--- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java
+++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java
@@ -22,8 +22,6 @@ import java.net.URL;
import java.util.Date;
import java.util.Set;
-import org.apache.camel.json.simple.Jsoner;
-
/**
* A helper class for <a href="http://json-schema.org/">JSON schema</a>.
*/
diff --git a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java
index 42b81f8..1fc0ab2 100644
--- a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java
+++ b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java
@@ -97,6 +97,7 @@ public interface ConnectorComponent extends Component {
*
* @deprecated use {@link #setOptions(Map)} instead
*/
+ @Deprecated
default void setComponentOptions(Map<String, Object> options) {
setOptions(options);
}
diff --git a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
index ac01f55..bb20b15 100644
--- a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
+++ b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
@@ -24,9 +24,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Map;
-import org.apache.camel.json.simple.DeserializationException;
-import org.apache.camel.json.simple.JsonObject;
-import org.apache.camel.json.simple.Jsoner;
import org.apache.camel.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/platforms/camel-catalog-provider-karaf/src/main/java/org/apache/camel/catalog/karaf/KarafRuntimeProvider.java b/platforms/camel-catalog-provider-karaf/src/main/java/org/apache/camel/catalog/karaf/KarafRuntimeProvider.java
index f02c1e8..977a94f 100644
--- a/platforms/camel-catalog-provider-karaf/src/main/java/org/apache/camel/catalog/karaf/KarafRuntimeProvider.java
+++ b/platforms/camel-catalog-provider-karaf/src/main/java/org/apache/camel/catalog/karaf/KarafRuntimeProvider.java
@@ -89,7 +89,7 @@ public class KarafRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findComponentNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(COMPONENTS_CATALOG);
if (is != null) {
try {
@@ -103,7 +103,7 @@ public class KarafRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findDataFormatNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(DATA_FORMATS_CATALOG);
if (is != null) {
try {
@@ -117,7 +117,7 @@ public class KarafRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findLanguageNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(LANGUAGE_CATALOG);
if (is != null) {
try {
@@ -131,7 +131,7 @@ public class KarafRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findOtherNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(OTHER_CATALOG);
if (is != null) {
try {
diff --git a/platforms/camel-catalog-provider-springboot/src/main/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProvider.java b/platforms/camel-catalog-provider-springboot/src/main/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProvider.java
index 989f557..4288285 100644
--- a/platforms/camel-catalog-provider-springboot/src/main/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProvider.java
+++ b/platforms/camel-catalog-provider-springboot/src/main/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProvider.java
@@ -89,7 +89,7 @@ public class SpringBootRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findComponentNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(COMPONENTS_CATALOG);
if (is != null) {
try {
@@ -103,7 +103,7 @@ public class SpringBootRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findDataFormatNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(DATA_FORMATS_CATALOG);
if (is != null) {
try {
@@ -117,7 +117,7 @@ public class SpringBootRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findLanguageNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(LANGUAGE_CATALOG);
if (is != null) {
try {
@@ -131,7 +131,7 @@ public class SpringBootRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findOtherNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(OTHER_CATALOG);
if (is != null) {
try {
diff --git a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index e4b3f9e..4fde346 100644
--- a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -49,13 +49,13 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
private final VersionHelper version = new VersionHelper();
// 3rd party components/data-formats
- private final Map<String, String> extraComponents = new HashMap<String, String>();
- private final Map<String, String> extraComponentsJSonSchema = new HashMap<String, String>();
- private final Map<String, String> extraDataFormats = new HashMap<String, String>();
- private final Map<String, String> extraDataFormatsJSonSchema = new HashMap<String, String>();
+ private final Map<String, String> extraComponents = new HashMap<>();
+ private final Map<String, String> extraComponentsJSonSchema = new HashMap<>();
+ private final Map<String, String> extraDataFormats = new HashMap<>();
+ private final Map<String, String> extraDataFormatsJSonSchema = new HashMap<>();
// cache of operation -> result
- private final Map<String, Object> cache = new HashMap<String, Object>();
+ private final Map<String, Object> cache = new HashMap<>();
private boolean caching;
private VersionManager versionManager = new DefaultVersionManager(this);
@@ -260,7 +260,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
if (names == null) {
- names = new ArrayList<String>();
+ names = new ArrayList<>();
InputStream is = versionManager.getResourceAsStream(MODELS_CATALOG);
if (is != null) {
try {
@@ -297,7 +297,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findModelNames(String filter) {
// should not cache when filter parameter can by any kind of value
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
List<String> names = findModelNames();
for (String name : names) {
@@ -328,7 +328,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findComponentNames(String filter) {
// should not cache when filter parameter can by any kind of value
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
List<String> names = findComponentNames();
for (String name : names) {
@@ -359,7 +359,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findDataFormatNames(String filter) {
// should not cache when filter parameter can by any kind of value
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
List<String> names = findDataFormatNames();
for (String name : names) {
@@ -390,7 +390,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findLanguageNames(String filter) {
// should not cache when filter parameter can by any kind of value
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
List<String> names = findLanguageNames();
for (String name : names) {
@@ -421,7 +421,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findOtherNames(String filter) {
// should not cache when filter parameter can by any kind of value
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
List<String> names = findOtherNames();
for (String name : names) {
@@ -925,7 +925,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
if (answer == null) {
- answer = new TreeSet<String>();
+ answer = new TreeSet<>();
List<String> names = findModelNames();
for (String name : names) {
String json = modelJSonSchema(name);
@@ -959,7 +959,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
if (answer == null) {
- answer = new TreeSet<String>();
+ answer = new TreeSet<>();
List<String> names = findComponentNames();
for (String name : names) {
String json = componentJSonSchema(name);
@@ -993,7 +993,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
if (answer == null) {
- answer = new TreeSet<String>();
+ answer = new TreeSet<>();
List<String> names = findDataFormatNames();
for (String name : names) {
String json = dataFormatJSonSchema(name);
@@ -1027,7 +1027,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
if (answer == null) {
- answer = new TreeSet<String>();
+ answer = new TreeSet<>();
List<String> names = findLanguageNames();
for (String name : names) {
String json = languageJSonSchema(name);
@@ -1061,7 +1061,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
if (answer == null) {
- answer = new TreeSet<String>();
+ answer = new TreeSet<>();
List<String> names = findOtherNames();
for (String name : names) {
String json = otherJSonSchema(name);
@@ -1171,7 +1171,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
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/DefaultRuntimeProvider.java b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
index 5e3ec9b..2c7a8b8 100644
--- a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
+++ b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
@@ -104,7 +104,7 @@ public class DefaultRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findComponentNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getComponentsCatalog());
if (is != null) {
try {
@@ -118,7 +118,7 @@ public class DefaultRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findDataFormatNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getDataFormatsCatalog());
if (is != null) {
try {
@@ -132,7 +132,7 @@ public class DefaultRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findLanguageNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getLanguageCatalog());
if (is != null) {
try {
@@ -146,7 +146,7 @@ public class DefaultRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findOtherNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getOtherCatalog());
if (is != null) {
try {
diff --git a/platforms/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index bb9173d..bd77675 100644
--- a/platforms/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -171,7 +171,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriMapFile() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("directoryName", "src/data/inbox");
map.put("noop", "true");
map.put("delay", "5000");
@@ -185,7 +185,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriMapFtp() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("host", "someserver");
map.put("port", "21");
map.put("directoryName", "foo");
@@ -200,7 +200,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriMapJms() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("destinationType", "queue");
map.put("destinationName", "foo");
@@ -210,7 +210,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriNetty4http() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
// use http protocol
map.put("protocol", "http");
map.put("host", "localhost");
@@ -237,7 +237,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriTimer() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("timerName", "foo");
map.put("period", "5000");
@@ -247,7 +247,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointDefaultValue() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("destinationName", "cheese");
map.put("maxMessagesPerTask", "-1");
@@ -257,7 +257,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriPropertiesPlaceholders() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("timerName", "foo");
map.put("period", "{{howoften}}");
map.put("repeatCount", "5");
@@ -271,7 +271,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriBeanLookup() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("resourceUri", "foo.xslt");
map.put("converter", "#myConverter");
@@ -284,7 +284,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriMapJmsRequiredOnly() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("destinationName", "foo");
String uri = catalog.asEndpointUri("jms", map, true);
assertEquals("jms:foo", uri);
@@ -429,7 +429,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriLog() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("loggerName", "foo");
map.put("loggerLevel", "WARN");
map.put("multiline", "true");
@@ -444,7 +444,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriLogShort() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("loggerName", "foo");
map.put("loggerLevel", "DEBUG");
@@ -453,7 +453,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriWithplaceholder() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("query", "{{insert}}");
assertEquals("sql:{{insert}}", catalog.asEndpointUri("sql", map, false));
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
index 2937d10..2249d13 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
@@ -34,7 +34,7 @@ public abstract class AbstractCamelController implements CamelController {
@Override
public List<Map<String, String>> getCamelContexts(String filter) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
List<Map<String, String>> context = getCamelContexts();
if (filter != null) {
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
index 4d0a004..f72ce91 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
@@ -67,7 +67,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
@Override
public Map<String, Object> getCamelContextInformation(String name) throws Exception {
- Map<String, Object> answer = new LinkedHashMap<String, Object>();
+ Map<String, Object> answer = new LinkedHashMap<>();
CamelContext context = getLocalCamelContext(name);
if (context != null) {
answer.put("name", context.getName());
@@ -184,7 +184,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
return null;
}
- List<Map<String, Object>> answer = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> answer = new ArrayList<>();
ManagementAgent agent = context.getManagementStrategy().getManagementAgent();
if (agent != null) {
@@ -194,7 +194,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
TabularData list = (TabularData) mBeanServer.invoke(on, "browse", new Object[]{route, limit, sortByLongestDuration}, new String[]{"java.lang.String", "int", "boolean"});
Collection<CompositeData> values = (Collection<CompositeData>) list.values();
for (CompositeData data : values) {
- Map<String, Object> row = new LinkedHashMap<String, Object>();
+ Map<String, Object> row = new LinkedHashMap<>();
Object exchangeId = data.get("exchangeId");
if (exchangeId != null) {
row.put("exchangeId", exchangeId);
@@ -260,14 +260,14 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
public List<Map<String, String>> getRoutes(String camelContextName, String filter) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (camelContextName != null) {
CamelContext context = this.getLocalCamelContext(camelContextName);
if (context != null) {
for (Route route : context.getRoutes()) {
if (filter == null || route.getId().matches(filter)) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", context.getName());
row.put("routeId", route.getId());
row.put("state", getRouteState(route));
@@ -428,12 +428,12 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
public List<Map<String, String>> getEndpoints(String camelContextName) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (camelContextName != null) {
CamelContext context = this.getLocalCamelContext(camelContextName);
if (context != null) {
- List<Endpoint> endpoints = new ArrayList<Endpoint>(context.getEndpoints());
+ List<Endpoint> endpoints = new ArrayList<>(context.getEndpoints());
// sort routes
Collections.sort(endpoints, new Comparator<Endpoint>() {
@Override
@@ -442,7 +442,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
});
for (Endpoint endpoint : endpoints) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", context.getName());
row.put("uri", endpoint.getEndpointUri());
row.put("state", getEndpointState(endpoint));
@@ -454,7 +454,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
public List<Map<String, String>> getEndpointRuntimeStatistics(String camelContextName) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (camelContextName != null) {
CamelContext context = this.getLocalCamelContext(camelContextName);
@@ -469,7 +469,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
Boolean isDynamic = staticRegistry.isDynamic(url);
long hits = stat.getHits();
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", context.getName());
row.put("uri", url);
row.put("routeId", routeId);
@@ -504,12 +504,12 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
public List<Map<String, String>> getRestServices(String camelContextName) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (camelContextName != null) {
CamelContext context = this.getLocalCamelContext(camelContextName);
if (context != null) {
- List<RestRegistry.RestService> services = new ArrayList<RestRegistry.RestService>(context.getRestRegistry().listAllRestServices());
+ List<RestRegistry.RestService> services = new ArrayList<>(context.getRestRegistry().listAllRestServices());
Collections.sort(services, new Comparator<RestRegistry.RestService>() {
@Override
public int compare(RestRegistry.RestService o1, RestRegistry.RestService o2) {
@@ -517,7 +517,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
});
for (RestRegistry.RestService service : services) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("basePath", service.getBasePath());
row.put("baseUrl", service.getBaseUrl());
row.put("consumes", service.getConsumes());
@@ -559,7 +559,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
return null;
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
// find all components
Map<String, Properties> components = context.findComponents();
@@ -598,7 +598,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
}
- Map<String, String> row = new HashMap<String, String>();
+ Map<String, String> row = new HashMap<>();
row.put("name", name);
row.put("status", status);
if (description != null) {
@@ -628,14 +628,14 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
@Override
public List<Map<String, String>> getTransformers(String camelContextName) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (camelContextName != null) {
CamelContext context = this.getLocalCamelContext(camelContextName);
if (context != null) {
List<Transformer> transformers = new ArrayList<Transformer>(context.getTransformerRegistry().values());
for (Transformer transformer : transformers) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", context.getName());
row.put("scheme", transformer.getModel());
row.put("from", transformer.getFrom().toString());
@@ -651,14 +651,14 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
@Override
public List<Map<String, String>> getValidators(String camelContextName) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (camelContextName != null) {
CamelContext context = this.getLocalCamelContext(camelContextName);
if (context != null) {
List<Validator> validators = new ArrayList<Validator>(context.getValidatorRegistry().values());
for (Validator validator : validators) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", context.getName());
row.put("type", validator.getType().toString());
row.put("state", validator.getStatus().toString());
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ComponentListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ComponentListCommand.java
index bd02d2c..c59fbe7 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ComponentListCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ComponentListCommand.java
@@ -118,7 +118,7 @@ public class ComponentListCommand extends AbstractContextCommand {
}
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>(4);
+ final Map<String, Integer> retval = new Hashtable<>(4);
retval.put(NAME_COLUMN_LABEL, maxNameLen);
retval.put(STATUS_COLUMN_LABEL, maxStatusLen);
retval.put(MAVEN_COLUMN_LABEL, maxMavenLen);
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInflightCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInflightCommand.java
index 8c78aac..b61a24a 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInflightCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInflightCommand.java
@@ -109,7 +109,7 @@ public class ContextInflightCommand extends AbstractContextCommand {
maxDurationLen = java.lang.Math.max(maxDurationLen, duration == null ? 0 : duration.length());
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>(5);
+ final Map<String, Integer> retval = new Hashtable<>(5);
retval.put(EXCHANGE_COLUMN_LABEL, maxExchangeLen);
retval.put(FROM_ROUTE_COLUMN_LABEL, maxFromRouteLen);
retval.put(ROUTE_COLUMN_LABEL, maxRouteLen);
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java
index 41a4ec1..2c91804 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java
@@ -92,7 +92,7 @@ public class ContextListCommand extends AbstractCamelCommand {
maxUptimeLen = java.lang.Math.max(maxUptimeLen, uptime == null ? 0 : uptime.length());
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>();
+ final Map<String, Integer> retval = new Hashtable<>();
retval.put(CONTEXT_COLUMN_LABEL, maxNameLen);
retval.put(STATUS_COLUMN_LABEL, maxStatusLen);
retval.put(TOTAL_COLUMN_LABEL, maxTotalLen);
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
index 48d1b21..ce87293 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
@@ -180,7 +180,7 @@ public class EndpointStatisticCommand extends AbstractCamelCommand {
}
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>();
+ final Map<String, Integer> retval = new Hashtable<>();
retval.put(CONTEXT_COLUMN_LABEL, maxContextLen);
retval.put(URI_COLUMN_LABEL, maxUriLen);
retval.put(ROUTE_COLUMN_LABEL, maxRouteIdLen);
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestRegistryListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestRegistryListCommand.java
index f1d4b9f..d66e06b 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestRegistryListCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestRegistryListCommand.java
@@ -136,7 +136,7 @@ public class RestRegistryListCommand extends AbstractContextCommand {
maxRouteLen = Math.max(maxRouteLen, routeId == null ? 0 : routeId.length());
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>();
+ final Map<String, Integer> retval = new Hashtable<>();
retval.put(URL_COLUMN_NAME, maxUriLen);
retval.put(BASE_PATH_LABEL, maxBasePathLen);
retval.put(URI_TEMPLATE_LABEL, maxUriTemplateLen);
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java
index 95bdd3e..60839da 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java
@@ -111,7 +111,7 @@ public class RouteListCommand extends AbstractCamelCommand {
maxUptimeLen = java.lang.Math.max(maxUptimeLen, uptime == null ? 0 : uptime.length());
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>(3);
+ final Map<String, Integer> retval = new Hashtable<>(3);
retval.put(CONTEXT_COLUMN_LABEL, maxContextLen);
retval.put(ROUTE_COLUMN_LABEL, maxRouteLen);
retval.put(STATUS_COLUMN_LABEL, maxStatusLen);
diff --git a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/DummyCamelController.java b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/DummyCamelController.java
index 9d27d0f..edc16eb 100644
--- a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/DummyCamelController.java
+++ b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/DummyCamelController.java
@@ -33,15 +33,15 @@ public class DummyCamelController extends AbstractLocalCamelController {
@Override
public List<CamelContext> getLocalCamelContexts() {
- List<CamelContext> answer = new ArrayList<CamelContext>(1);
+ List<CamelContext> answer = new ArrayList<>(1);
answer.add(camelContext);
return answer;
}
@Override
public List<Map<String, String>> getCamelContexts() throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>(1);
- Map<String, String> row = new LinkedHashMap<String, String>();
+ List<Map<String, String>> answer = new ArrayList<>(1);
+ Map<String, String> row = new LinkedHashMap<>();
row.put("name", camelContext.getName());
row.put("state", camelContext.getStatus().name());
row.put("uptime", camelContext.getUptime());
diff --git a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
index 867a052..397ec20 100644
--- a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
+++ b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
@@ -48,7 +48,7 @@ import org.json.simple.JSONObject;
*/
public class DefaultJolokiaCamelController extends AbstractCamelController implements JolokiaCamelController {
- private Map<String, ObjectName> cache = new HashMap<String, ObjectName>(100);
+ private Map<String, ObjectName> cache = new HashMap<>(100);
private J4pClient jolokia;
private String url;
@@ -109,7 +109,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- Map<String, Object> answer = new LinkedHashMap<String, Object>();
+ Map<String, Object> answer = new LinkedHashMap<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -120,7 +120,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
String pattern2 = String.format("%s:context=%s,type=services,name=DefaultAsyncProcessorAwaitManager", found.getDomain(), found.getKeyProperty("context"));
ObjectName am = ObjectName.getInstance(pattern2);
- List<J4pReadRequest> list = new ArrayList<J4pReadRequest>();
+ List<J4pReadRequest> list = new ArrayList<>();
list.add(new J4pReadRequest(found));
list.add(new J4pReadRequest(tc));
list.add(new J4pReadRequest(am));
@@ -193,18 +193,18 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
J4pSearchResponse sr = jolokia.execute(new J4pSearchRequest("*:type=context,*"));
- List<J4pReadRequest> list = new ArrayList<J4pReadRequest>();
+ List<J4pReadRequest> list = new ArrayList<>();
for (ObjectName on : sr.getObjectNames()) {
list.add(new J4pReadRequest(on, "CamelId", "State", "Uptime", "ExchangesTotal", "ExchangesInflight", "ExchangesFailed"));
}
List<J4pReadResponse> lrr = jolokia.execute(list);
for (J4pReadResponse rr : lrr) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("name", rr.getValue("CamelId").toString());
row.put("state", rr.getValue("State").toString());
row.put("uptime", rr.getValue("Uptime").toString());
@@ -241,7 +241,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, Object>> answer = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -254,7 +254,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
for (Object obj : data.values()) {
JSONObject inflight = (JSONObject) obj;
- Map<String, Object> row = new LinkedHashMap<String, Object>();
+ Map<String, Object> row = new LinkedHashMap<>();
row.put("exchangeId", asString(inflight.get("exchangeId")));
row.put("fromRouteId", asString(inflight.get("fromRouteId")));
row.put("routeId", asString(inflight.get("routeId")));
@@ -329,7 +329,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = camelContextName != null ? lookupCamelContext(camelContextName) : null;
if (found != null) {
@@ -337,7 +337,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
String pattern = String.format("%s:context=%s,type=routes,*", found.getDomain(), found.getKeyProperty("context"));
J4pSearchResponse sr = jolokia.execute(new J4pSearchRequest(pattern));
- List<J4pReadRequest> list = new ArrayList<J4pReadRequest>();
+ List<J4pReadRequest> list = new ArrayList<>();
for (ObjectName on : sr.getObjectNames()) {
list.add(new J4pReadRequest(on, "CamelId", "RouteId", "State", "Uptime", "ExchangesTotal", "ExchangesInflight", "ExchangesFailed"));
}
@@ -346,7 +346,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
for (J4pReadResponse rr : lrr) {
String routeId = rr.getValue("RouteId").toString();
if (filter == null || routeId.matches(filter)) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", rr.getValue("CamelId").toString());
row.put("routeId", routeId);
row.put("state", rr.getValue("State").toString());
@@ -397,7 +397,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
String pattern = String.format("%s:context=%s,type=routes,name=*", found.getDomain(), found.getKeyProperty("context"));
J4pSearchResponse sr = jolokia.execute(new J4pSearchRequest(pattern));
- List<J4pExecRequest> list = new ArrayList<J4pExecRequest>();
+ List<J4pExecRequest> list = new ArrayList<>();
for (ObjectName on : sr.getObjectNames()) {
list.add(new J4pExecRequest(on, "reset(boolean)", true));
}
@@ -547,21 +547,21 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
String pattern = String.format("%s:context=%s,type=endpoints,*", found.getDomain(), found.getKeyProperty("context"));
J4pSearchResponse sr = jolokia.execute(new J4pSearchRequest(pattern));
- List<J4pReadRequest> list = new ArrayList<J4pReadRequest>();
+ List<J4pReadRequest> list = new ArrayList<>();
for (ObjectName on : sr.getObjectNames()) {
list.add(new J4pReadRequest(on, "CamelId", "EndpointUri", "State"));
}
List<J4pReadResponse> lrr = jolokia.execute(list);
for (J4pReadResponse rr : lrr) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", rr.getValue("CamelId").toString());
row.put("uri", rr.getValue("EndpointUri").toString());
row.put("state", rr.getValue("State").toString());
@@ -578,7 +578,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -592,7 +592,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
JSONObject data2 = (JSONObject) obj;
JSONObject service = (JSONObject) data2.values().iterator().next();
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("index", asString(service.get("index")));
row.put("url", asString(service.get("url")));
row.put("routeId", asString(service.get("routeId")));
@@ -633,7 +633,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -648,7 +648,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
JSONObject data2 = (JSONObject) obj;
JSONObject service = (JSONObject) data2.values().iterator().next();
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("basePath", asString(service.get("basePath")));
row.put("baseUrl", asString(service.get("baseUrl")));
row.put("consumes", asString(service.get("consumes")));
@@ -722,7 +722,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -732,7 +732,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
for (Object obj : data.values()) {
JSONObject component = (JSONObject) obj;
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("artifactId", asString(component.get("artifactId")));
row.put("title", asString(component.get("title")));
row.put("description", asString(component.get("description")));
@@ -766,7 +766,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -781,7 +781,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
JSONObject data2 = (JSONObject) obj;
JSONObject service = (JSONObject) data2.values().iterator().next();
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("scheme", asString(service.get("scheme")));
row.put("from", asString(service.get("from")));
row.put("to", asString(service.get("to")));
@@ -827,7 +827,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -842,7 +842,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
JSONObject data2 = (JSONObject) obj;
JSONObject service = (JSONObject) data2.values().iterator().next();
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("type", asString(service.get("type")));
row.put("static", asString(service.get("static")));
row.put("dynamic", asString(service.get("dynamic")));
diff --git a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
index 39ec9df..8f971a0 100644
--- a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
+++ b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
@@ -41,8 +41,8 @@ import javax.ws.rs.core.Response;
@Path("/customerservice/")
public class CustomerService {
private final AtomicLong currentId = new AtomicLong(123L);
- private final Map<Long, Customer> customers = new ConcurrentHashMap<Long, Customer>();
- private final Map<Long, Order> orders = new ConcurrentHashMap<Long, Order>();
+ private final Map<Long, Customer> customers = new ConcurrentHashMap<>();
+ private final Map<Long, Order> orders = new ConcurrentHashMap<>();
public CustomerService() {
init();
@@ -68,7 +68,7 @@ public class CustomerService {
@Path("/customers/")
@Produces("application/xml")
public List<Customer> getCustomers() {
- List<Customer> list = new ArrayList<Customer>(customers.values());
+ List<Customer> list = new ArrayList<>(customers.values());
return list;
}
diff --git a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
index 2e2728c..d10046a 100644
--- a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
+++ b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlRootElement;
public class Order {
private long id;
private String description;
- private Map<Long, Product> products = new HashMap<Long, Product>();
+ private Map<Long, Product> products = new HashMap<>();
public Order() {
init();
diff --git a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java
index 6e00810..6821175 100644
--- a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java
+++ b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java
@@ -101,7 +101,7 @@ public class CxfEndpointBeansTest extends CamelBlueprintTestSupport {
Exchange reply = template.request("cxf:bean:serviceEndpoint", new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add("hello");
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, "echo");
diff --git a/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/test/builder/AddComponentInConfigureBuilder.java b/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/test/builder/AddComponentInConfigureBuilder.java
index fead2db..89684a1 100644
--- a/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/test/builder/AddComponentInConfigureBuilder.java
+++ b/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/test/builder/AddComponentInConfigureBuilder.java
@@ -19,15 +19,11 @@ package org.apache.camel.blueprint.test.builder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.timer.TimerComponent;
-import org.apache.camel.model.ModelCamelContext;
public class AddComponentInConfigureBuilder extends RouteBuilder {
@Override
public void configure() throws Exception {
- ModelCamelContext context = getContext();
- TimerComponent timerComponent = new TimerComponent();
-
- getContext().addComponent("my-timer", timerComponent);
+ getContext().addComponent("my-timer", new TimerComponent());
from("my-timer://test-timer?period=1000")
.to("mock://result");
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
index ae30ce7..35e26fe 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
@@ -144,7 +144,7 @@ public class CoreEipAnnotationProcessor {
EipModel eipModel = findEipModelProperties(processingEnv, roundEnv, classElement, javaTypeName, modelName);
// get endpoint information which is divided into paths and options (though there should really only be one path)
- Set<EipOption> eipOptions = new TreeSet<EipOption>(new EipOptionComparator(eipModel));
+ Set<EipOption> eipOptions = new TreeSet<>(new EipOptionComparator(eipModel));
findClassProperties(processingEnv, writer, roundEnv, eipOptions, classElement, classElement, "", modelName);
// after we have found all the options then figure out if the model accepts input/output
@@ -354,7 +354,7 @@ public class CoreEipAnnotationProcessor {
required = findRequired(fieldElement, required);
// gather enums
- Set<String> enums = new TreeSet<String>();
+ Set<String> enums = new TreeSet<>();
boolean isEnum;
if (metadata != null && !Strings.isNullOrEmpty(metadata.enums())) {
isEnum = true;
@@ -468,7 +468,7 @@ public class CoreEipAnnotationProcessor {
}
// gather enums
- Set<String> enums = new TreeSet<String>();
+ Set<String> enums = new TreeSet<>();
boolean isEnum;
if (metadata != null && !Strings.isNullOrEmpty(metadata.enums())) {
isEnum = true;
@@ -494,7 +494,7 @@ public class CoreEipAnnotationProcessor {
}
// gather oneOf expression/predicates which uses language
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
boolean isOneOf = ONE_OF_TYPE_NAME.equals(fieldTypeName);
if (isOneOf) {
// okay its actually an language expression, so favor using that in the eip option
@@ -505,7 +505,7 @@ public class CoreEipAnnotationProcessor {
if (languages != null) {
String superClassName = canonicalClassName(languages.toString());
// find all classes that has that superClassName
- Set<TypeElement> children = new LinkedHashSet<TypeElement>();
+ Set<TypeElement> children = new LinkedHashSet<>();
findTypeElementChildren(processingEnv, roundEnv, children, superClassName);
for (TypeElement child : children) {
XmlRootElement rootElement = child.getAnnotation(XmlRootElement.class);
@@ -559,7 +559,7 @@ public class CoreEipAnnotationProcessor {
required = findRequired(fieldElement, required);
// gather oneOf of the elements
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
for (XmlElement element : elements.value()) {
String child = element.name();
oneOfTypes.add(child);
@@ -653,7 +653,7 @@ public class CoreEipAnnotationProcessor {
eipOptions.add(ep);
// shutdownRoute
- Set<String> enums = new LinkedHashSet<String>();
+ Set<String> enums = new LinkedHashSet<>();
enums.add("Default");
enums.add("Defer");
docComment = findJavaDoc(elementUtils, null, "shutdownRoute", "Default", classElement, true);
@@ -662,7 +662,7 @@ public class CoreEipAnnotationProcessor {
eipOptions.add(ep);
// shutdownRunningTask
- enums = new LinkedHashSet<String>();
+ enums = new LinkedHashSet<>();
enums.add("CompleteCurrentTaskOnly");
enums.add("CompleteAllTasks");
docComment = findJavaDoc(elementUtils, null, "shutdownRunningTask", "CompleteCurrentTaskOnly", classElement, true);
@@ -671,7 +671,7 @@ public class CoreEipAnnotationProcessor {
eipOptions.add(ep);
// inputs
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
oneOfTypes.add("from");
docComment = findJavaDoc(elementUtils, null, "inputs", null, classElement, true);
ep = new EipOption("inputs", "Inputs", "element", "java.util.List<org.apache.camel.model.FromDefinition>", true, "", docComment,
@@ -680,9 +680,9 @@ public class CoreEipAnnotationProcessor {
// outputs
// gather oneOf which extends any of the output base classes
- oneOfTypes = new TreeSet<String>();
+ oneOfTypes = new TreeSet<>();
// find all classes that has that superClassName
- Set<TypeElement> children = new LinkedHashSet<TypeElement>();
+ Set<TypeElement> children = new LinkedHashSet<>();
for (String superclass : ONE_OF_OUTPUTS) {
findTypeElementChildren(processingEnv, roundEnv, children, superclass);
}
@@ -743,7 +743,7 @@ public class CoreEipAnnotationProcessor {
TypeMirror fieldType = fieldElement.asType();
String fieldTypeName = fieldType.toString();
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
oneOfTypes.add("route");
EipOption ep = new EipOption("routes", "Routes", "element", fieldTypeName, false, "", "Contains the Camel routes",
@@ -762,7 +762,7 @@ public class CoreEipAnnotationProcessor {
TypeMirror fieldType = fieldElement.asType();
String fieldTypeName = fieldType.toString();
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
oneOfTypes.add("rest");
EipOption ep = new EipOption("rests", "Rests", "element", fieldTypeName, false, "", "Contains the rest services defined using the rest-dsl",
@@ -787,9 +787,9 @@ public class CoreEipAnnotationProcessor {
String fieldTypeName = fieldType.toString();
// gather oneOf which extends any of the output base classes
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
// find all classes that has that superClassName
- Set<TypeElement> children = new LinkedHashSet<TypeElement>();
+ Set<TypeElement> children = new LinkedHashSet<>();
for (String superclass : ONE_OF_OUTPUTS) {
findTypeElementChildren(processingEnv, roundEnv, children, superclass);
}
@@ -840,9 +840,9 @@ public class CoreEipAnnotationProcessor {
String docComment = findJavaDoc(elementUtils, fieldElement, fieldName, name, originalClassType, true);
// gather oneOf which extends any of the output base classes
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
// find all classes that has that superClassName
- Set<TypeElement> children = new LinkedHashSet<TypeElement>();
+ Set<TypeElement> children = new LinkedHashSet<>();
for (String superclass : ONE_OF_VERBS) {
findTypeElementChildren(processingEnv, roundEnv, children, superclass);
}
@@ -902,12 +902,12 @@ public class CoreEipAnnotationProcessor {
}
// gather oneOf expression/predicates which uses language
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
for (String language : ONE_OF_LANGUAGES) {
TypeElement languages = findTypeElement(processingEnv, roundEnv, language);
String superClassName = canonicalClassName(languages.toString());
// find all classes that has that superClassName
- Set<TypeElement> children = new LinkedHashSet<TypeElement>();
+ Set<TypeElement> children = new LinkedHashSet<>();
findTypeElementChildren(processingEnv, roundEnv, children, superClassName);
for (TypeElement child : children) {
XmlRootElement rootElement = child.getAnnotation(XmlRootElement.class);
@@ -955,7 +955,7 @@ public class CoreEipAnnotationProcessor {
String docComment = findJavaDoc(elementUtils, fieldElement, fieldName, name, originalClassType, true);
// indicate that this element is one of when
- Set<String> oneOfTypes = new HashSet<String>();
+ Set<String> oneOfTypes = new HashSet<>();
oneOfTypes.add("when");
// when is predicate
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 6c7ecec..57b2f44 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -141,9 +141,9 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
ComponentModel componentModel = findComponentProperties(roundEnv, uriEndpoint, classElement, title, scheme, extendsScheme, label);
// get endpoint information which is divided into paths and options (though there should really only be one path)
- Set<EndpointPath> endpointPaths = new LinkedHashSet<EndpointPath>();
- Set<EndpointOption> endpointOptions = new LinkedHashSet<EndpointOption>();
- Set<ComponentOption> componentOptions = new LinkedHashSet<ComponentOption>();
+ Set<EndpointPath> endpointPaths = new LinkedHashSet<>();
+ Set<EndpointOption> endpointOptions = new LinkedHashSet<>();
+ Set<ComponentOption> componentOptions = new LinkedHashSet<>();
TypeElement componentClassElement = findTypeElement(processingEnv, roundEnv, componentModel.getJavaType());
if (componentClassElement != null) {
@@ -240,7 +240,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
first = true;
// sort the endpoint options in the standard order we prefer
- List<EndpointPath> paths = new ArrayList<EndpointPath>();
+ List<EndpointPath> paths = new ArrayList<>();
paths.addAll(endpointPaths);
Collections.sort(paths, EndpointHelper.createPathComparator(componentModel.getSyntax()));
@@ -288,7 +288,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
// sort the endpoint options in the standard order we prefer
- List<EndpointOption> options = new ArrayList<EndpointOption>();
+ List<EndpointOption> options = new ArrayList<>();
options.addAll(endpointOptions);
Collections.sort(options, EndpointHelper.createGroupAndLabelComparator());
@@ -509,7 +509,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
// gather enums
- Set<String> enums = new LinkedHashSet<String>();
+ Set<String> enums = new LinkedHashSet<>();
boolean isEnum;
if (metadata != null && !Strings.isNullOrEmpty(metadata.enums())) {
@@ -595,7 +595,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
if (Strings.isNullOrEmpty(defaultValue) && metadata != null) {
defaultValue = metadata.defaultValue();
}
- String defaultValueNote = path.defaultValueNote();
+ path.defaultValueNote();
String required = metadata != null ? metadata.required() : null;
String label = path.label();
if (Strings.isNullOrEmpty(label) && metadata != null) {
@@ -616,7 +616,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
// gather enums
- Set<String> enums = new LinkedHashSet<String>();
+ Set<String> enums = new LinkedHashSet<>();
boolean isEnum;
if (!Strings.isNullOrEmpty(path.enums())) {
@@ -711,7 +711,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
// gather enums
- Set<String> enums = new LinkedHashSet<String>();
+ Set<String> enums = new LinkedHashSet<>();
boolean isEnum;
if (!Strings.isNullOrEmpty(param.enums())) {
@@ -777,7 +777,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
private static Map<String, String> parseAsMap(String data) {
- Map<String, String> answer = new HashMap<String, String>();
+ Map<String, String> answer = new HashMap<>();
String[] lines = data.split("\n");
for (String line : lines) {
if (!line.isEmpty()) {
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
index a346f5f..d7357cd 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
@@ -107,7 +107,7 @@ public class SpringAnnotationProcessor {
EipModel eipModel = findEipModelProperties(processingEnv, roundEnv, classElement, javaTypeName, modelName);
// collect eip information
- Set<EipOption> eipOptions = new TreeSet<EipOption>(new EipOptionComparator(eipModel));
+ Set<EipOption> eipOptions = new TreeSet<>(new EipOptionComparator(eipModel));
findClassProperties(processingEnv, writer, roundEnv, eipOptions, classElement, classElement, "", modelName);
String json = createParameterJsonSchema(eipModel, eipOptions);
@@ -272,7 +272,7 @@ public class SpringAnnotationProcessor {
required = findRequired(fieldElement, required);
// gather enums
- Set<String> enums = new TreeSet<String>();
+ Set<String> enums = new TreeSet<>();
boolean isEnum = fieldTypeElement != null && fieldTypeElement.getKind() == ElementKind.ENUM;
if (isEnum) {
TypeElement enumClass = findTypeElement(processingEnv, roundEnv, fieldTypeElement.asType().toString());
@@ -322,7 +322,7 @@ public class SpringAnnotationProcessor {
TypeMirror fieldType = fieldElement.asType();
String fieldTypeName = fieldType.toString();
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
oneOfTypes.add("route");
EipOption ep = new EipOption("route", "Route", "element", fieldTypeName, false, "", "Contains the Camel routes",
@@ -339,7 +339,7 @@ public class SpringAnnotationProcessor {
TypeMirror fieldType = fieldElement.asType();
String fieldTypeName = fieldType.toString();
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
oneOfTypes.add("rest");
EipOption ep = new EipOption("rest", "Rest", "element", fieldTypeName, false, "", "Contains the rest services defined using the rest-dsl",
@@ -377,7 +377,7 @@ public class SpringAnnotationProcessor {
required = findRequired(fieldElement, required);
// gather enums
- Set<String> enums = new LinkedHashSet<String>();
+ Set<String> enums = new LinkedHashSet<>();
boolean isEnum = fieldTypeElement != null && fieldTypeElement.getKind() == ElementKind.ENUM;
if (isEnum) {
TypeElement enumClass = findTypeElement(processingEnv, roundEnv, fieldTypeElement.asType().toString());
@@ -462,7 +462,7 @@ public class SpringAnnotationProcessor {
required = findRequired(fieldElement, required);
// gather oneOf of the elements
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
for (XmlElement element : elements.value()) {
String child = element.name();
oneOfTypes.add(child);
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
index 3bd678f..cdd50de 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
@@ -18,8 +18,6 @@ package org.apache.camel.tools.apt.model;
import java.util.Set;
-import org.apache.camel.tools.apt.helper.CollectionStringBuffer;
-
import static org.apache.camel.tools.apt.helper.Strings.isNullOrEmpty;
public final class ComponentOption {
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java
index 29d0bab..09a7db0 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java
@@ -18,8 +18,6 @@ package org.apache.camel.tools.apt.model;
import java.util.Set;
-import org.apache.camel.tools.apt.helper.CollectionStringBuffer;
-
import static org.apache.camel.tools.apt.helper.Strings.isNullOrEmpty;
public final class EndpointOption {
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java
index 41a2072..8c6d99b 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java
@@ -18,8 +18,6 @@ package org.apache.camel.tools.apt.model;
import java.util.Set;
-import org.apache.camel.tools.apt.helper.CollectionStringBuffer;
-
public final class EndpointPath {
private String name;
diff --git a/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java b/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java
index feabf55..a47aa3a 100644
--- a/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java
+++ b/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java
@@ -48,7 +48,7 @@ public class EndpointOptionComparatorTest {
EndpointOption op4 = new EndpointOption("country", "Country", "string", "true", "", "", "blah", null, null, false,
false, null, false, group4, label4, false, null);
- List<EndpointOption> list = new ArrayList<EndpointOption>();
+ List<EndpointOption> list = new ArrayList<>();
list.add(op1);
list.add(op2);
list.add(op3);
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
index db16da0..7a71bc6 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
@@ -154,7 +154,7 @@ public abstract class AbstractApiMethodGeneratorMojo extends AbstractApiMethodBa
context.put("componentPackage", componentPackage);
// generate parameter names and types for configuration, sorted by parameter name
- Map<String, ApiMethodArg> parameters = new TreeMap<String, ApiMethodArg>();
+ Map<String, ApiMethodArg> parameters = new TreeMap<>();
for (ApiMethodParser.ApiMethodModel model : models) {
for (ApiMethodArg argument : model.getArguments()) {
@@ -272,7 +272,7 @@ public abstract class AbstractApiMethodGeneratorMojo extends AbstractApiMethodBa
}
static {
- PRIMITIVE_VALUES = new HashMap<Class<?>, String>();
+ PRIMITIVE_VALUES = new HashMap<>();
PRIMITIVE_VALUES.put(Boolean.TYPE, "Boolean.FALSE");
PRIMITIVE_VALUES.put(Byte.TYPE, "(byte) 0");
PRIMITIVE_VALUES.put(Character.TYPE, "(char) 0");
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java
index f1f9881..b67b9bd 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java
@@ -138,7 +138,7 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
context.put("uriFormat", scheme + suffix);
// API helpers
- final Map<String, ApiMethodHelper> apiHelpers = new TreeMap<String, ApiMethodHelper>();
+ final Map<String, ApiMethodHelper> apiHelpers = new TreeMap<>();
for (Object element : collection.getApiHelpers().entrySet()) {
Map.Entry entry = (Map.Entry) element;
apiHelpers.put(((ApiName) entry.getKey()).getName(), (ApiMethodHelper) entry.getValue());
@@ -146,8 +146,8 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
context.put("apiHelpers", apiHelpers);
// API methods and endpoint configurations
- final Map<String, Class<? extends ApiMethod>> apiMethods = new TreeMap<String, Class<? extends ApiMethod>>();
- final Map<String, Class<?>> apiConfigs = new TreeMap<String, Class<?>>();
+ final Map<String, Class<? extends ApiMethod>> apiMethods = new TreeMap<>();
+ final Map<String, Class<?>> apiConfigs = new TreeMap<>();
for (Object element : collection.getApiMethods().entrySet()) {
Map.Entry entry = (Map.Entry) element;
final String name = ((ApiName) entry.getValue()).getName();
@@ -184,7 +184,7 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
// get declared and derived fields for component config
// use get/set methods instead of fields, since this class could inherit others, that have private fields
// so getDeclaredFields() won't work, like it does for generated endpoint config classes!!!
- final Map<String, String> configFields = new TreeMap<String, String>();
+ final Map<String, String> configFields = new TreeMap<>();
do {
IntrospectionSupport.ClassInfo classInfo = IntrospectionSupport.cacheClass(configClass);
for (IntrospectionSupport.MethodInfo method : classInfo.methods) {
@@ -315,32 +315,32 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
public static List<EndpointInfo> getEndpoints(Class<? extends ApiMethod> apiMethod,
ApiMethodHelper<?> helper, Class<?> endpointConfig) {
// get list of valid options
- final Set<String> validOptions = new HashSet<String>();
+ final Set<String> validOptions = new HashSet<>();
for (Field field : endpointConfig.getDeclaredFields()) {
validOptions.add(field.getName());
}
// create method name map
- final Map<String, List<ApiMethod>> methodMap = new TreeMap<String, List<ApiMethod>>();
+ final Map<String, List<ApiMethod>> methodMap = new TreeMap<>();
for (ApiMethod method : apiMethod.getEnumConstants()) {
String methodName = method.getName();
List<ApiMethod> apiMethods = methodMap.get(methodName);
if (apiMethods == null) {
- apiMethods = new ArrayList<ApiMethod>();
+ apiMethods = new ArrayList<>();
methodMap.put(methodName, apiMethods);
}
apiMethods.add(method);
}
// create method name to alias name map
- final Map<String, Set<String>> aliasMap = new TreeMap<String, Set<String>>();
+ final Map<String, Set<String>> aliasMap = new TreeMap<>();
final Map<String, Set<String>> aliasToMethodMap = helper.getAliases();
for (Map.Entry<String, Set<String>> entry : aliasToMethodMap.entrySet()) {
final String alias = entry.getKey();
for (String method : entry.getValue()) {
Set<String> aliases = aliasMap.get(method);
if (aliases == null) {
- aliases = new TreeSet<String>();
+ aliases = new TreeSet<>();
aliasMap.put(method, aliases);
}
aliases.add(alias);
@@ -348,16 +348,16 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
}
// create options map and return type map
- final Map<String, Set<String>> optionMap = new TreeMap<String, Set<String>>();
- final Map<String, Set<String>> returnType = new TreeMap<String, Set<String>>();
+ final Map<String, Set<String>> optionMap = new TreeMap<>();
+ final Map<String, Set<String>> returnType = new TreeMap<>();
for (Map.Entry<String, List<ApiMethod>> entry : methodMap.entrySet()) {
final String name = entry.getKey();
final List<ApiMethod> apiMethods = entry.getValue();
// count the number of times, every valid option shows up across methods
// and also collect return types
- final Map<String, Integer> optionCount = new TreeMap<String, Integer>();
- final TreeSet<String> resultTypes = new TreeSet<String>();
+ final Map<String, Integer> optionCount = new TreeMap<>();
+ final TreeSet<String> resultTypes = new TreeSet<>();
returnType.put(name, resultTypes);
for (ApiMethod method : apiMethods) {
@@ -383,14 +383,14 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
}
// collect method options
- final TreeSet<String> options = new TreeSet<String>();
+ final TreeSet<String> options = new TreeSet<>();
optionMap.put(name, options);
- final Set<String> mandatory = new TreeSet<String>();
+ final Set<String> mandatory = new TreeSet<>();
// generate optional and mandatory lists for overloaded methods
int nMethods = apiMethods.size();
for (ApiMethod method : apiMethods) {
- final Set<String> optional = new TreeSet<String>();
+ final Set<String> optional = new TreeSet<>();
for (String arg : method.getArgNames()) {
if (validOptions.contains(arg)) {
@@ -417,7 +417,7 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
}
// create endpoint data
- final List<EndpointInfo> infos = new ArrayList<EndpointInfo>();
+ final List<EndpointInfo> infos = new ArrayList<>();
for (Map.Entry<String, List<ApiMethod>> methodEntry : methodMap.entrySet()) {
final String endpoint = methodEntry.getKey();
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/FileApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/FileApiMethodGeneratorMojo.java
index e011544..bcea4a1 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/FileApiMethodGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/FileApiMethodGeneratorMojo.java
@@ -43,7 +43,7 @@ public class FileApiMethodGeneratorMojo extends AbstractApiMethodGeneratorMojo {
@Override
public List<String> getSignatureList() throws MojoExecutionException {
// get signatureFile as a list of Strings
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
try {
BufferedReader reader = new BufferedReader(new FileReader(this.signatureFile));
String line = reader.readLine();
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojo.java
index b43adf6..357bd64 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojo.java
@@ -70,7 +70,7 @@ public class JavadocApiMethodGeneratorMojo extends AbstractApiMethodGeneratorMoj
@Override
public List<String> getSignatureList() throws MojoExecutionException {
// signatures as map from signature with no arg names to arg names from JavadocParser
- Map<String, String> result = new HashMap<String, String>();
+ Map<String, String> result = new HashMap<>();
final Pattern packagePatterns = Pattern.compile(excludePackages);
final Pattern classPatterns = (excludeClasses != null) ? Pattern.compile(excludeClasses) : null;
@@ -121,7 +121,7 @@ public class JavadocApiMethodGeneratorMojo extends AbstractApiMethodGeneratorMoj
types = new String[0];
} else {
// get raw types from args
- final List<String> rawTypes = new ArrayList<String>();
+ final List<String> rawTypes = new ArrayList<>();
final Matcher argTypesMatcher = RAW_ARGTYPES_PATTERN.matcher(args);
while (argTypesMatcher.find()) {
rawTypes.add(argTypesMatcher.group(1));
@@ -145,7 +145,7 @@ public class JavadocApiMethodGeneratorMojo extends AbstractApiMethodGeneratorMoj
throw new MojoExecutionException("No public non-static methods found, "
+ "make sure Javadoc is available as project test dependency");
}
- return new ArrayList<String>(result.values());
+ return new ArrayList<>(result.values());
}
private String getResultType(Class<?> aClass, String name, String[] types) throws MojoExecutionException {
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
index bda641c..f8ec14f 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
@@ -45,8 +45,8 @@ public class JavadocParser extends Parser {
private String methodWithTypes;
private StringBuilder methodTextBuilder = new StringBuilder();
- private List<String> methods = new ArrayList<String>();
- private Map<String, String> methodText = new HashMap<String, String>();
+ private List<String> methods = new ArrayList<>();
+ private Map<String, String> methodText = new HashMap<>();
private String errorMessage;
public JavadocParser(DTD dtd, String docPath) {
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/TestProxy.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/TestProxy.java
index e6c4c1c..9fcde60 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/TestProxy.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/TestProxy.java
@@ -59,7 +59,7 @@ public class TestProxy {
}
public final String[] greetTimes(String name, int times) {
- final List<String> result = new ArrayList<String>();
+ final List<String> result = new ArrayList<>();
for (int i = 0; i < times; i++) {
result.add("Greetings " + name);
}
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/ApiComponentGeneratorMojoTest.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/ApiComponentGeneratorMojoTest.java
index 4170ec1..640edb7 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/ApiComponentGeneratorMojoTest.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/ApiComponentGeneratorMojoTest.java
@@ -63,7 +63,7 @@ public class ApiComponentGeneratorMojoTest extends AbstractGeneratorMojoTest {
mojo.apis[0].setExcludeConfigTypes("int");
mojo.apis[0].setNullableOptions(new String[] {"namesList"});
- List<ApiMethodAlias> aliases = new ArrayList<ApiMethodAlias>();
+ List<ApiMethodAlias> aliases = new ArrayList<>();
aliases.add(new ApiMethodAlias("get(.+)", "$1"));
aliases.add(new ApiMethodAlias("set(.+)", "$1"));
mojo.apis[1] = new ApiProxy();
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.