From 7221fc408c94ec63c54a6266dcdef43212b53383 Mon Sep 17 00:00:00 2001 From: Hema Vishnu Pola Date: Mon, 3 Aug 2020 21:18:30 +0530 Subject: [PATCH 1/7] added logs to the test base for type null check. --- .../src/main/java/org/opengroup/osdu/common/TestsBase.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testing/integration-tests/search-test-core/src/main/java/org/opengroup/osdu/common/TestsBase.java b/testing/integration-tests/search-test-core/src/main/java/org/opengroup/osdu/common/TestsBase.java index 20afcdc8..00d1a277 100644 --- a/testing/integration-tests/search-test-core/src/main/java/org/opengroup/osdu/common/TestsBase.java +++ b/testing/integration-tests/search-test-core/src/main/java/org/opengroup/osdu/common/TestsBase.java @@ -161,7 +161,12 @@ public abstract class TestsBase { if (clientResponse.getType() == null || log == null){ int i = 0; } - log.info(String.format("Response status: %s, type: %s", clientResponse.getStatus(), clientResponse.getType().toString())); + log.info(String.format("Response status: %s", clientResponse.getStatus())); + if(clientResponse.getType() != null){ + log.info(String.format("Response type: %s", clientResponse.getType().toString())); + }else { + log.info("Got response type: null"); + } assertEquals("application/json; charset=UTF-8", clientResponse.getType().toString()); String responseEntity = clientResponse.getEntity(String.class); -- GitLab From dc807329a784dd1403d738d3f30809808fdf8f59 Mon Sep 17 00:00:00 2001 From: Hema Vishnu Pola Date: Mon, 3 Aug 2020 21:47:04 +0530 Subject: [PATCH 2/7] log4j-exclusion --- provider/search-azure/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml index 4a24f8cd..c0c0ea11 100644 --- a/provider/search-azure/pom.xml +++ b/provider/search-azure/pom.xml @@ -85,6 +85,13 @@ org.springframework.boot spring-boot-starter-security + + + org.apache.logging.log4j + log4j-to-slf4j + + + -- GitLab From ad918da17641850a833c03c633e527c969351525 Mon Sep 17 00:00:00 2001 From: Hema Vishnu Pola Date: Mon, 3 Aug 2020 22:07:02 +0530 Subject: [PATCH 3/7] added logback exclusion as well. --- provider/search-azure/pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml index c0c0ea11..43156ab6 100644 --- a/provider/search-azure/pom.xml +++ b/provider/search-azure/pom.xml @@ -86,12 +86,15 @@ org.springframework.boot spring-boot-starter-security + + ch.qos.logback + logback-classic + org.apache.logging.log4j log4j-to-slf4j - -- GitLab From d35da477cf6ebecb12798c6407b5bd8140319870 Mon Sep 17 00:00:00 2001 From: Hema Vishnu Pola Date: Mon, 3 Aug 2020 22:11:24 +0530 Subject: [PATCH 4/7] updated logging changes. --- provider/search-azure/pom.xml | 2 +- .../search-azure/src/main/resources/application.properties | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml index 43156ab6..4a192c97 100644 --- a/provider/search-azure/pom.xml +++ b/provider/search-azure/pom.xml @@ -53,7 +53,7 @@ org.opengroup.osdu os-core-common - 0.0.18 + 0.3.4 org.opengroup.osdu diff --git a/provider/search-azure/src/main/resources/application.properties b/provider/search-azure/src/main/resources/application.properties index 8ff258bf..d12c11bb 100644 --- a/provider/search-azure/src/main/resources/application.properties +++ b/provider/search-azure/src/main/resources/application.properties @@ -40,4 +40,8 @@ azure.keyvault.url=${KEYVAULT_URI} # Azure Search query properties QUERY_DEFAULT_LIMIT=10 QUERY_LIMIT_MAXIMUM=1000 -AGGREGATION_SIZE=1000 \ No newline at end of file +AGGREGATION_SIZE=1000 + +#logging configuration +logging.transaction.enabled=true +logging.slf4jlogger.enabled=true \ No newline at end of file -- GitLab From 7259c361381903d1e84df2c97f543ddaf5546cc5 Mon Sep 17 00:00:00 2001 From: Hema Vishnu Pola Date: Mon, 3 Aug 2020 22:50:10 +0530 Subject: [PATCH 5/7] reverting back exclusions. --- provider/search-azure/pom.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml index 4a192c97..7e408a3e 100644 --- a/provider/search-azure/pom.xml +++ b/provider/search-azure/pom.xml @@ -84,17 +84,7 @@ org.springframework.boot - spring-boot-starter-security - - - ch.qos.logback - logback-classic - - - org.apache.logging.log4j - log4j-to-slf4j - - + spring-boot-starter-security -- GitLab From 41f557214473c8572f4afd7c68c798f951446090 Mon Sep 17 00:00:00 2001 From: Hema Vishnu Pola Date: Mon, 3 Aug 2020 23:16:35 +0530 Subject: [PATCH 6/7] added back the exclusions. --- provider/search-azure/pom.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml index 7e408a3e..4a192c97 100644 --- a/provider/search-azure/pom.xml +++ b/provider/search-azure/pom.xml @@ -84,7 +84,17 @@ org.springframework.boot - spring-boot-starter-security + spring-boot-starter-security + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + -- GitLab From 8933cb282ea47dd7e69dc680b99839b3150ba7db Mon Sep 17 00:00:00 2001 From: Hema Vishnu Pola Date: Tue, 4 Aug 2020 08:09:57 +0530 Subject: [PATCH 7/7] removing log4j2. --- provider/search-azure/pom.xml | 18 +++++++----------- .../src/main/resources/application.properties | 6 +----- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml index 4a192c97..0b0da800 100644 --- a/provider/search-azure/pom.xml +++ b/provider/search-azure/pom.xml @@ -53,12 +53,18 @@ org.opengroup.osdu os-core-common - 0.3.4 + 0.0.18 org.opengroup.osdu core-lib-azure 0.0.12 + + + org.springframework.boot + spring-boot-starter-log4j2 + + org.powermock @@ -85,16 +91,6 @@ org.springframework.boot spring-boot-starter-security - - - ch.qos.logback - logback-classic - - - org.apache.logging.log4j - log4j-to-slf4j - - diff --git a/provider/search-azure/src/main/resources/application.properties b/provider/search-azure/src/main/resources/application.properties index d12c11bb..8ff258bf 100644 --- a/provider/search-azure/src/main/resources/application.properties +++ b/provider/search-azure/src/main/resources/application.properties @@ -40,8 +40,4 @@ azure.keyvault.url=${KEYVAULT_URI} # Azure Search query properties QUERY_DEFAULT_LIMIT=10 QUERY_LIMIT_MAXIMUM=1000 -AGGREGATION_SIZE=1000 - -#logging configuration -logging.transaction.enabled=true -logging.slf4jlogger.enabled=true \ No newline at end of file +AGGREGATION_SIZE=1000 \ No newline at end of file -- GitLab