This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b34731b5ffc1a6e4ea65898683c7d6f5d28897b8
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jun 28 08:46:35 2019 +0200
Fixed java9+ deprecation warning
---
.../org/apache/camel/impl/engine/AbstractCamelContext.java | 4 ++--
.../org/apache/camel/impl/engine/DefaultFactoryFinder.java | 5 ++---
.../apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java | 2 +-
.../main/java/org/apache/camel/core/osgi/impl/Activator.java | 2 +-
.../org/apache/camel/builder/FlexibleAggregationStrategy.java | 2 +-
.../src/test/java/org/apache/camel/builder/xml/XPathTest.java | 2 +-
.../java/org/apache/camel/converter/jaxp/XmlConverter.java | 2 +-
.../apache/camel/support/builder/xml/XMLConverterHelper.java | 2 +-
.../support/processor/validation/ValidatingProcessor.java | 2 +-
.../main/java/org/apache/camel/support/LRUCacheFactory.java | 2 +-
.../src/main/java/org/apache/camel/support/ObjectHelper.java | 10 ++++------
11 files changed, 16 insertions(+), 19 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 7519bcd..6d5b5c7 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -3350,8 +3350,8 @@ public abstract class AbstractCamelContext extends
ServiceSupport implements Ext
try {
Class<?> type =
getFactoryFinder(DefaultComponentResolver.RESOURCE_PATH).findClass("properties");
if (type != null) {
- log.info("No existing PropertiesComponent has been
configured, creating a new default PropertiesComponent with name: properties");
- comp = type.newInstance();
+ log.debug("No existing PropertiesComponent has been
configured, creating a new default PropertiesComponent with name: properties");
+ comp = type.getDeclaredConstructor().newInstance();
globalOptions.put(PropertiesComponent.DEFAULT_CREATED,
"true");
}
} catch (Exception e) {
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java
index 68df342..d604cfa 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java
@@ -94,10 +94,9 @@ public class DefaultFactoryFinder implements FactoryFinder {
return findClass(key, propertyPrefix);
}
- private Object newInstance(String key, String propertyPrefix) throws
IllegalAccessException,
- InstantiationException, IOException, ClassNotFoundException {
+ private Object newInstance(String key, String propertyPrefix) throws
Exception {
Class<?> clazz = findClass(key, propertyPrefix);
- return clazz.newInstance();
+ return clazz.getDeclaredConstructor().newInstance();
}
private <T> T newInstance(String key, Injector injector, Class<T>
expectedType) throws IOException,
diff --git
a/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java
b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java
index b42967b..a327a88 100644
---
a/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java
+++
b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java
@@ -1090,7 +1090,7 @@ public abstract class AbstractCamelCatalog {
Class<?> clazz = null;
try {
clazz =
classLoader.loadClass("org.apache.camel.language.simple.SimpleLanguage");
- instance = clazz.newInstance();
+ instance = clazz.getDeclaredConstructor().newInstance();
} catch (Exception e) {
// ignore
}
diff --git
a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
index 25f809e..936e356 100644
---
a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
+++
b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
@@ -250,7 +250,7 @@ public class Activator implements BundleActivator,
BundleTrackerCustomizer<Objec
Class<?> clazz = bundle.loadClass(pkg);
BundleTypeConverterLoader
bundleTypeConverterLoader =
new BundleTypeConverterLoader(bundle, url3 !=
null);
-
bundleTypeConverterLoader.setTypeConverterLoader((TypeConverterLoader)clazz.newInstance());
+
bundleTypeConverterLoader.setTypeConverterLoader((TypeConverterLoader)clazz.getDeclaredConstructor().newInstance());
resolvers.add(bundleTypeConverterLoader);
BundleTypeConverterLoader
fallBackBundleTypeConverterLoader =
new BundleTypeConverterLoader(bundle, url3 !=
null);
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
b/core/camel-core/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
index 33973b4..be8ee06 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
@@ -265,7 +265,7 @@ public class FlexibleAggregationStrategy<E> implements
AggregationStrategy {
try {
if (oldValue == null ||
oldExchange.getProperty(Exchange.AGGREGATED_COLLECTION_GUARD, Boolean.class) ==
null) {
try {
- collection = collectionType.newInstance();
+ collection =
collectionType.getDeclaredConstructor().newInstance();
} catch (Exception e) {
LOG.warn("Could not instantiate collection of type {}.
Aborting aggregation.", collectionType);
throw
CamelExecutionException.wrapCamelExecutionException(oldExchange, e);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
index b9c73d6..e8d5a18 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
@@ -300,7 +300,7 @@ public class XPathTest extends ContextTestSupport {
// we may not have Xalan on the classpath
try {
- instance =
Class.forName("org.apache.xalan.extensions.XPathFunctionResolverImpl").newInstance();
+ instance =
Class.forName("org.apache.xalan.extensions.XPathFunctionResolverImpl").getDeclaredConstructor().newInstance();
} catch (Throwable e) {
log.debug("Could not find Xalan on the classpath so ignoring this
test case: " + e);
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
b/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index ce70472..155e066 100644
---
a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++
b/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -913,7 +913,7 @@ public class XmlConverter {
try {
Class<?> smClass =
ObjectHelper.loadClass("org.apache.xerces.util.SecurityManager");
if (smClass != null) {
- Object sm = smClass.newInstance();
+ Object sm = smClass.getDeclaredConstructor().newInstance();
// Here we just use the default setting of the SeurityManager
factory.setAttribute("http://apache.org/xml/properties/security-manager";, sm);
}
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
b/core/camel-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
index a230f42..8489e41 100644
---
a/core/camel-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
+++
b/core/camel-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
@@ -136,7 +136,7 @@ public class XMLConverterHelper {
try {
Class<?> smClass =
ObjectHelper.loadClass("org.apache.xerces.util.SecurityManager");
if (smClass != null) {
- Object sm = smClass.newInstance();
+ Object sm = smClass.getDeclaredConstructor().newInstance();
// Here we just use the default setting of the SeurityManager
factory.setAttribute("http://apache.org/xml/properties/security-manager";, sm);
}
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatingProcessor.java
b/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatingProcessor.java
index 97d20fc..f235af2 100644
---
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatingProcessor.java
+++
b/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatingProcessor.java
@@ -155,7 +155,7 @@ public class ValidatingProcessor extends
AsyncProcessorSupport {
// must be a local instance to avoid problems with concurrency
// (to be
// thread safe)
- ValidatorErrorHandler handler =
errorHandler.getClass().newInstance();
+ ValidatorErrorHandler handler =
errorHandler.getClass().getDeclaredConstructor().newInstance();
validator.setErrorHandler(handler);
try {
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/LRUCacheFactory.java
b/core/camel-support/src/main/java/org/apache/camel/support/LRUCacheFactory.java
index 92727a4..58d7d48 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/LRUCacheFactory.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/LRUCacheFactory.java
@@ -56,7 +56,7 @@ public abstract class LRUCacheFactory {
}
String clazzName = props.getProperty("class");
Class<?> clazz = classLoader.loadClass(clazzName);
- Object factory = clazz.newInstance();
+ Object factory = clazz.getDeclaredConstructor().newInstance();
return (LRUCacheFactory) factory;
}
} catch (Throwable t) {
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
index db2061d..195b1c7 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
@@ -210,8 +210,8 @@ public final class ObjectHelper {
*/
public static <T> T newInstance(Class<T> type) {
try {
- return type.newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
+ return type.getDeclaredConstructor().newInstance();
+ } catch (Exception e) {
throw new RuntimeCamelException(e);
}
}
@@ -222,11 +222,9 @@ public final class ObjectHelper {
*/
public static <T> T newInstance(Class<?> actualType, Class<T>
expectedType) {
try {
- Object value = actualType.newInstance();
+ Object value = actualType.getDeclaredConstructor().newInstance();
return org.apache.camel.util.ObjectHelper.cast(expectedType,
value);
- } catch (InstantiationException e) {
- throw new RuntimeCamelException(e);
- } catch (IllegalAccessException e) {
+ } catch (Exception e) {
throw new RuntimeCamelException(e);
}
}
