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
a3ac2b7f
Commit
a3ac2b7f
authored
Sep 03, 2020
by
Komal Makkar
Browse files
Resolving comments
parent
13cb5183
Pipeline
#7299
failed with stages
in 2 minutes and 44 seconds
Changes
5
Pipelines
5
Hide whitespace changes
Inline
Side-by-side
provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/HandshakeRequestData.java
View file @
a3ac2b7f
...
...
@@ -14,13 +14,14 @@
package
org.opengroup.osdu.notification.provider.azure.models
;
import
lombok.AccessLevel
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
@AllArgsConstructor
@NoArgsConstructor
@NoArgsConstructor
(
access
=
AccessLevel
.
PRIVATE
)
public
class
HandshakeRequestData
{
private
String
validationCode
;
...
...
provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/NotificationData.java
View file @
a3ac2b7f
...
...
@@ -15,6 +15,7 @@
package
org.opengroup.osdu.notification.provider.azure.models
;
import
lombok.AccessLevel
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
...
...
@@ -22,8 +23,8 @@ import lombok.NoArgsConstructor;
import
java.util.Map
;
@Data
@NoArgsConstructor
@AllArgsConstructor
@NoArgsConstructor
(
access
=
AccessLevel
.
PRIVATE
)
public
class
NotificationData
{
private
String
data
;
...
...
@@ -31,9 +32,5 @@ public class NotificationData {
private
Map
<
String
,
String
>
attributes
;
private
String
messageId
;
String
validationCode
;
String
validationUrl
;
}
provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/models/NotificationRequest.java
View file @
a3ac2b7f
...
...
@@ -15,13 +15,14 @@
package
org.opengroup.osdu.notification.provider.azure.models
;
import
com.google.gson.JsonObject
;
import
lombok.AccessLevel
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
@AllArgsConstructor
@NoArgsConstructor
@NoArgsConstructor
(
access
=
AccessLevel
.
PRIVATE
)
public
class
NotificationRequest
{
private
String
id
;
...
...
provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/EventGridRequestBodyExtractor.java
View file @
a3ac2b7f
...
...
@@ -32,7 +32,6 @@ import org.springframework.web.context.annotation.RequestScope;
import
javax.servlet.http.HttpServletRequest
;
import
java.io.BufferedReader
;
import
java.io.IOException
;
import
java.util.Base64
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
...
...
@@ -59,7 +58,8 @@ public class EventGridRequestBodyExtractor implements IPubsubRequestBodyExtracto
private
HandshakeRequestData
handshakeRequestData
;
private
boolean
isHandshakeRequest
;
public
EventGridRequestBodyExtractor
(
@Autowired
HttpServletRequest
httpServletRequest
,
@Autowired
JaxRsDpsLog
log
)
{
@Autowired
public
EventGridRequestBodyExtractor
(
HttpServletRequest
httpServletRequest
,
JaxRsDpsLog
log
)
{
this
.
httpServletRequest
=
httpServletRequest
;
this
.
log
=
log
;
this
.
notificationRequest
=
extractNotificationRequestFromHttpRequest
();
...
...
provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/util/AppProperties.java
View file @
a3ac2b7f
...
...
@@ -15,10 +15,8 @@
package
org.opengroup.osdu.notification.provider.azure.util
;
import
com.azure.cosmos.CosmosClient
;
import
com.azure.security.keyvault.secrets.SecretClient
;
import
com.azure.security.keyvault.secrets.models.KeyVaultSecret
;
import
org.opengroup.osdu.azure.KeyVaultFacade
;
import
org.opengroup.osdu.notification.provider.interfaces.IAppProperties
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
...
...
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