Merge pull request eclipse-tycho#469 from laeubi/add_debug_exception_…

…to_maven_logger Add a debug(msg, exception) method to the maven logger
laeubi · Jan 2, 2022 · 8712fe5 · 8712fe5
2 parents 6026816 + b47f960
commit 8712fe5
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 2 deletions.
diff --git a/...rg.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenLogger.java b/...rg.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenLogger.java
@@ -31,6 +31,8 @@ public interface MavenLogger {
 
     public void debug(String message);
 
+    public void debug(String message, Throwable cause);
+
     public boolean isDebugEnabled();
 
     public boolean isExtendedDebugEnabled();

diff --git a/...clipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MultiLineLogger.java b/...clipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MultiLineLogger.java
@@ -88,6 +88,19 @@ public void debug(String message) {
         }
     }
 
+    @Override
+    public void debug(String message, Throwable cause) {
+        String[] messageLines = message.split("\n");
+        for (int ix = 0; ix < messageLines.length - 1; ix++) {
+            String messageLine = messageLines[ix];
+            delegate.debug(messageLine);
+        }
+        if (messageLines.length > 0) {
+            String lastMessageLine = messageLines[messageLines.length - 1];
+            delegate.error(lastMessageLine, cause);
+        }
+    }
+
     @Override
     public boolean isDebugEnabled() {
         return delegate.isDebugEnabled();

diff --git a/...tools.tests/src/test/java/org/eclipse/tycho/p2/tools/verfier/VerifierServiceImplTest.java b/...tools.tests/src/test/java/org/eclipse/tycho/p2/tools/verfier/VerifierServiceImplTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2021 SAP SE and others.
+ * Copyright (c) 2011, 2022 SAP SE and others.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -140,6 +140,11 @@ public boolean isDebugEnabled() {
         public boolean isExtendedDebugEnabled() {
             return true;
         }
+
+        @Override
+        public void debug(String message, Throwable cause) {
+
+        }
     }
 
 }
diff --git a/...s/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java b/...s/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java
@@ -72,6 +72,11 @@ public void warn(String message, Throwable cause) {
             warn(message);
         }
 
+        @Override
+        public void debug(String message, Throwable cause) {
+            debug(message);
+        }
+
         @Override
         public void info(String message) {
             infos.append(message);

diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenLoggerAdapter.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenLoggerAdapter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2021 SAP AG and others.
+ * Copyright (c) 2011, 2022 SAP AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -31,6 +31,13 @@ public void debug(String message) {
         }
     }
 
+    @Override
+    public void debug(String message, Throwable cause) {
+        if (!isEmpty(message)) {
+            logger.debug(message, cause);
+        }
+    }
+
     @Override
     public void info(String message) {
         if (!isEmpty(message)) {