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/02/16 15:55:37 UTC
[camel] 13/13: Fixed CS
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 056ef4ee67dfa0b0f263cce4ad7f9ea46f7d86fa
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Feb 16 16:26:04 2020 +0100
Fixed CS
---
.../apache/camel/spi/AnnotationScanTypeConverters.java | 16 ++++++++++++++++
.../camel/impl/converter/BaseTypeConverterRegistry.java | 6 +++---
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/AnnotationScanTypeConverters.java b/core/camel-api/src/main/java/org/apache/camel/spi/AnnotationScanTypeConverters.java
index 41dd5fa..2a8e785 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/AnnotationScanTypeConverters.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/AnnotationScanTypeConverters.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.spi;
/**
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
index 0fbff03..aec5b68 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
@@ -578,9 +578,9 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
// lets try classes derived from this toType
TypeConverter converter = typeMappings.getFirst(
- toType::isAssignableFrom,
- // skip Object based we do them last
- from -> !from.equals(Object.class) && from.isAssignableFrom(fromType));
+ toType::isAssignableFrom,
+ // skip Object based we do them last
+ from -> !from.equals(Object.class) && from.isAssignableFrom(fromType));
if (converter != null) {
return converter;
}