This is an automated email from the ASF dual-hosted git repository. acosentino 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 4738fe3 Fixed CS for camel-core 4738fe3 is described below commit 4738fe3bcec404b1da532adbabb568e2d80ea745 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Mon Apr 29 08:52:45 2019 +0200 Fixed CS for camel-core --- .../apache/camel/impl/AbstractCamelContext.java | 56 +++++++++++----------- .../camel/impl/BeanProcessorFactoryResolver.java | 8 ++-- .../camel/impl/BeanProxyFactoryResolver.java | 8 ++-- .../language/simple/types/BinaryOperatorType.java | 2 + 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java b/core/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java index 6d0787f..85da686 100644 --- a/core/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java +++ b/core/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java @@ -16,6 +16,34 @@ */ package org.apache.camel.impl; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.TreeMap; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; +import java.util.function.Supplier; + import org.apache.camel.AsyncProcessor; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; @@ -130,34 +158,6 @@ import org.apache.camel.util.URISupport; import org.apache.camel.util.function.ThrowingRunnable; import org.slf4j.MDC; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.TreeMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Function; -import java.util.function.Supplier; - import static org.apache.camel.spi.UnitOfWork.MDC_CAMEL_CONTEXT_ID; /** diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/BeanProcessorFactoryResolver.java b/core/camel-core/src/main/java/org/apache/camel/impl/BeanProcessorFactoryResolver.java index 94a9d41..dfe9ca1 100644 --- a/core/camel-core/src/main/java/org/apache/camel/impl/BeanProcessorFactoryResolver.java +++ b/core/camel-core/src/main/java/org/apache/camel/impl/BeanProcessorFactoryResolver.java @@ -1,13 +1,13 @@ -/** +/* * 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 - * <p> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p> + * + * 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. diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/BeanProxyFactoryResolver.java b/core/camel-core/src/main/java/org/apache/camel/impl/BeanProxyFactoryResolver.java index de002e1..851b607 100644 --- a/core/camel-core/src/main/java/org/apache/camel/impl/BeanProxyFactoryResolver.java +++ b/core/camel-core/src/main/java/org/apache/camel/impl/BeanProxyFactoryResolver.java @@ -1,13 +1,13 @@ -/** +/* * 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 - * <p> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p> + * + * 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. diff --git a/core/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java index 100ee94..a0da218 100644 --- a/core/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java +++ b/core/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java @@ -25,6 +25,7 @@ public enum BinaryOperatorType { CONTAINS, NOT_CONTAINS, CONTAINS_IGNORECASE, NOT_CONTAINS_IGNORECASE, REGEX, NOT_REGEX, IN, NOT_IN, IS, NOT_IS, RANGE, NOT_RANGE, STARTS_WITH, ENDS_WITH; + //CHECKSTYLE:OFF public static BinaryOperatorType asOperator(String text) { if ("==".equals(text)) { return EQ; @@ -220,6 +221,7 @@ public enum BinaryOperatorType { } return null; } + //CHECKSTYLE:ON @Override public String toString() {