Redirect Eclipse logs during tests to SLF4j/Logback (#3604)

Author: briandealwis

plugins/com.google.cloud.tools.eclipse.test.dependencies/.project

@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>

plugins/com.google.cloud.tools.eclipse.test.dependencies/META-INF/MANIFEST.MF

@@ -20,7 +20,10 @@ Require-Bundle: org.junit;bundle-version="[4.12.0,4.12.1)";visibility:=reexport,
  org.slf4j.apis.jcl;bundle-version="[1.7.10,2)",
  org.slf4j.bridge.jul;bundle-version="[1.7.10,2)",
  javax.annotation
-Import-Package: org.osgi.framework,
+Service-Component: OSGI-INF/logservice.xml
+Import-Package: org.eclipse.equinox.log;version="1.0",
+ org.osgi.framework,
+ org.osgi.service.log;version="1.4.0",
  org.slf4j.impl;version="[1.7.10,2)"
 Export-Package: org.mockito;provider=google;version="1.10.19";
   uses:="org.mockito.invocation,

plugins/com.google.cloud.tools.eclipse.test.dependencies/OSGI-INF/logservice.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="com.google.cloud.tools.eclipse.logging.osgi_slf4j">
+  <implementation class="com.google.cloud.tools.eclipse.test.dependencies.EclipseLoggingAdapter" />
+  <service>
+     <provide interface="org.osgi.service.log.LoggerFactory" />
+     <provide interface="org.eclipse.equinox.log.ExtendedLogService"/>
+     <provide interface="org.osgi.service.log.LogService"/>
+  </service>
+  <property name="service.ranking" type="Integer" value="10000000"/>
+</scr:component>

plugins/com.google.cloud.tools.eclipse.test.dependencies/build.properties

@@ -3,6 +3,7 @@ output.. = target/classes/
 # NB: only include the lib/.jars actually required as lib/ will include referenced bundles
 # including broken hamcrest-1.1
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                lib/mockito-core-1.10.19.jar,\
                lib/objenesis-2.2.jar,\
                logback.xml,\

plugins/com.google.cloud.tools.eclipse.test.dependencies/src/com/google/cloud/tools/eclipse/test/dependencies/EclipseLoggingAdapter.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed 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
+ *
+ *    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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.tools.eclipse.test.dependencies;
+
+import org.eclipse.equinox.log.ExtendedLogService;
+import org.eclipse.equinox.log.Logger;
+import org.osgi.framework.Bundle;
+import org.osgi.service.log.LoggerFactory;
+
+/**
+ * An SLF4j facade for OSGi {@link LoggerFactory} and Eclipse {@link ExtendedLogService}. This class
+ * is intended to be a replacement for other ExtendedLogService implementations.
+ */
+public class EclipseLoggingAdapter extends LoggerDelegate
+    implements LoggerFactory, ExtendedLogService {
+
+  public EclipseLoggingAdapter() {
+    super(org.slf4j.LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME));
+  }
+
+  @Override
+  public Logger getLogger(String name) {
+    return new LoggerDelegate(org.slf4j.LoggerFactory.getLogger(name));
+  }
+
+  @Override
+  public Logger getLogger(Class<?> clazz) {
+    return new LoggerDelegate(org.slf4j.LoggerFactory.getLogger(clazz));
+  }
+
+  @Override
+  public Logger getLogger(Bundle bundle, String loggerName) {
+    return new LoggerDelegate(org.slf4j.LoggerFactory.getLogger(bundle.getSymbolicName()));
+  }
+
+  @Override
+  public <L extends org.osgi.service.log.Logger> L getLogger(String name, Class<L> loggerType) {
+    if (loggerType == org.osgi.service.log.Logger.class) {
+      return loggerType.cast(getLogger(name));
+    }
+    return null;
+  }
+
+  @Override
+  public <L extends org.osgi.service.log.Logger> L getLogger(Class<?> clazz, Class<L> loggerType) {
+    if (loggerType == org.osgi.service.log.Logger.class) {
+      return loggerType.cast(getLogger(clazz));
+    }
+    return null;
+  }
+
+  @Override
+  public <L extends org.osgi.service.log.Logger> L getLogger(
+      Bundle bundle, String name, Class<L> loggerType) {
+    if (loggerType == org.osgi.service.log.Logger.class) {
+      return loggerType.cast(getLogger(bundle, name));
+    }
+    return null;
+  }
+}