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 2020/03/07 09:45:45 UTC
[camel] branch master updated: camel-core - optimize
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 9ba82f2 camel-core - optimize
9ba82f2 is described below
commit 9ba82f28bef3e12f72616728b78b2ad1ae47f029
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Mar 7 10:45:19 2020 +0100
camel-core - optimize
---
.../src/main/java/org/apache/camel/support/CamelContextHelper.java | 3 ---
.../src/main/java/org/apache/camel/support/DefaultComponent.java | 2 --
.../src/main/java/org/apache/camel/support/ExchangeHelper.java | 2 --
.../src/main/java/org/apache/camel/util/PropertiesHelper.java | 4 ----
4 files changed, 11 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
index 6bff0d3..39c9d6b 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
@@ -33,7 +33,6 @@ import org.apache.camel.spi.RouteStartupOrder;
import org.apache.camel.util.ObjectHelper;
import static org.apache.camel.util.ObjectHelper.isNotEmpty;
-import static org.apache.camel.util.ObjectHelper.notNull;
/**
* A number of helper methods
@@ -150,7 +149,6 @@ public final class CamelContextHelper {
* Converts the given value to the requested type
*/
public static <T> T convertTo(CamelContext context, Class<T> type, Object value) {
- notNull(context, "camelContext");
return context.getTypeConverter().convertTo(type, value);
}
@@ -158,7 +156,6 @@ public final class CamelContextHelper {
* Tried to convert the given value to the requested type
*/
public static <T> T tryConvertTo(CamelContext context, Class<T> type, Object value) {
- notNull(context, "camelContext");
return context.getTypeConverter().tryConvertTo(type, value);
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
index 348a42b..e8aba62 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
@@ -90,7 +90,6 @@ public abstract class DefaultComponent extends ServiceSupport implements Compone
@Override
public Endpoint createEndpoint(String uri, Map<String, Object> properties) throws Exception {
- ObjectHelper.notNull(getCamelContext(), "camelContext");
// need to encode before its safe to parse with java.net.Uri
String encodedUri = UnsafeUriCharactersEncoder.encode(uri);
URI u = new URI(encodedUri);
@@ -176,7 +175,6 @@ public abstract class DefaultComponent extends ServiceSupport implements Compone
@Override
public Endpoint createEndpoint(String uri) throws Exception {
- ObjectHelper.notNull(getCamelContext(), "camelContext");
// need to encode before its safe to parse with java.net.Uri
String encodedUri = UnsafeUriCharactersEncoder.encode(uri);
URI u = new URI(encodedUri);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
index 40a7ea4..b9ab1d6 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
@@ -215,7 +215,6 @@ public final class ExchangeHelper {
public static <T> T convertToMandatoryType(Exchange exchange, Class<T> type, Object value)
throws TypeConversionException, NoTypeConversionAvailableException {
CamelContext camelContext = exchange.getContext();
- ObjectHelper.notNull(camelContext, "CamelContext of Exchange");
TypeConverter converter = camelContext.getTypeConverter();
if (converter != null) {
return converter.mandatoryConvertTo(type, exchange, value);
@@ -231,7 +230,6 @@ public final class ExchangeHelper {
*/
public static <T> T convertToType(Exchange exchange, Class<T> type, Object value) throws TypeConversionException {
CamelContext camelContext = exchange.getContext();
- ObjectHelper.notNull(camelContext, "CamelContext of Exchange");
TypeConverter converter = camelContext.getTypeConverter();
if (converter != null) {
return converter.convertTo(type, exchange, value);
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/PropertiesHelper.java b/core/camel-util/src/main/java/org/apache/camel/util/PropertiesHelper.java
index aa0239e..db30dff 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/PropertiesHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/PropertiesHelper.java
@@ -30,8 +30,6 @@ public final class PropertiesHelper {
}
public static Map<String, Object> extractProperties(Map<String, Object> properties, String optionPrefix, boolean remove) {
- ObjectHelper.notNull(properties, "properties");
-
Map<String, Object> rc = new LinkedHashMap<>(properties.size());
for (Iterator<Map.Entry<String, Object>> it = properties.entrySet().iterator(); it.hasNext();) {
@@ -53,8 +51,6 @@ public final class PropertiesHelper {
@Deprecated
public static Map<String, String> extractStringProperties(Map<String, Object> properties) {
- ObjectHelper.notNull(properties, "properties");
-
Map<String, String> rc = new LinkedHashMap<>(properties.size());
for (Map.Entry<String, Object> entry : properties.entrySet()) {