Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
System
Notification
Commits
412a12af
Commit
412a12af
authored
Jun 17, 2021
by
Alok Joshi
Browse files
upgrade libraries, change info logs to debug
parent
be59ddca
Pipeline
#48064
failed with stages
in 21 minutes and 27 seconds
Changes
4
Pipelines
9
Hide whitespace changes
Inline
Side-by-side
notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java
View file @
412a12af
...
...
@@ -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
);
}
...
...
pom.xml
View file @
412a12af
...
...
@@ -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>
...
...
provider/notification-azure/pom.xml
View file @
412a12af
...
...
@@ -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>
...
...
provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/util/AzureServiceAccountValidatorImpl.java
View file @
412a12af
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment