refactor: convert log calls to parameterized logging in DDK builder/generator/UI

Replace string concatenation and NLS.bind in log calls with
parameterized {} placeholders. Use Supplier/method-refs for lazy
argument evaluation. Add NOPMD suppressions for ITraceSet.trace()
and Supplier method-refs not recognized by PMD. Add
org.apache.logging.log4j.util to OSGi manifests.

Modules: xtext.builder, xtext.expression, xtext.generator,
xtext.ui, xtext.test.core

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: joaodinissf

com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF

@@ -16,4 +16,6 @@ Export-Package: com.avaloq.tools.ddk.xtext.builder,
  com.avaloq.tools.ddk.xtext.builder.resourceloader,
  com.avaloq.tools.ddk.xtext.builder.tracing,
  com.avaloq.tools.ddk.xtext.extensions
+Import-Package: org.apache.logging.log4j,
+ org.apache.logging.log4j.util
 Automatic-Module-Name: com.avaloq.tools.ddk.xtext.builder

com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/CachingStateBasedContainerManager.java

@@ -122,9 +122,7 @@ public void descriptionsChanged(final Event event) {
   public List<IContainer> getVisibleContainers(final IResourceDescription desc, final IResourceDescriptions resourceDescriptions) {
     String root = internalGetContainerHandle(desc, resourceDescriptions);
     if (root == null) {
-      if (LOGGER.isDebugEnabled()) {
-        LOGGER.debug("Cannot find IContainer for: " + desc.getURI()); //$NON-NLS-1$
-      }
+      LOGGER.debug("Cannot find IContainer for: {}", desc::getURI); //$NON-NLS-1$
       return Collections.emptyList();
     }
     List<String> handles = getState(resourceDescriptions).getVisibleContainerHandles(root);

com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/MonitoredClusteringBuilderState.java

@@ -132,7 +132,7 @@ public class MonitoredClusteringBuilderState extends ClusteringBuilderState
 
   private static final int COMMIT_WARN_WAIT_SEC = 30;
 
-  private static final String FAILED_TO_SAVE_BINARY = "Failed to save binary for "; //$NON-NLS-1$
+  private static final String FAILED_TO_SAVE_BINARY_LOG = "Failed to save binary for {}"; //$NON-NLS-1$
 
   /** Class-wide logger. */
   private static final Logger LOGGER = LogManager.getLogger(MonitoredClusteringBuilderState.class);
@@ -642,7 +642,7 @@ public boolean isCanceled() {
               final long memoryDelta = Runtime.getRuntime().freeMemory() - initialMemory;
               final int resourceSetSizeDelta = resourceSet.getResources().size() - initialResourceSetSize;
               final long timeDelta = System.nanoTime() - initialTime;
-              traceSet.trace(ResourceLinkingMemoryEvent.class, changedURI, memoryDelta, resourceSetSizeDelta, timeDelta);
+              traceSet.trace(ResourceLinkingMemoryEvent.class, changedURI, memoryDelta, resourceSetSizeDelta, timeDelta); // NOPMD GuardLogStatement - not a logger call
             }
             watchdog.reportWorkEnded(index, index + queue.size());
           }
@@ -727,9 +727,9 @@ protected void storeBinaryResource(final Resource resource, final BuildData buil
       } catch (RejectedExecutionException e) {
         String errorMessage = "Unable to submit a new task to store a binary resource."; //$NON-NLS-1$
         if (binaryStorageExecutor.isShutdown()) {
-          LOGGER.info(errorMessage + " The worker pool has shut down."); //$NON-NLS-1$
+          LOGGER.info("{} The worker pool has shut down.", errorMessage); //$NON-NLS-1$
         } else {
-          LOGGER.error(errorMessage + " Exception information: " + e.getMessage()); //$NON-NLS-1$
+          LOGGER.error("{} Exception information: {}", errorMessage, e.getMessage()); //$NON-NLS-1$
         }
       }
     }
@@ -751,12 +751,12 @@ protected void doStoreBinaryResource(final Resource resource, final BuildData bu
         LOGGER.info("saving binary taking longer than expected ({} ms): {}", elapsedMillis, resource.getURI()); //$NON-NLS-1$
       }
     } catch (WrappedException ex) {
-      LOGGER.error(FAILED_TO_SAVE_BINARY + resource.getURI(), ex.exception());
+      LOGGER.error(FAILED_TO_SAVE_BINARY_LOG, resource.getURI(), ex.exception());
 
       // CHECKSTYLE:OFF
     } catch (Throwable ex) {
       // CHECKSTYLE:ON
-      LOGGER.error(FAILED_TO_SAVE_BINARY + resource.getURI(), ex);
+      LOGGER.error(FAILED_TO_SAVE_BINARY_LOG, resource.getURI(), ex);
     }
   }
 
@@ -1205,7 +1205,7 @@ protected void flushChanges(final ResourceDescriptionsData newData) {
       }
       long flushTime = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - time);
       if (flushTime > COMMIT_WARN_WAIT_SEC) {
-        LOGGER.warn("Flushing of the database changes took " + flushTime + " seconds."); //$NON-NLS-1$//$NON-NLS-2$
+        LOGGER.warn("Flushing of the database changes took {} seconds.", flushTime); //$NON-NLS-1$
       }
     }
   }
@@ -1299,7 +1299,7 @@ protected void queueAffectedResources(final Set<URI> allRemainingURIs, final IRe
         // CHECKSTYLE:CHECK-OFF IllegalCatch - Failing here means the build fails completely
       } catch (Throwable t) {
         // CHECKSTYLE:CHECK-ON IllegalCatch
-        LOGGER.warn(manager.getClass().getSimpleName() + " failed to enqueue the affected resources", t); //$NON-NLS-1$
+        LOGGER.warn("{} failed to enqueue the affected resources", manager.getClass().getSimpleName(), t); //$NON-NLS-1$
       }
       progressMonitor.worked(1);
       if (allRemainingURIs.isEmpty()) {

com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/RebuildingXtextBuilder.java

@@ -161,10 +161,9 @@ protected IProject[] build(final int kind, final Map args, final IProgressMonito
   @Override
   protected void doBuild(final ToBeBuilt toBeBuilt, final IProgressMonitor monitor, final BuildType type) throws CoreException {
     if (!toBeBuilt.getToBeDeleted().isEmpty() || !toBeBuilt.getToBeUpdated().isEmpty()) {
-      if (LOGGER.isDebugEnabled()) {
-        LOGGER.debug("Starting " + type.name() + " build:" + "\ndeleted(" + toBeBuilt.getToBeDeleted().size() + ")=" + toBeBuilt.getToBeDeleted().toString()
-            + "\nupdated(" + toBeBuilt.getToBeUpdated().size() + ")=" + toBeBuilt.getToBeUpdated().toString());
-      }
+      LOGGER.debug("Starting {} build:\ndeleted({})={}\nupdated({})={}", type::name, // NOPMD GuardLogStatement - all args are Suppliers
+          toBeBuilt.getToBeDeleted()::size, toBeBuilt.getToBeDeleted()::toString,
+          toBeBuilt.getToBeUpdated()::size, toBeBuilt.getToBeUpdated()::toString);
 
       SubMonitor progress = SubMonitor.convert(monitor, 1 + 1 + 1); // build + participant + rebuild
 
@@ -194,11 +193,9 @@ protected void doBuild(final ToBeBuilt toBeBuilt, final IProgressMonitor monitor
       }
       resourceSet.getResources().clear();
       resourceSet.eAdapters().clear();
-      if (LOGGER.isDebugEnabled()) {
-        LOGGER.debug("Build done.");
-      }
-    } else if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("Ignoring empty " + type.name() + " build.");
+      LOGGER.debug("Build done.");
+    } else {
+      LOGGER.debug("Ignoring empty {} build.", type::name);
     }
   }
 }

com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/CompilationContext.java

@@ -223,7 +223,7 @@ public boolean isType(final String name) {
   public String javaType(final String name) {
     Type type = findType(name);
     if (type == null) {
-      LOGGER.warn("No type found for " + name);
+      LOGGER.warn("No type found for {}", name);
       return name;
     }
     return javaType(type);
@@ -320,7 +320,7 @@ public String getQualifiedTypeName(final String typeName) {
       }
       // CHECKSTYLE:OFF
     } catch (final Exception e) {
-      LOGGER.warn(NLS.bind("Could not determine qualified type name for {0}", typeName), e); //$NON-NLS-1$
+      LOGGER.warn("Could not determine qualified type name for {}", typeName, e); //$NON-NLS-1$
     }
     // CHECKSTYLE:ON
 
@@ -343,7 +343,7 @@ public EClass getEClass(final Type type) {
         // CHECKSTYLE:OFF
       } catch (Exception e) {
         // CHECKSTYLE:ON
-        LOGGER.error("Could not determine EClass for " + type, e);
+        LOGGER.error("Could not determine EClass for {}", type, e);
       }
     }
     return null;

com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/GenModelUtil2.java

@@ -127,7 +127,7 @@ public static GenModel findGenModel(final EModelElement eModelElement, final Res
       // CHECKSTYLE:CHECK-OFF IllegalCatch
     } catch (RuntimeException e) {
       // CHECKSTYLE:CHECK-ON IllegalCatch
-      LOGGER.error(NLS.bind("Exception in findGenModel ({0})", eModelElement), e); //$NON-NLS-1$
+      LOGGER.error("Exception in findGenModel ({})", eModelElement, e); //$NON-NLS-1$
     }
 
     return null;

