From f015c7a2fa6ad6ff02597ef5e1080122e537e7be Mon Sep 17 00:00:00 2001
From: Sviatoslav Nekhaienko <snekhaienko@slb.com>
Date: Tue, 8 Dec 2020 20:14:26 +0200
Subject: [PATCH] remove @Log
---
.../schema/converter/PropertiesProcessor.java | 19 +++++++++++++------
.../converter/SchemaToStorageFormatImpl.java | 2 +-
.../service/impl/SchemaServiceImpl.java | 5 ++++-
.../SchemaToStorageFormatImplTest.java | 5 ++++-
4 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
index b039f29c5..1e73d6e3e 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
@@ -16,6 +16,7 @@ package org.opengroup.osdu.indexer.schema.converter;
import lombok.extern.java.Log;
import org.apache.http.HttpStatus;
+import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.AppException;
import org.opengroup.osdu.core.common.search.Preconditions;
import org.opengroup.osdu.indexer.schema.converter.tags.AllOfItem;
@@ -23,11 +24,15 @@ import org.opengroup.osdu.indexer.schema.converter.tags.Definition;
import org.opengroup.osdu.indexer.schema.converter.tags.Definitions;
import org.opengroup.osdu.indexer.schema.converter.tags.TypeProperty;
+import javax.inject.Inject;
import java.util.*;
import java.util.stream.Stream;
-@Log
+
class PropertiesProcessor {
+ @Inject
+ private JaxRsDpsLog log;
+
private static final String DEF_PREFIX = "#/definitions/";
private static final Set<String> SKIP_DEFINITIONS = new HashSet<>(
@@ -58,11 +63,13 @@ class PropertiesProcessor {
private final String pathPrefix;
private final String pathPrefixWithDot;
- public PropertiesProcessor(Definitions definitions) {
- this(definitions, null);
+
+ public PropertiesProcessor(Definitions definitions, JaxRsDpsLog log) {
+ this(definitions, null, log);
}
- public PropertiesProcessor(Definitions definitions, String pathPrefix) {
+ public PropertiesProcessor(Definitions definitions, String pathPrefix, JaxRsDpsLog log) {
+ this.log = log;
this.definitions = definitions;
this.pathPrefix = pathPrefix;
this.pathPrefixWithDot = Objects.isNull(pathPrefix) || pathPrefix.isEmpty() ? "" : pathPrefix + ".";
@@ -122,12 +129,12 @@ class PropertiesProcessor {
}
if (!Objects.isNull(entry.getValue().getProperties())) {
- PropertiesProcessor propertiesProcessor = new PropertiesProcessor(definitions, pathPrefixWithDot + entry.getKey());
+ PropertiesProcessor propertiesProcessor = new PropertiesProcessor(definitions, pathPrefixWithDot + entry.getKey(), log);
return entry.getValue().getProperties().entrySet().stream().flatMap(propertiesProcessor::processPropertyEntry);
}
if (!Objects.isNull(entry.getValue().getRef())) {
- return new PropertiesProcessor(definitions, pathPrefixWithDot + entry.getKey())
+ return new PropertiesProcessor(definitions, pathPrefixWithDot + entry.getKey(), log)
.processRef(entry.getValue().getRef());
}
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java
index 405833b75..925e15799 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java
@@ -82,7 +82,7 @@ public class SchemaToStorageFormatImpl implements SchemaToStorageFormat {
Preconditions.checkNotNull(objectMapper, "schemaServiceSchema cannot be null");
Preconditions.checkNotNullOrEmpty(kind, "kind cannot be null or empty");
- PropertiesProcessor propertiesProcessor = new PropertiesProcessor(schemaServiceSchema.getDefinitions());
+ PropertiesProcessor propertiesProcessor = new PropertiesProcessor(schemaServiceSchema.getDefinitions(), log);
final List<Map<String, Object>> storageSchemaItems = new ArrayList<>();
if (schemaServiceSchema.getProperties() != null) {
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/impl/SchemaServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/impl/SchemaServiceImpl.java
index 745f88673..0bd1ed4e9 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/impl/SchemaServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/impl/SchemaServiceImpl.java
@@ -19,6 +19,7 @@ import lombok.extern.java.Log;
import org.apache.http.HttpStatus;
import org.opengroup.osdu.core.common.http.FetchServiceHttpRequest;
import org.opengroup.osdu.core.common.http.IUrlFetchService;
+import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.HttpResponse;
import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
import org.opengroup.osdu.indexer.schema.converter.interfaces.SchemaToStorageFormat;
@@ -37,8 +38,10 @@ import java.nio.charset.StandardCharsets;
* Provides implementation of the client service that retrieves schemas from the Schema Service
*/
@Component
-@Log
public class SchemaServiceImpl implements SchemaService {
+ @Inject
+ private JaxRsDpsLog log;
+
@Inject
private IUrlFetchService urlFetchService;
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java
index b8d400321..98ed7abda 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java
@@ -17,6 +17,8 @@ package org.opengroup.osdu.indexer.schema.converter;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
import org.mockito.Mockito;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.springframework.boot.test.context.SpringBootTest;
@@ -40,8 +42,9 @@ import static org.junit.Assert.fail;
public class SchemaToStorageFormatImplTest {
private ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().build();
- private JaxRsDpsLog jaxRsDpsLog = Mockito.mock(JaxRsDpsLog.class);
+ private JaxRsDpsLog jaxRsDpsLog = Mockito.mock(JaxRsDpsLog.class);
+
private SchemaToStorageFormatImpl schemaToStorageFormatImpl
= new SchemaToStorageFormatImpl(objectMapper, jaxRsDpsLog);
--
GitLab