From 412a12afc7b5722d52e93ec28c6a8d70a774f59f Mon Sep 17 00:00:00 2001
From: Alok Joshi <AJoshi19@slb.com>
Date: Thu, 17 Jun 2021 12:01:07 -0500
Subject: [PATCH] upgrade libraries, change info logs to debug
---
.../opengroup/osdu/notification/api/PubsubEndpoint.java | 8 ++++----
pom.xml | 2 +-
provider/notification-azure/pom.xml | 2 +-
.../azure/util/AzureServiceAccountValidatorImpl.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java b/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java
index 442a2044e..c571c062b 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java
@@ -99,12 +99,12 @@ public class PubsubEndpoint {
Map<String, String> requestHeader = new HashMap<>();
if (secretType.equalsIgnoreCase(HMAC_TYPE)) {
- this.log.info("receiving pubsub message, will send out hmac type request, pubsub message: " + pubsubMessage);
+ this.log.debug("receiving pubsub message, will send out hmac type request, pubsub message: " + pubsubMessage);
HmacSecret hmacSecret = (HmacSecret) secret;
String signedjwt = this.signatureService.getSignedSignature(endpoint, hmacSecret.getValue());
pushUrl = endpoint + "?hmac=" + signedjwt;
} else if (secretType.equalsIgnoreCase(GSA_TYPE)) {
- this.log.info("receiving pubsub message, will send out gsa type request, pubsub message: " + pubsubMessage);
+ this.log.debug("receiving pubsub message, will send out gsa type request, pubsub message: " + pubsubMessage);
GsaSecret gsaSecret = (GsaSecret) secret;
GsaSecretValue gsaSecretValue = gsaSecret.getValue();
@@ -117,7 +117,7 @@ public class PubsubEndpoint {
requestHeader.put("Authorization", idToken);
}
- this.log.info("sending out notification to endpoint: " + endpoint);
+ this.log.debug("sending out notification to endpoint: " + endpoint);
requestHeader.put(DpsHeaders.CONTENT_TYPE, "application/json");
requestHeader.put(DpsHeaders.CORRELATION_ID, headerAttributes.get(DpsHeaders.CORRELATION_ID));
requestHeader.put(DpsHeaders.DATA_PARTITION_ID, headerAttributes.get(DpsHeaders.DATA_PARTITION_ID));
@@ -128,7 +128,7 @@ public class PubsubEndpoint {
this.log.error(NOT_ACKNOWLEDGE);
return ResponseEntity.badRequest().body(NOT_ACKNOWLEDGE);
}
- this.log.info(ACKNOWLEDGE);
+ this.log.debug(ACKNOWLEDGE);
return ResponseEntity.ok(ACKNOWLEDGE);
}
diff --git a/pom.xml b/pom.xml
index 1e09d8bd1..66dac6053 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<java.version>8</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
- <os-core-common.version>0.6.9</os-core-common.version>
+ <os-core-common.version>0.9.0</os-core-common.version>
</properties>
<licenses>
diff --git a/provider/notification-azure/pom.xml b/provider/notification-azure/pom.xml
index b2ced818c..d7fdc2484 100644
--- a/provider/notification-azure/pom.xml
+++ b/provider/notification-azure/pom.xml
@@ -39,7 +39,7 @@
<springframework.version>4.3.0.RELEASE</springframework.version>
<reactor.netty.version>0.9.0.RELEASE</reactor.netty.version>
<reactor.core.version>3.3.0.RELEASE</reactor.core.version>
- <osdu.corelibazure.version>0.9.0</osdu.corelibazure.version>
+ <osdu.corelibazure.version>0.10.0-rc8</osdu.corelibazure.version>
<junit.version>5.6.0</junit.version>
<jjwt.version>3.8.1</jjwt.version>
<mockito.version>2.23.0</mockito.version>
diff --git a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/util/AzureServiceAccountValidatorImpl.java b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/util/AzureServiceAccountValidatorImpl.java
index 7aaccda18..7fd42f301 100644
--- a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/util/AzureServiceAccountValidatorImpl.java
+++ b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/util/AzureServiceAccountValidatorImpl.java
@@ -44,7 +44,7 @@ public class AzureServiceAccountValidatorImpl implements IServiceAccountValidato
String appIdClaim = jwt.getClaim(APP_ID_CLAIM).asString();
if(appIdClaim!= null && appIdClaim.equals(userIdentity)) {
- logger.info("PubSub authorized");
+ logger.debug("PubSub authorized");
return true;
}
return false;
--
GitLab