[camel] branch main updated: CAMEL-17549: log component - Add option to have it use source location:line as logger name

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus 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 eb7195b  CAMEL-17549: log component - Add option to have it use source 
location:line as logger name
eb7195b is described below

commit eb7195b64659eb2daf560b7eb6ba4f67c42d524e
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Jan 25 15:02:10 2022 +0100

    CAMEL-17549: log component - Add option to have it use source location:line 
as logger name
---
 .../apache/camel/processor/DefaultProcessorFactory.java    | 13 ++-----------
 .../main/java/org/apache/camel/reifier/ProcessReifier.java |  7 +------
 .../org/apache/camel/support/TypedProcessorFactory.java    | 14 ++------------
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git 
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultProcessorFactory.java
 
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultProcessorFactory.java
index da2687a..227c39a 100644
--- 
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultProcessorFactory.java
+++ 
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultProcessorFactory.java
@@ -74,11 +74,7 @@ public class DefaultProcessorFactory implements 
ProcessorFactory, BootstrapClose
             if (object instanceof ProcessorFactory) {
                 ProcessorFactory pc = (ProcessorFactory) object;
                 Processor processor = pc.createChildProcessor(route, 
definition, mandatory);
-                if (processor instanceof LineNumberAware) {
-                    LineNumberAware lna = (LineNumberAware) processor;
-                    lna.setLineNumber(definition.getLineNumber());
-                    lna.setLocation(definition.getLocation());
-                }
+                LineNumberAware.trySetLineNumberAware(processor, definition);
                 return processor;
             }
         } catch (NoFactoryAvailableException e) {
@@ -98,14 +94,9 @@ public class DefaultProcessorFactory implements 
ProcessorFactory, BootstrapClose
         ProcessorFactory pc = finder.newInstance(name, 
ProcessorFactory.class).orElse(null);
         if (pc != null) {
             Processor processor = pc.createProcessor(route, definition);
-            if (processor instanceof LineNumberAware) {
-                LineNumberAware lna = (LineNumberAware) processor;
-                lna.setLineNumber(definition.getLineNumber());
-                lna.setLocation(definition.getLocation());
-            }
+            LineNumberAware.trySetLineNumberAware(processor, definition);
             return processor;
         }
-
         return null;
     }
 
diff --git 
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessReifier.java
 
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessReifier.java
index 94aa2bf..edea137 100644
--- 
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessReifier.java
+++ 
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessReifier.java
@@ -40,12 +40,7 @@ public class ProcessReifier extends 
ProcessorReifier<ProcessDefinition> {
             ObjectHelper.notNull(definition.getRef(), "ref", definition);
             answer = mandatoryLookup(definition.getRef(), Processor.class);
         }
-
-        if (answer instanceof LineNumberAware) {
-            LineNumberAware lna = (LineNumberAware) answer;
-            lna.setLineNumber(definition.getLineNumber());
-            lna.setLocation(definition.getLocation());
-        }
+        LineNumberAware.trySetLineNumberAware(answer, definition);
 
         // ensure its wrapped in a Service so we can manage it from eg. JMX
         // (a Processor must be a Service to be enlisted in JMX)
diff --git 
a/core/camel-support/src/main/java/org/apache/camel/support/TypedProcessorFactory.java
 
b/core/camel-support/src/main/java/org/apache/camel/support/TypedProcessorFactory.java
index 765940d..2bfe23b 100644
--- 
a/core/camel-support/src/main/java/org/apache/camel/support/TypedProcessorFactory.java
+++ 
b/core/camel-support/src/main/java/org/apache/camel/support/TypedProcessorFactory.java
@@ -34,14 +34,9 @@ public class TypedProcessorFactory<T extends NamedNode> 
implements ProcessorFact
     public Processor createChildProcessor(Route route, NamedNode definition, 
boolean mandatory) throws Exception {
         if (type.isInstance(definition)) {
             Processor processor = doCreateChildProcessor(route, 
type.cast(definition), mandatory);
-            if (processor instanceof LineNumberAware) {
-                LineNumberAware lna = (LineNumberAware) processor;
-                lna.setLineNumber(definition.getLineNumber());
-                lna.setLocation(definition.getLocation());
-            }
+            LineNumberAware.trySetLineNumberAware(processor, definition);
             return processor;
         }
-
         return null;
     }
 
@@ -49,14 +44,9 @@ public class TypedProcessorFactory<T extends NamedNode> 
implements ProcessorFact
     public Processor createProcessor(Route route, NamedNode definition) throws 
Exception {
         if (type.isInstance(definition)) {
             Processor processor = doCreateProcessor(route, 
type.cast(definition));
-            if (processor instanceof LineNumberAware) {
-                LineNumberAware lna = (LineNumberAware) processor;
-                lna.setLineNumber(definition.getLineNumber());
-                lna.setLocation(definition.getLocation());
-            }
+            LineNumberAware.trySetLineNumberAware(processor, definition);
             return processor;
         }
-
         return null;
     }