You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2018/10/12 11:26:13 UTC
[camel] 09/44: [CAMEL-12818] Remove deprecated stuff
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5e01e2f2a6fabce9c3e08590b393d03651808173
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Sep 10 10:44:48 2018 +0200
[CAMEL-12818] Remove deprecated stuff
---
.../camel/component/disruptor/DisruptorMultipleConsumersTest.java | 2 +-
.../jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java | 1 +
.../jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java | 1 +
.../camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java | 1 +
.../java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java | 1 +
.../java/org/apache/camel/component/printer/PrinterComponent.java | 1 +
.../java/org/apache/camel/spring/boot/model/RouteDetailsInfo.java | 1 +
.../main/java/org/apache/camel/catalog/AbstractCamelCatalog.java | 7 +++++--
.../apache/camel/karaf/commands/internal/CamelControllerImpl.java | 1 +
9 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
index 1fd9c24..53f217d 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorMultipleConsumersTest.java
@@ -67,7 +67,7 @@ public class DisruptorMultipleConsumersTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
resetMocks();
- context.getRouteController().suspendRoute("testRoute");
+ context.getRouteController().resumeRoute("testRoute");
getMockEndpoint("mock:a").expectedMessageCount(20);
getMockEndpoint("mock:b").expectedMessageCount(20);
getMockEndpoint("mock:c").expectedMessageCount(0);
diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java
index 90534fb..f9de30a 100644
--- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java
+++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.jmx;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.management.ManagedCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java
index 764004c..2449ef7 100644
--- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java
+++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.jmx;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.management.ManagedCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java
index f42da21..b922d73 100644
--- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java
+++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.jmx;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.management.ManagedCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java
index 5e729df..252c86d 100644
--- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java
+++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.jmx;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.management.ManagedCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterComponent.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterComponent.java
index 3a5f75b..7e6a9d3 100644
--- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterComponent.java
+++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterComponent.java
@@ -25,6 +25,7 @@ import org.apache.camel.impl.DefaultComponent;
public class PrinterComponent extends DefaultComponent {
public PrinterComponent() {
+
}
@Override
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetailsInfo.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetailsInfo.java
index 4bff3e3..9f668c0 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetailsInfo.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetailsInfo.java
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.camel.CamelContext;
import org.apache.camel.Route;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
+import org.apache.camel.management.ManagedCamelContext;
/**
* Container for exposing {@link org.apache.camel.Route} information
diff --git a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java
index 327b943..8426ac6 100644
--- a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java
+++ b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/AbstractCamelCatalog.java
@@ -1074,6 +1074,7 @@ public abstract class AbstractCamelCatalog {
return tokens.toArray(new String[tokens.size()]);
}
+<<<<<<< HEAD
private LanguageValidationResult doValidateSimple(ClassLoader classLoader, String simple, boolean predicate) {
if (classLoader == null) {
classLoader = getClass().getClassLoader();
@@ -1164,6 +1165,8 @@ public abstract class AbstractCamelCatalog {
return answer;
}
+=======
+>>>>>>> 79866dfb308... [CAMEL-12818] Remove deprecated stuff
public LanguageValidationResult validateLanguagePredicate(ClassLoader classLoader, String language, String text) {
if ("simple".equals(language)) {
return doValidateSimple(classLoader, text, true);
@@ -1207,10 +1210,10 @@ public abstract class AbstractCamelCatalog {
}
Object instance = null;
- Class clazz = null;
+ Class<?> clazz = null;
try {
clazz = classLoader.loadClass(className);
- instance = clazz.newInstance();
+ instance = clazz.getDeclaredConstructor().newInstance();
} catch (Exception e) {
// ignore
}
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java
index cfd311a..adf0f81 100644
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java
+++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java
@@ -25,6 +25,7 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.commands.AbstractLocalCamelController;
+import org.apache.camel.management.ManagedCamelContext;
import org.apache.karaf.shell.api.action.lifecycle.Reference;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;