Rename IDpsLog to ILogger. Added ENV-based log prefixing for one Logger (testing).

indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/JaxRsDpsLogTest.java

@@ -22,7 +22,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.opengroup.osdu.core.common.model.core.AuditPayload;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.core.IDpsLog;
+import org.opengroup.osdu.core.common.model.core.ILogger;
 import org.opengroup.osdu.core.common.model.core.Request;
 import org.opengroup.osdu.core.common.model.indexer.ServiceLogId;
 import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
@@ -39,11 +39,11 @@ import static org.mockito.Mockito.*;
 
 @Ignore
 @RunWith(SpringRunner.class)
-@PrepareForTest({IDpsLog.class})
+@PrepareForTest({ILogger.class})
 public class JaxRsDpsLogTest {
 
     @Mock
-    private IDpsLog log;
+    private ILogger log;
 
     @InjectMocks
     private JaxRsDpsLog sut;

provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/DpsLogFactory.java

@@ -14,21 +14,21 @@
 
 package org.opengroup.osdu.indexer.aws.di;
 
-import org.opengroup.osdu.core.common.model.core.IDpsLog;
+import org.opengroup.osdu.core.common.model.core.ILogger;
 import org.opengroup.osdu.core.common.service.core.Log;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.stereotype.Component;
 
 @Component
-public class DpsLogFactory extends AbstractFactoryBean<IDpsLog> {
+public class DpsLogFactory extends AbstractFactoryBean<ILogger> {
 
     @Override
-    protected IDpsLog createInstance() throws Exception {
+    protected ILogger createInstance() throws Exception {
         return new Log();
     }
 
     @Override
     public Class<?> getObjectType() {
-        return IDpsLog.class;
+        return ILogger.class;
     }
 }
\ No newline at end of file

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/DpsLogFactory.java

@@ -14,7 +14,7 @@
 
 package org.opengroup.osdu.indexer.azure.di;
 
-import org.opengroup.osdu.core.common.model.core.IDpsLog;
+import org.opengroup.osdu.core.common.model.core.ILogger;
 import org.opengroup.osdu.core.common.service.core.Log;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.stereotype.Component;
@@ -22,14 +22,14 @@ import org.springframework.web.context.annotation.RequestScope;
 
 @Component
 @RequestScope
-public class DpsLogFactory implements FactoryBean<IDpsLog> {
+public class DpsLogFactory implements FactoryBean<ILogger> {
     @Override
-    public IDpsLog getObject() throws Exception {
+    public ILogger getObject() throws Exception {
         return new Log();
     }
 
     @Override
     public Class<?> getObjectType() {
-        return IDpsLog.class;
+        return ILogger.class;
     }
 }

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/DpsLogFactory.java

@@ -14,7 +14,7 @@
 
 package org.opengroup.osdu.indexer.di;
 
-import org.opengroup.osdu.core.common.model.core.IDpsLog;
+import org.opengroup.osdu.core.common.model.core.ILogger;
 import org.opengroup.osdu.core.gcp.logging.logger.AppEngineLoggingProvider;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.stereotype.Component;
@@ -22,17 +22,17 @@ import org.springframework.web.context.annotation.RequestScope;
 
 @Component
 @RequestScope
-public class DpsLogFactory extends AbstractFactoryBean<IDpsLog> {
+public class DpsLogFactory extends AbstractFactoryBean<ILogger> {
 
     private AppEngineLoggingProvider appEngineLoggingProvider = new AppEngineLoggingProvider();
 
     @Override
-    protected IDpsLog createInstance() throws Exception {
+    protected ILogger createInstance() throws Exception {
         return appEngineLoggingProvider.getLogger();
     }
 
     @Override
     public Class<?> getObjectType() {
-        return IDpsLog.class;
+        return ILogger.class;
     }
 }
\ No newline at end of file