From c82f171abbee8b330466073c36b78423c7f85c7a Mon Sep 17 00:00:00 2001
From: "Igor Filippov (EPAM)" <igor_filippov@epam.com>
Date: Mon, 5 Apr 2021 12:38:03 +0000
Subject: [PATCH] GONRG-1192 Updated poms.
---
.../org/opengroup/osdu/partition/logging/AuditLogger.java | 1 +
.../org/opengroup/osdu/partition/model/PartitionInfo.java | 2 ++
.../provider/gcp/security/AuthorizationService.java | 3 ---
.../partition-gcp/src/main/resources/application.properties | 3 +--
provider/partition-gcp/src/main/resources/logback.xml | 5 +++--
.../opengroup/osdu/partition/api/UpdatePartitionTest.java | 2 +-
.../opengroup/osdu/partition/api/TestCreatePartition.java | 2 +-
.../opengroup/osdu/partition/api/TestUpdatePartition.java | 4 ++--
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/partition-core/src/main/java/org/opengroup/osdu/partition/logging/AuditLogger.java b/partition-core/src/main/java/org/opengroup/osdu/partition/logging/AuditLogger.java
index 472d5e260..959272553 100644
--- a/partition-core/src/main/java/org/opengroup/osdu/partition/logging/AuditLogger.java
+++ b/partition-core/src/main/java/org/opengroup/osdu/partition/logging/AuditLogger.java
@@ -31,6 +31,7 @@ import org.springframework.web.context.annotation.RequestScope;
public class AuditLogger {
private final JaxRsDpsLog logger;
+
private AuditEvents events = null;
private AuditEvents getAuditEvents() {
diff --git a/partition-core/src/main/java/org/opengroup/osdu/partition/model/PartitionInfo.java b/partition-core/src/main/java/org/opengroup/osdu/partition/model/PartitionInfo.java
index 4f2ce72d0..ca0750b3d 100644
--- a/partition-core/src/main/java/org/opengroup/osdu/partition/model/PartitionInfo.java
+++ b/partition-core/src/main/java/org/opengroup/osdu/partition/model/PartitionInfo.java
@@ -14,6 +14,7 @@
package org.opengroup.osdu.partition.model;
+import javax.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -28,6 +29,7 @@ import java.util.Map;
@NoArgsConstructor
public class PartitionInfo {
+ @NotEmpty
@Builder.Default
Map<String, Property> properties = new HashMap<>();
}
\ No newline at end of file
diff --git a/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationService.java b/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationService.java
index 5e3798f40..b19b061ba 100644
--- a/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationService.java
+++ b/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationService.java
@@ -45,9 +45,6 @@ public class AuthorizationService implements IAuthorizationService {
try {
AuthorizationResponse authorizationResponse = authorizationServiceImpl
.authorizeAny(headers, PARTITION_ADMIN_ROLE);
- if (Objects.nonNull(authorizationResponse)) {
- headers.put("user", authorizationResponse.getUser());
- }
} catch (AppException e) {
throw e;
} catch (Exception e) {
diff --git a/provider/partition-gcp/src/main/resources/application.properties b/provider/partition-gcp/src/main/resources/application.properties
index 971d96285..3f9c4e0de 100644
--- a/provider/partition-gcp/src/main/resources/application.properties
+++ b/provider/partition-gcp/src/main/resources/application.properties
@@ -19,6 +19,5 @@ KMS_KEY=${kms-key}
GOOGLE_CLOUD_PROJECT=${google-cloud-project}
#logging configuration
-logging.level.org.springframework.web=DEBUG
-logging.level.org.opengroup.osdu=debug
+logging.level.org.springframework.web=${LOG_LEVEL:DEBUG}
diff --git a/provider/partition-gcp/src/main/resources/logback.xml b/provider/partition-gcp/src/main/resources/logback.xml
index e6bb61f96..a67f87124 100644
--- a/provider/partition-gcp/src/main/resources/logback.xml
+++ b/provider/partition-gcp/src/main/resources/logback.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+ <logger name="org.opengroup.osdu" level="${LOG_LEVEL}"/>
<springProfile name="local">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
@@ -8,7 +9,7 @@
<charset>utf8</charset>
</encoder>
</appender>
- <root level="DEBUG">
+ <root level="info">
<appender-ref ref="CONSOLE"/>
</root>
</springProfile>
@@ -28,7 +29,7 @@
</encoder>
</appender>
- <root level="debug">
+ <root level="info">
<appender-ref ref="stdout"/>
</root>
</springProfile>
diff --git a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java
index 6d6736f6f..12ac8aa44 100644
--- a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java
+++ b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java
@@ -95,7 +95,7 @@ public abstract class UpdatePartitionTest extends BaseTestTemplate {
return sb.toString();
}
- private String getValidBodyForUpdatePartition() {
+ protected String getValidBodyForUpdatePartition() {
StringBuffer sb = new StringBuffer();
sb.append("{\n");
sb.append(" \"properties\": {")
diff --git a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestCreatePartition.java b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestCreatePartition.java
index 31b9eb1f6..dd143a3cf 100644
--- a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestCreatePartition.java
+++ b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestCreatePartition.java
@@ -42,7 +42,7 @@ public class TestCreatePartition extends CreatePartitionTest {
@Override
@Test
public void should_return40XResponseCode_when_makingRequest_withInvalidPayload() throws Exception {
- String invalidPayload = "invalidPayload";
+ String invalidPayload = "{\"properties_invalid\":{}}";
ClientResponse response = descriptor.runWithCustomPayload(getId(), invalidPayload, testUtils.getAccessToken());
assertEquals(400, response.getStatus());
}
diff --git a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestUpdatePartition.java b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestUpdatePartition.java
index df5742718..35aec46a0 100644
--- a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestUpdatePartition.java
+++ b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestUpdatePartition.java
@@ -25,13 +25,13 @@ public class TestUpdatePartition extends UpdatePartitionTest {
@Override
@Before
- public void setup() throws Exception {
+ public void setup() {
this.testUtils = new GCPTestUtils();
}
@Override
@After
- public void tearDown() throws Exception {
+ public void tearDown() {
this.testUtils = null;
}
}
--
GitLab