You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/12/09 06:47:21 UTC
[camel] branch master updated: Camel-base: Remove dead code (#3390)
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
The following commit(s) were added to refs/heads/master by this push:
new b3f1e7a Camel-base: Remove dead code (#3390)
b3f1e7a is described below
commit b3f1e7ae101bf5d456080dfd0ec96a96425737ee
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Mon Dec 9 07:47:10 2019 +0100
Camel-base: Remove dead code (#3390)
---
.../converter/InstanceMethodTypeConverter.java | 2 --
.../camel/impl/engine/AbstractDynamicRegistry.java | 1 -
.../camel/impl/engine/DefaultEndpointRegistry.java | 2 --
.../camel/impl/engine/DefaultUnitOfWork.java | 3 --
.../impl/engine/SupervisingRouteController.java | 28 ----------------
.../java/org/apache/camel/processor/Throttler.java | 4 ---
.../runtimecatalog/impl/AbstractCamelCatalog.java | 37 ----------------------
7 files changed, 77 deletions(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
index 9be42d2..206b1c7 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
@@ -33,14 +33,12 @@ public class InstanceMethodTypeConverter extends TypeConverterSupport {
private final CachingInjector<?> injector;
private final Method method;
private final boolean useExchange;
- private final TypeConverterRegistry registry;
private final boolean allowNull;
public InstanceMethodTypeConverter(CachingInjector<?> injector, Method method, TypeConverterRegistry registry, boolean allowNull) {
this.injector = injector;
this.method = method;
this.useExchange = method.getParameterCount() == 2;
- this.registry = registry;
this.allowNull = allowNull;
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
index e3bf709..36b0b90 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
@@ -37,7 +37,6 @@ import org.apache.camel.support.service.ServiceHelper;
*/
public class AbstractDynamicRegistry<K, V> extends AbstractMap<K, V> implements StaticService {
- private static final long serialVersionUID = 1L;
protected final CamelContext context;
protected final int maxCacheSize;
protected final Map<K, V> dynamicMap;
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java
index 8fd62a1..3157eb2 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultEndpointRegistry.java
@@ -28,8 +28,6 @@ import org.apache.camel.support.CamelContextHelper;
*/
public class DefaultEndpointRegistry extends AbstractDynamicRegistry<EndpointKey, Endpoint> implements EndpointRegistry<EndpointKey> {
- private static final long serialVersionUID = 1L;
-
public DefaultEndpointRegistry(CamelContext context) {
super(context, CamelContextHelper.getMaximumEndpointCacheSize(context));
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
index 93fac7a..04e41f2 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
@@ -57,7 +57,6 @@ public class DefaultUnitOfWork implements UnitOfWork, Service {
// SubUnitOfWork into a general parent/child unit of work concept. However this
// requires API changes and thus is best kept for Camel 3.0
- private UnitOfWork parent;
private String id;
private CamelContext context;
private List<Synchronization> synchronizations;
@@ -140,7 +139,6 @@ public class DefaultUnitOfWork implements UnitOfWork, Service {
@Override
public void setParentUnitOfWork(UnitOfWork parentUnitOfWork) {
- this.parent = parentUnitOfWork;
}
@Override
@@ -167,7 +165,6 @@ public class DefaultUnitOfWork implements UnitOfWork, Service {
}
routeContextStack.clear();
originalInMessage = null;
- parent = null;
id = null;
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/SupervisingRouteController.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/SupervisingRouteController.java
index 105313a..3867836 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/SupervisingRouteController.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/SupervisingRouteController.java
@@ -405,29 +405,6 @@ public class SupervisingRouteController extends DefaultRouteController {
);
}
- private synchronized void stopRoutes() {
- if (!isRunAllowed()) {
- return;
- }
-
- final List<String> routeList;
-
- synchronized (lock) {
- routeList = routes.stream()
- .filter(r -> r.getStatus() == ServiceStatus.Started)
- .map(RouteHolder::getId)
- .collect(Collectors.toList());
- }
-
- for (String route: routeList) {
- try {
- stopRoute(route);
- } catch (Exception e) {
- // ignored, exception handled by stopRoute
- }
- }
- }
-
// *********************************
// RouteChecker
// *********************************
@@ -498,11 +475,6 @@ public class SupervisingRouteController extends DefaultRouteController {
return task != null;
}
- void clear() {
- routes.values().forEach(BackOffTimer.Task::cancel);
- routes.clear();
- }
-
public Optional<BackOffTimer.Task> getBackOffContext(String id) {
return routes.entrySet().stream()
.filter(e -> ObjectHelper.equal(e.getKey().getId(), id))
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java b/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java
index 6988f77..0c68d8e 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java
@@ -243,10 +243,6 @@ public class Throttler extends AsyncProcessorSupport implements Traceable, IdAwa
this.key = key;
}
- public String getKey() {
- return key;
- }
-
public int getThrottleRate() {
return throttleRate;
}
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 a327a88..fe32e5b 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
@@ -22,7 +22,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
@@ -841,42 +840,6 @@ public abstract class AbstractCamelCatalog {
return null;
}
- private String doAsEndpointUri(String scheme, String json, String ampersand, boolean encode) throws URISyntaxException {
- List<Map<String, String>> rows = parseJsonSchema("properties", json, true);
-
- Map<String, String> copy = new HashMap<>();
- for (Map<String, String> row : rows) {
- String name = row.get("name");
- String required = row.get("required");
- String value = row.get("value");
- String defaultValue = row.get("defaultValue");
-
- // only add if either required, or the value is != default value
- String valueToAdd = null;
- if ("true".equals(required)) {
- valueToAdd = value != null ? value : defaultValue;
- if (valueToAdd == null) {
- valueToAdd = "";
- }
- } else {
- // if we have a value and no default then add it
- if (value != null && defaultValue == null) {
- valueToAdd = value;
- }
- // otherwise only add if the value is != default value
- if (value != null && defaultValue != null && !value.equals(defaultValue)) {
- valueToAdd = value;
- }
- }
-
- if (valueToAdd != null) {
- copy.put(name, valueToAdd);
- }
- }
-
- return doAsEndpointUri(scheme, copy, ampersand, encode);
- }
-
public String asEndpointUri(String scheme, Map<String, String> properties, boolean encode) throws URISyntaxException {
return doAsEndpointUri(scheme, properties, "&", encode);
}