com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF

@@ -35,5 +35,7 @@ Export-Package: com.avaloq.tools.ddk.xtext.generator.builder,
  com.avaloq.tools.ddk.xtext.generator.resourceFactory,
  com.avaloq.tools.ddk.xtext.generator.ide.contentAssist,
  com.avaloq.tools.ddk.xtext.generator.parser.common
+Import-Package: org.apache.logging.log4j,
+ org.apache.logging.log4j.util
 Eclipse-ExtensibleAPI: true
 Automatic-Module-Name: com.avaloq.tools.ddk.xtext.generator

com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/parser/antlr/KeywordAnalysisHelper.java

@@ -254,7 +254,7 @@ public void printViolations(final String srcGenPath) {
       }
       if (problemsReported) {
         LOGGER.error("REJECTED KEYWORDS BY ID RULES DETECTED.");
-        LOGGER.error("Read " + fileName + " !");
+        LOGGER.error("Read {} !", fileName);
         writer.println();
         writer.println("(!) Problems were detected: neither reserved words nor keywords, but rejected by identifier rules");
         writer.println("Use " + Path.fromPortableString(getReportFileName(srcGenPath)).lastSegment() + " to find out why these words are keywords.");
@@ -448,7 +448,7 @@ public void printReport(final String srcGenPath) {
       PrintWriter docuWriter = new PrintWriter(new File(docuFileName), StandardCharsets.UTF_8);
       docuWriter.print(new CombinedGrammarReportBuilder(grammarExtensions).getDocumentation(grammar, parserRules, enumRules));
       docuWriter.close();
-      LOGGER.info("report on keywords is written into " + fileName);
+      LOGGER.info("report on keywords is written into {}", fileName);
     } catch (IOException e) {
       throw new UncheckedIOException(e);
     }

com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/CustomClassAwareEcoreGenerator.java

@@ -103,7 +103,7 @@ public JControlModel getJControlModel() {
         return jControlModel;
       }
     };
-    LOGGER.info("generating EMF code for " + this.genModel);
+    LOGGER.info("generating EMF code for {}", this.genModel);
     generator.getAdapterFactoryDescriptorRegistry().addDescriptor(GenModelPackage.eNS_URI, new GeneratorAdapterDescriptor(getTypeMapper(), getLineDelimiter()));
     generator.setInput(model);
 
@@ -170,7 +170,7 @@ public void preInvoke() {
         }
       }
     }
-    LOGGER.info("Registered source path to discover custom classes: " + Joiner.on(", ").join(this.srcPaths));
+    LOGGER.info("Registered source path to discover custom classes: {}", () -> Joiner.on(", ").join(this.srcPaths));
   }
 
   /**
@@ -187,8 +187,7 @@ private void addSourcePathForPlugin(final String pluginId) {
     }
     URI createURI = URI.createURI(path);
     if (!URIConverter.INSTANCE.exists(createURI, null)) {
-      LOGGER.warn("Cannot access path '" + path
-          + "'. Make sure to checkout all parent languages before running the workflow. Otherwise custom implementations (*ImplCustom) will not be considered.");
+      LOGGER.warn("Cannot access path '{}'. Make sure to checkout all parent languages before running the workflow. Otherwise custom implementations (*ImplCustom) will not be considered.", path);
     }
     this.srcPaths.add(path);
   }

com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java

@@ -60,7 +60,7 @@
 /**
  * A base class for xtext generator tests. Allows creating a project and adding files.
  */
-@SuppressWarnings({"PMD.AbstractClassWithoutAbstractMethod", "restriction", "nls"})
+@SuppressWarnings({"PMD.AbstractClassWithoutAbstractMethod", "nls"})
 public abstract class AbstractGeneratorTest {
   private static final String MESSAGE_GENERATED_FILE_MUST_EXIST = "Generated file ''{0}'' must exist.";
   private static final String MESSAGE_GENERATED_CODE_MUST_BE_CORRECT = "Generated contents of ''{0}'' must be correct.";
@@ -320,7 +320,7 @@ protected void execute(final IProgressMonitor monitor) throws CoreException, Inv
               URI resourceURI = URI.createPlatformResourceURI(getFullFileName(projectName, outputFileName), true);
               IResourcesSetupUtil.createFile(resourceURI.toPlatformString(true), contents);
             } catch (IOException e) {
-              LOGGER.error("failed adding file to workspace: " + outputFileName, e); //$NON-NLS-1$
+              LOGGER.error("failed adding file to workspace: {}", outputFileName, e); //$NON-NLS-1$
               Assert.fail("Error adding file " + outputFileName + " to workspace: " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
             }
           }