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/16 21:43:26 UTC
[camel] 01/02: 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 c1f9e3eb866c87b6452578f68194acb2cdfb0f51
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Mon Apr 16 23:42:22 2018 +0200
polish
---
.../org/apache/camel/core/osgi/OsgiCamelContextPublisher.java | 4 ++--
.../main/java/org/apache/camel/core/osgi/OsgiClassResolver.java | 2 +-
.../java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java | 4 ++--
.../org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java | 2 +-
.../main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java | 6 +++---
.../main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java | 4 ++--
.../java/org/apache/camel/core/osgi/utils/BundleContextUtils.java | 2 +-
.../src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java | 8 ++++----
.../java/org/apache/camel/core/osgi/CamelMockBundleContext.java | 2 +-
.../org/apache/camel/core/osgi/OsgiComponentResolverTest.java | 1 -
.../apache/camel/core/osgi/test/MockTypeConverterRegistry.java | 4 ++--
.../apache/camel/core/xml/AbstractCamelContextFactoryBean.java | 8 ++++----
.../apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java | 4 ++--
.../org/apache/camel/core/xml/PatternBasedPackageScanFilter.java | 8 ++++----
.../core/xml/util/jsse/CipherSuitesParametersDefinition.java | 2 +-
.../camel/core/xml/util/jsse/FilterParametersDefinition.java | 4 ++--
.../xml/util/jsse/SecureSocketProtocolsParametersDefinition.java | 2 +-
17 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
index 307a12b..26ca21c 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
@@ -47,7 +47,7 @@ public class OsgiCamelContextPublisher extends EventNotifierSupport {
private final BundleContext bundleContext;
private final Map<CamelContext, ServiceRegistration<?>> registrations
- = new ConcurrentHashMap<CamelContext, ServiceRegistration<?>>();
+ = new ConcurrentHashMap<>();
public OsgiCamelContextPublisher(BundleContext bundleContext) {
this.bundleContext = bundleContext;
@@ -115,7 +115,7 @@ public class OsgiCamelContextPublisher extends EventNotifierSupport {
if (!lookupCamelContext(bundleContext, symbolicName, name)) {
Version bundleVersion = getBundleVersion(bundleContext.getBundle());
- Dictionary<String, Object > props = new Hashtable<String, Object>();
+ Dictionary<String, Object > props = new Hashtable<>();
props.put(CONTEXT_SYMBOLIC_NAME_PROPERTY, symbolicName);
props.put(CONTEXT_VERSION_PROPERTY, bundleVersion);
props.put(CONTEXT_NAME_PROPERTY, name);
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
index f75a50a..cae621c 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
@@ -124,7 +124,7 @@ public class OsgiClassResolver extends DefaultClassResolver {
@Override
public Enumeration<URL> loadAllResourcesAsURL(String uri) {
ObjectHelper.notEmpty(uri, "uri");
- Vector<URL> answer = new Vector<URL>();
+ Vector<URL> answer = new Vector<>();
try {
String resolvedName = resolveUriPath(uri);
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
index 74cd06c..e9b79f0 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
@@ -56,7 +56,7 @@ public class OsgiEventAdminNotifier extends EventNotifierSupport {
public OsgiEventAdminNotifier(BundleContext bundleContext) {
this.bundleContext = bundleContext;
- this.tracker = new ServiceTracker<EventAdmin, EventAdmin>(bundleContext, EventAdmin.class.getName(), null);
+ this.tracker = new ServiceTracker<>(bundleContext, EventAdmin.class.getName(), null);
setIgnoreExchangeEvents(true);
}
@@ -66,7 +66,7 @@ public class OsgiEventAdminNotifier extends EventNotifierSupport {
return;
}
- Dictionary<String, Object> props = new Hashtable<String, Object>();
+ Dictionary<String, Object> props = new Hashtable<>();
props.put(TYPE, getType(event));
props.put(EVENT, event);
props.put(TIMESTAMP, System.currentTimeMillis());
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
index af9846e..8772f8c 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
@@ -91,7 +91,7 @@ public class OsgiPackageScanClassResolver extends DefaultPackageScanClassResolve
} else {
bundles = new Bundle[]{bundle};
}
- Set<String> urls = new LinkedHashSet<String>();
+ Set<String> urls = new LinkedHashSet<>();
for (Bundle bd : bundles) {
log.trace("Searching in bundle: {}", bd);
try {
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
index 337061b..cc2c353 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
public class OsgiServiceRegistry extends LifecycleStrategySupport implements Registry {
private static final Logger LOG = LoggerFactory.getLogger(OsgiCamelContextHelper.class);
private final BundleContext bundleContext;
- private final Queue<ServiceReference<?>> serviceReferenceQueue = new ConcurrentLinkedQueue<ServiceReference<?>>();
+ private final Queue<ServiceReference<?>> serviceReferenceQueue = new ConcurrentLinkedQueue<>();
public OsgiServiceRegistry(BundleContext bc) {
bundleContext = bc;
@@ -97,7 +97,7 @@ public class OsgiServiceRegistry extends LifecycleStrategySupport implements Reg
}
public <T> Map<String, T> findByTypeWithName(Class<T> type) {
- Map<String, T> result = new HashMap<String, T>();
+ Map<String, T> result = new HashMap<>();
int count = 0;
try {
ServiceReference<?>[] refs = bundleContext.getAllServiceReferences(type.getName(), null);
@@ -127,7 +127,7 @@ public class OsgiServiceRegistry extends LifecycleStrategySupport implements Reg
public <T> Set<T> findByType(Class<T> type) {
Map<String, T> map = findByTypeWithName(type);
- return new HashSet<T>(map.values());
+ return new HashSet<>(map.values());
}
public Object lookup(String name) {
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index 85bd1f1..ae63aca 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -61,7 +61,7 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
this.camelContext = camelContext;
this.injector = injector;
this.factoryFinder = factoryFinder;
- this.tracker = new ServiceTracker<TypeConverterLoader, Object>(bundleContext, TypeConverterLoader.class.getName(), this);
+ this.tracker = new ServiceTracker<>(bundleContext, TypeConverterLoader.class.getName(), this);
}
public Object addingService(ServiceReference<TypeConverterLoader> serviceReference) {
@@ -225,7 +225,7 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
ServiceReference<TypeConverterLoader>[] serviceReferences = this.tracker.getServiceReferences();
if (serviceReferences != null) {
ArrayList<ServiceReference<TypeConverterLoader>> servicesList =
- new ArrayList<ServiceReference<TypeConverterLoader>>(Arrays.asList(serviceReferences));
+ new ArrayList<>(Arrays.asList(serviceReferences));
// Just make sure we install the high ranking fallback converter at last
Collections.sort(servicesList);
for (ServiceReference<TypeConverterLoader> sr : servicesList) {
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java
index ce7af15..4b77f77 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java
@@ -80,7 +80,7 @@ public final class BundleContextUtils {
public static Map<String, Properties> findComponents(BundleContext bundleContext, CamelContext camelContext)
throws IOException, LoadPropertiesException {
- SortedMap<String, Properties> answer = new TreeMap<String, Properties>();
+ SortedMap<String, Properties> answer = new TreeMap<>();
Bundle[] bundles = bundleContext.getBundles();
for (Bundle bundle : bundles) {
Enumeration<URL> iter = bundle.getResources(CamelContextHelper.COMPONENT_DESCRIPTOR);
diff --git a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
index 212b932..7fa2f40 100644
--- a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
+++ b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
@@ -65,11 +65,11 @@ public class CamelMockBundle extends MockBundle {
}
private Enumeration<String> getListEnumeration(String prefix, String entrys[]) {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
for (String entry : entrys) {
list.add(prefix + entry);
}
- return new ListEnumeration<String>(list);
+ return new ListEnumeration<>(list);
}
public Enumeration<String> getEntryPaths(String path) {
@@ -92,12 +92,12 @@ public class CamelMockBundle extends MockBundle {
public Enumeration<URL> findEntries(String path, String filePattern, boolean recurse) {
if (path.equals("/org/apache/camel/core/osgi/test") && filePattern.equals("*.class")) {
- List<URL> urls = new ArrayList<URL>();
+ List<URL> urls = new ArrayList<>();
URL url = getClass().getClassLoader().getResource("org/apache/camel/core/osgi/test/MyTypeConverter.class");
urls.add(url);
url = getClass().getClassLoader().getResource("org/apache/camel/core/osgi/test/MyRouteBuilder.class");
urls.add(url);
- return new ListEnumeration<URL>(urls);
+ return new ListEnumeration<>(urls);
} else {
return CastUtils.cast(super.findEntries(path, filePattern, recurse));
}
diff --git a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
index 0c16ae1..5d8cff8 100644
--- a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
+++ b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
@@ -77,7 +77,7 @@ public class CamelMockBundleContext extends MockBundleContext {
// lookup Java class if clazz contains dot (.) symbol
if (clazz.contains(".")) {
try {
- final Class c = Class.forName(clazz);
+ Class.forName(clazz);
return super.getServiceReference(clazz);
} catch (ClassNotFoundException ex) {
return null; // class not found so no service reference is returned
diff --git a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java
index 59ff0dc..85c667f 100644
--- a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java
+++ b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.core.osgi;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.ComponentConfiguration;
-import org.apache.camel.ComponentVerifier;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointConfiguration;
import org.apache.camel.component.file.FileComponent;
diff --git a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
index 28cbdc3..df1b4e7 100644
--- a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
+++ b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
@@ -27,8 +27,8 @@ import org.apache.camel.spi.Injector;
import org.apache.camel.spi.TypeConverterRegistry;
public class MockTypeConverterRegistry implements TypeConverterRegistry {
- private List<TypeConverter> typeConverters = new ArrayList<TypeConverter>();
- private List<TypeConverter> fallbackTypeConverters = new ArrayList<TypeConverter>();
+ private List<TypeConverter> typeConverters = new ArrayList<>();
+ private List<TypeConverter> fallbackTypeConverters = new ArrayList<>();
public List<TypeConverter> getTypeConverters() {
return typeConverters;
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index 87101bb..521188f 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -140,7 +140,7 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
private static final Logger LOG = LoggerFactory.getLogger(AbstractCamelContextFactoryBean.class);
@XmlTransient
- private List<RoutesBuilder> builders = new ArrayList<RoutesBuilder>();
+ private List<RoutesBuilder> builders = new ArrayList<>();
@XmlTransient
private ClassLoader contextClassLoaderOnStart;
@XmlTransient
@@ -994,7 +994,7 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
}
protected void initThreadPoolProfiles(T context) throws Exception {
- Set<String> defaultIds = new HashSet<String>();
+ Set<String> defaultIds = new HashSet<>();
// lookup and use custom profiles from the registry
Map<String, ThreadPoolProfile> profiles = context.getRegistry().findByTypeWithName(ThreadPoolProfile.class);
@@ -1058,7 +1058,7 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
* Strategy to install all available routes into the context
*/
protected void installRoutes() throws Exception {
- List<RouteBuilder> builders = new ArrayList<RouteBuilder>();
+ List<RouteBuilder> builders = new ArrayList<>();
// lets add RoutesBuilder's added from references
if (getBuilderRefs() != null) {
@@ -1151,7 +1151,7 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
}
private String[] normalizePackages(T context, List<String> unnormalized) throws Exception {
- List<String> packages = new ArrayList<String>();
+ List<String> packages = new ArrayList<>();
for (String name : unnormalized) {
// it may use property placeholders
name = context.resolvePropertyPlaceholders(name);
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
index b7d68f1..9c1e559 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
@@ -48,7 +48,7 @@ public abstract class AbstractCamelEndpointFactoryBean extends AbstractCamelFact
private ExchangePattern pattern;
@XmlElementRef
@Metadata(description = "To configure additional endpoint options using a XML style which is similar as configuring Spring or Blueprint beans.")
- private List<PropertyDefinition> properties = new ArrayList<PropertyDefinition>();
+ private List<PropertyDefinition> properties = new ArrayList<>();
@XmlTransient
private Endpoint endpoint;
@@ -122,7 +122,7 @@ public abstract class AbstractCamelEndpointFactoryBean extends AbstractCamelFact
if (properties == null || properties.isEmpty()) {
return uri;
} else {
- Map<String, Object> map = new LinkedHashMap<String, Object>();
+ Map<String, Object> map = new LinkedHashMap<>();
for (PropertyDefinition property : properties) {
// resolve placeholders for each value
String value = getCamelContext().resolvePropertyPlaceholders(property.getValue());
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java
index 99bf76b..8f92a4d 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java
@@ -42,7 +42,7 @@ public class PatternBasedPackageScanFilter implements PackageScanFilter {
*/
public void addExcludePattern(String excludePattern) {
if (excludePatterns == null) {
- excludePatterns = new ArrayList<String>();
+ excludePatterns = new ArrayList<>();
}
excludePatterns.add(excludePattern);
}
@@ -53,21 +53,21 @@ public class PatternBasedPackageScanFilter implements PackageScanFilter {
*/
public void addIncludePattern(String includePattern) {
if (includePatterns == null) {
- includePatterns = new ArrayList<String>();
+ includePatterns = new ArrayList<>();
}
includePatterns.add(includePattern);
}
public void addIncludePatterns(Collection<String> includes) {
if (includePatterns == null) {
- includePatterns = new ArrayList<String>();
+ includePatterns = new ArrayList<>();
}
includePatterns.addAll(includes);
}
public void addExcludePatterns(Collection<String> excludes) {
if (excludePatterns == null) {
- excludePatterns = new ArrayList<String>();
+ excludePatterns = new ArrayList<>();
}
excludePatterns.addAll(excludes);
}
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/CipherSuitesParametersDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/CipherSuitesParametersDefinition.java
index f552355..999601c 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/CipherSuitesParametersDefinition.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/CipherSuitesParametersDefinition.java
@@ -35,7 +35,7 @@ public class CipherSuitesParametersDefinition {
*/
public List<String> getCipherSuite() {
if (this.cipherSuite == null) {
- this.cipherSuite = new ArrayList<String>();
+ this.cipherSuite = new ArrayList<>();
}
return this.cipherSuite;
}
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/FilterParametersDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/FilterParametersDefinition.java
index 6d0481c..92eabf3 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/FilterParametersDefinition.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/FilterParametersDefinition.java
@@ -42,7 +42,7 @@ public class FilterParametersDefinition {
*/
public List<String> getInclude() {
if (this.include == null) {
- this.include = new ArrayList<String>();
+ this.include = new ArrayList<>();
}
return this.include;
}
@@ -55,7 +55,7 @@ public class FilterParametersDefinition {
*/
public List<String> getExclude() {
if (exclude == null) {
- exclude = new ArrayList<String>();
+ exclude = new ArrayList<>();
}
return this.exclude;
}
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SecureSocketProtocolsParametersDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SecureSocketProtocolsParametersDefinition.java
index ae48d39..30af484 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SecureSocketProtocolsParametersDefinition.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SecureSocketProtocolsParametersDefinition.java
@@ -38,7 +38,7 @@ public class SecureSocketProtocolsParametersDefinition {
*/
public List<String> getSecureSocketProtocol() {
if (this.secureSocketProtocol == null) {
- this.secureSocketProtocol = new ArrayList<String>();
+ this.secureSocketProtocol = new ArrayList<>();
}
return this.secureSocketProtocol;
}
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.