This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 05b727d16a2 (chores) core: use final when possible 05b727d16a2 is described below commit 05b727d16a2a5be2f63c19a5c92bd53bc79c7fec Author: Otavio R. Piske <angusyo...@gmail.com> AuthorDate: Sun Jul 23 11:19:25 2023 +0200 (chores) core: use final when possible Signed-off-by: Otavio R. Piske <angusyo...@gmail.com> --- .../org/apache/camel/builder/FlexibleAggregationStrategy.java | 4 ++-- .../main/java/org/apache/camel/processor/MulticastProcessor.java | 2 +- .../src/main/java/org/apache/camel/processor/SendProcessor.java | 2 +- .../src/main/java/org/apache/camel/processor/Throttler.java | 2 +- .../org/apache/camel/processor/aggregate/AggregateProcessor.java | 2 +- .../main/java/org/apache/camel/processor/saga/SagaProcessor.java | 6 +++--- .../apache/camel/core/xml/AbstractCamelContextFactoryBean.java | 4 ++-- .../src/main/java/org/apache/camel/main/BaseMainSupport.java | 4 ++-- .../java/org/apache/camel/management/mbean/ManagedProcessor.java | 2 +- core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java | 4 ++-- .../src/main/java/org/apache/camel/xml/io/util/XmlStreamInfo.java | 6 +++--- .../apache/camel/converter/jaxp/XMLStreamReaderInputStream.java | 8 ++++---- .../org/apache/camel/converter/jaxp/XMLStreamReaderReader.java | 6 +++--- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java index c735257f7ec..40d357682cf 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java @@ -334,7 +334,7 @@ public class FlexibleAggregationStrategy<E> implements AggregationStrategy { } private class PropertyInjector extends FlexibleAggregationStrategyInjector { - private String propertyName; + private final String propertyName; PropertyInjector(Class<E> type, String propertyName) { super(type); @@ -376,7 +376,7 @@ public class FlexibleAggregationStrategy<E> implements AggregationStrategy { } private class HeaderInjector extends FlexibleAggregationStrategyInjector { - private String headerName; + private final String headerName; HeaderInjector(Class<E> type, String headerName) { super(type); diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java index 954511a28e8..e86b46591ab 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java @@ -157,7 +157,7 @@ public class MulticastProcessor extends AsyncProcessorSupport private Processor errorHandler; private String id; private String routeId; - private Collection<Processor> processors; + private final Collection<Processor> processors; private final AggregationStrategy aggregationStrategy; private final boolean parallelProcessing; private boolean synchronous; diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java index 63c2c338720..9992afff914 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java @@ -55,7 +55,7 @@ public class SendProcessor extends AsyncProcessorSupport implements Traceable, E protected final ExchangePattern pattern; protected ProducerCache producerCache; protected AsyncProducer producer; - protected Endpoint destination; + protected final Endpoint destination; protected ExchangePattern destinationExchangePattern; protected String id; protected String routeId; diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Throttler.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Throttler.java index 2a77afa9d9f..a70cb7419a2 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Throttler.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Throttler.java @@ -84,7 +84,7 @@ public class Throttler extends AsyncProcessorSupport implements Traceable, IdAwa private boolean asyncDelayed; private boolean callerRunsWhenRejected = true; private Expression correlationExpression; - private Map<String, ThrottlingState> states = new ConcurrentHashMap<>(); + private final Map<String, ThrottlingState> states = new ConcurrentHashMap<>(); public Throttler(final CamelContext camelContext, final Expression maxRequestsPerPeriodExpression, final long timePeriodMillis, diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java index 39c3f85d872..8aad9ec5518 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java @@ -239,7 +239,7 @@ public class AggregateProcessor extends AsyncProcessorSupport private Expression completionSizeExpression; private boolean completionFromBatchConsumer; private boolean completionOnNewCorrelationGroup; - private AtomicInteger batchConsumerCounter = new AtomicInteger(); + private final AtomicInteger batchConsumerCounter = new AtomicInteger(); private boolean discardOnCompletionTimeout; private boolean discardOnAggregationFailure; private boolean forceCompletionOnStop; diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java index 2e0354de516..73f17d35173 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java @@ -36,11 +36,11 @@ import org.apache.camel.util.ObjectHelper; */ public abstract class SagaProcessor extends DelegateAsyncProcessor implements Traceable, IdAware, RouteIdAware { - protected CamelSagaService sagaService; + protected final CamelSagaService sagaService; - protected CamelSagaStep step; + protected final CamelSagaStep step; - protected SagaCompletionMode completionMode; + protected final SagaCompletionMode completionMode; private String id; private String routeId; diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java index 16efac70f54..9bc0441cd5f 100644 --- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java +++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java @@ -160,9 +160,9 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex private static final Logger LOG = LoggerFactory.getLogger(AbstractCamelContextFactoryBean.class); @XmlTransient - private List<RoutesBuilder> builders = new ArrayList<>(); + private final List<RoutesBuilder> builders = new ArrayList<>(); @XmlTransient - private ClassLoader contextClassLoaderOnStart; + private final ClassLoader contextClassLoaderOnStart; @XmlTransient private final AtomicBoolean routesSetupDone = new AtomicBoolean(); diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java index 4e215c46c54..fcbcf217487 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java @@ -100,8 +100,8 @@ public abstract class BaseMainSupport extends BaseService { protected final List<MainListener> listeners = new ArrayList<>(); protected volatile CamelContext camelContext; - protected MainConfigurationProperties mainConfigurationProperties = new MainConfigurationProperties(); - protected OrderedLocationProperties wildcardProperties = new OrderedLocationProperties(); + protected final MainConfigurationProperties mainConfigurationProperties = new MainConfigurationProperties(); + protected final OrderedLocationProperties wildcardProperties = new OrderedLocationProperties(); protected RoutesCollector routesCollector = new DefaultRoutesCollector(); protected String propertyPlaceholderLocations; protected String defaultPropertyPlaceholderLocation = MainConstants.DEFAULT_PROPERTY_PLACEHOLDER_LOCATION; diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java index 3143214dd6d..f88f7cde86f 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java @@ -42,7 +42,7 @@ public class ManagedProcessor extends ManagedPerformanceCounter implements Manag private final ProcessorDefinition<?> definition; private final String id; private final int nodeLevel; - private String stepId; + private final String stepId; private Route route; private String sourceLocation; diff --git a/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java b/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java index 356027a66de..e8d24b9f5d3 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java @@ -43,7 +43,7 @@ public final class FileUtil { */ private static final String USER_DIR_KEY = "user.dir"; private static final File USER_DIR = new File(System.getProperty(USER_DIR_KEY)); - private static boolean windowsOs = initWindowsOs(); + private static final boolean IS_WINDOWS = initWindowsOs(); private FileUtil() { // Utils method @@ -80,7 +80,7 @@ public final class FileUtil { * Returns true, if the OS is windows */ public static boolean isWindows() { - return windowsOs; + return IS_WINDOWS; } public static File createTempFile(String prefix, String suffix, File parentDir) throws IOException { diff --git a/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamInfo.java b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamInfo.java index 0c2c9159295..dc6814fdd44 100644 --- a/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamInfo.java +++ b/core/camel-xml-io-util/src/main/java/org/apache/camel/xml/io/util/XmlStreamInfo.java @@ -37,18 +37,18 @@ public class XmlStreamInfo { String rootElementNamespace; /** Prefix to namespace mapping. default prefix is available as empty String (and not as null) */ - Map<String, String> namespaceMapping = new HashMap<>(); + final Map<String, String> namespaceMapping = new HashMap<>(); /** * Attributes of the root element. Keys are full qualified names of the attributes and each attribute may be * available as two keys: {@code prefix:localName} or {@code {namespaceURI}localName} */ - Map<String, String> attributes = new HashMap<>(); + final Map<String, String> attributes = new HashMap<>(); /** * Trimmed and unparsed lines starting with Camel-recognized modeline markers (now: {@code camel-k:}). */ - List<String> modelines = new ArrayList<>(); + final List<String> modelines = new ArrayList<>(); public boolean isValid() { return problem == null; diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java index f983005594e..ca211be4517 100644 --- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java +++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java @@ -32,11 +32,11 @@ import javax.xml.stream.XMLStreamWriter; */ class XMLStreamReaderInputStream extends InputStream { private static final int BUFFER_SIZE = 4096; - private XMLStreamReader reader; + private final XMLStreamReader reader; private XMLStreamWriter writer; - private TrimmableByteArrayOutputStream chunk; - private byte[] buffer; - private String charset; + private final TrimmableByteArrayOutputStream chunk; + private final byte[] buffer; + private final String charset; private int bpos; XMLStreamReaderInputStream(XMLStreamReader reader, String charset, XMLOutputFactory outfactory) { diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java index f496fcf2bb7..78691045d11 100644 --- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java +++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java @@ -32,10 +32,10 @@ import javax.xml.stream.XMLStreamWriter; */ class XMLStreamReaderReader extends Reader { private static final int BUFFER_SIZE = 4096; - private XMLStreamReader reader; + private final XMLStreamReader reader; private XMLStreamWriter writer; - private TrimmableCharArrayWriter chunk; - private char[] buffer; + private final TrimmableCharArrayWriter chunk; + private final char[] buffer; private int bpos; XMLStreamReaderReader(XMLStreamReader reader, XMLOutputFactory outfactory) {