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 2019/01/11 22:09:17 UTC
[camel] 12/13: Remove deprecated constructors
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9e1b75e8c39190d81d7c4df65be7a7467dcb0be7
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 11 21:23:00 2019 +0100
Remove deprecated constructors
---
.../component/ignite/cache/IgniteCacheEndpoint.java | 8 --------
.../ignite/compute/IgniteComputeEndpoint.java | 7 -------
.../component/ignite/events/IgniteEventsEndpoint.java | 13 -------------
.../component/ignite/idgen/IgniteIdGenEndpoint.java | 10 ----------
.../ignite/messaging/IgniteMessagingEndpoint.java | 8 --------
.../component/ignite/queue/IgniteQueueEndpoint.java | 17 -----------------
.../camel/component/ignite/set/IgniteSetEndpoint.java | 18 ------------------
7 files changed, 81 deletions(-)
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java
index e096f43..854fb9d 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.ignite.cache;
-import java.net.URI;
import java.util.Map;
import javax.cache.Cache.Entry;
@@ -26,7 +25,6 @@ import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.ignite.AbstractIgniteEndpoint;
-import org.apache.camel.component.ignite.IgniteComponent;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
@@ -80,12 +78,6 @@ public class IgniteCacheEndpoint extends AbstractIgniteEndpoint {
@UriParam(label = "consumer", defaultValue = "0", defaultValueNote = "ContinuousQuery.DFLT_TIME_INTERVAL")
private long timeInterval = ContinuousQuery.DFLT_TIME_INTERVAL;
- @Deprecated
- public IgniteCacheEndpoint(String endpointUri, URI remainingUri, Map<String, Object> parameters, IgniteComponent igniteComponent) {
- super(endpointUri, igniteComponent);
- cacheName = remainingUri.getHost();
- }
-
public IgniteCacheEndpoint(String endpointUri, String remaining, Map<String, Object> parameters, IgniteCacheComponent igniteComponent) {
super(endpointUri, igniteComponent);
cacheName = remaining;
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
index c15f001..0bb5eb1 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.ignite.compute;
-import java.net.URI;
import java.util.Map;
import org.apache.camel.Consumer;
@@ -24,7 +23,6 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.ignite.AbstractIgniteEndpoint;
import org.apache.camel.component.ignite.ClusterGroupExpression;
-import org.apache.camel.component.ignite.IgniteComponent;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
@@ -60,11 +58,6 @@ public class IgniteComputeEndpoint extends AbstractIgniteEndpoint {
@UriParam(label = "producer")
private Long timeoutMillis;
- @Deprecated
- public IgniteComputeEndpoint(String uri, URI remainingUri, Map<String, Object> parameters, IgniteComponent igniteComponent) throws ClassNotFoundException {
- super(uri, igniteComponent);
- }
-
public IgniteComputeEndpoint(String uri, String remaining, Map<String, Object> parameters, IgniteComputeComponent igniteComponent) throws ClassNotFoundException {
super(uri, igniteComponent);
}
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsEndpoint.java
index db934b1..a91810f 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsEndpoint.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.ignite.events;
import java.lang.reflect.Field;
-import java.net.URI;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Map;
@@ -28,7 +27,6 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.ignite.AbstractIgniteEndpoint;
import org.apache.camel.component.ignite.ClusterGroupExpression;
-import org.apache.camel.component.ignite.IgniteComponent;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
@@ -57,17 +55,6 @@ public class IgniteEventsEndpoint extends AbstractIgniteEndpoint {
@UriParam(label = "consumer")
private ClusterGroupExpression clusterGroupExpression;
- @Deprecated
- public IgniteEventsEndpoint(String uri, URI remainingUri, Map<String, Object> parameters, IgniteComponent igniteComponent) {
- super(uri, igniteComponent);
-
- // Initialize subscribed event types with ALL.
- events = new HashSet<>();
- for (Integer eventType : EventType.EVTS_ALL) {
- events.add(eventType);
- }
- }
-
public IgniteEventsEndpoint(String uri, String remaining, Map<String, Object> parameters, IgniteEventsComponent igniteComponent) {
super(uri, igniteComponent);
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
index 75ceb94..5986ff6 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
@@ -16,14 +16,12 @@
*/
package org.apache.camel.component.ignite.idgen;
-import java.net.URI;
import java.util.Map;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.ignite.AbstractIgniteEndpoint;
-import org.apache.camel.component.ignite.IgniteComponent;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
@@ -52,14 +50,6 @@ public class IgniteIdGenEndpoint extends AbstractIgniteEndpoint {
@UriParam(label = "producer")
private IgniteIdGenOperation operation;
- @Deprecated
- public IgniteIdGenEndpoint(String endpointUri, URI remainingUri, Map<String, Object> parameters, IgniteComponent igniteComponent) throws Exception {
- super(endpointUri, igniteComponent);
- name = remainingUri.getHost();
-
- ObjectHelper.notNull(name, "ID Generator name");
- }
-
public IgniteIdGenEndpoint(String endpointUri, String remaining, Map<String, Object> parameters, IgniteIdGenComponent igniteComponent) throws Exception {
super(endpointUri, igniteComponent);
name = remaining;
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingEndpoint.java
index 2bb3a72..edb737d 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingEndpoint.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.ignite.messaging;
-import java.net.URI;
import java.util.Map;
import org.apache.camel.Consumer;
@@ -24,7 +23,6 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.ignite.AbstractIgniteEndpoint;
import org.apache.camel.component.ignite.ClusterGroupExpression;
-import org.apache.camel.component.ignite.IgniteComponent;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
@@ -54,12 +52,6 @@ public class IgniteMessagingEndpoint extends AbstractIgniteEndpoint {
@UriParam(label = "producer")
private Long timeout;
- @Deprecated
- public IgniteMessagingEndpoint(String endpointUri, URI remainingUri, Map<String, Object> parameters, IgniteComponent igniteComponent) {
- super(endpointUri, igniteComponent);
- topic = remainingUri.getHost();
- }
-
public IgniteMessagingEndpoint(String endpointUri, String remaining, Map<String, Object> parameters, IgniteMessagingComponent igniteComponent) {
super(endpointUri, igniteComponent);
topic = remaining;
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/queue/IgniteQueueEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/queue/IgniteQueueEndpoint.java
index 7ee18c9..cd447a4 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/queue/IgniteQueueEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/queue/IgniteQueueEndpoint.java
@@ -16,14 +16,12 @@
*/
package org.apache.camel.component.ignite.queue;
-import java.net.URI;
import java.util.Map;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.ignite.AbstractIgniteEndpoint;
-import org.apache.camel.component.ignite.IgniteComponent;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
@@ -57,21 +55,6 @@ public class IgniteQueueEndpoint extends AbstractIgniteEndpoint {
@UriParam(label = "producer")
private IgniteQueueOperation operation;
- @Deprecated
- public IgniteQueueEndpoint(String endpointUri, URI remainingUri, Map<String, Object> parameters, IgniteComponent igniteComponent) throws Exception {
- super(endpointUri, igniteComponent);
- name = remainingUri.getHost();
-
- ObjectHelper.notNull(name, "Queue name");
-
- // Set the configuration values.
- if (!parameters.containsKey("configuration")) {
- Map<String, Object> configProps = IntrospectionSupport.extractProperties(parameters, "config.");
- EndpointHelper.setReferenceProperties(this.getCamelContext(), configProps, parameters);
- EndpointHelper.setProperties(this.getCamelContext(), configProps, parameters);
- }
- }
-
public IgniteQueueEndpoint(String endpointUri, String remaining, Map<String, Object> parameters, IgniteQueueComponent igniteComponent) throws Exception {
super(endpointUri, igniteComponent);
name = remaining;
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/set/IgniteSetEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/set/IgniteSetEndpoint.java
index a0b4532..d5d60b5 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/set/IgniteSetEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/set/IgniteSetEndpoint.java
@@ -16,14 +16,12 @@
*/
package org.apache.camel.component.ignite.set;
-import java.net.URI;
import java.util.Map;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.ignite.AbstractIgniteEndpoint;
-import org.apache.camel.component.ignite.IgniteComponent;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
@@ -50,22 +48,6 @@ public class IgniteSetEndpoint extends AbstractIgniteEndpoint {
@UriParam(label = "producer")
private IgniteSetOperation operation;
- @Deprecated
- public IgniteSetEndpoint(String endpointUri, URI remainingUri, Map<String, Object> parameters, IgniteComponent igniteComponent) throws Exception {
- super(endpointUri, igniteComponent);
- name = remainingUri.getHost();
-
- ObjectHelper.notNull(name, "Set name");
-
- // Set the configuration values.
- if (!parameters.containsKey("configuration")) {
- Map<String, Object> configProps = IntrospectionSupport.extractProperties(parameters, "config.");
- EndpointHelper.setReferenceProperties(this.getCamelContext(), configProps, parameters);
- EndpointHelper.setProperties(this.getCamelContext(), configProps, parameters);
- }
-
- }
-
public IgniteSetEndpoint(String endpointUri, String remaining, Map<String, Object> parameters, IgniteSetComponent igniteComponent) throws Exception {
super(endpointUri, igniteComponent);
name = remaining;