From d5eac25a8fba1840ee211427990e9868739b87b5 Mon Sep 17 00:00:00 2001
From: komakkar <komakkar@microsoft.com>
Date: Thu, 13 Aug 2020 00:06:12 +0530
Subject: [PATCH] DI changes.
---
.../notification/pubsub/IPubsubHandshakeHandler.java | 1 -
.../pubsub/IPubsubRequestBodyExtractor.java | 1 -
.../azure/pubsub/PubsubHandshakeHandler.java | 12 ------------
.../provider/gcp/pubsub/PubsubHandshakeHandler.java | 4 ++++
4 files changed, 4 insertions(+), 14 deletions(-)
delete mode 100644 provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/PubsubHandshakeHandler.java
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubHandshakeHandler.java b/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubHandshakeHandler.java
index e8f8f043c..bf560c343 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubHandshakeHandler.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubHandshakeHandler.java
@@ -3,7 +3,6 @@ package org.opengroup.osdu.notification.pubsub;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
-@Component
public interface IPubsubHandshakeHandler {
ResponseEntity getHandshakeResponse();
}
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubRequestBodyExtractor.java b/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubRequestBodyExtractor.java
index 613effe17..1a98f88b3 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubRequestBodyExtractor.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubRequestBodyExtractor.java
@@ -5,7 +5,6 @@ import org.springframework.http.ResponseEntity;
import java.util.Map;
-@Component
public interface IPubsubRequestBodyExtractor {
Map<String, String> extractAttributesFromRequestBody() ;
diff --git a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/PubsubHandshakeHandler.java b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/PubsubHandshakeHandler.java
deleted file mode 100644
index 88c21efd3..000000000
--- a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/PubsubHandshakeHandler.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.opengroup.osdu.notification.provider.azure.pubsub;
-
-import org.opengroup.osdu.notification.pubsub.IPubsubHandshakeHandler;
-import org.springframework.http.ResponseEntity;
-
-public class PubsubHandshakeHandler implements IPubsubHandshakeHandler {
-
- @Override
- public ResponseEntity getHandshakeResponse() {
- return null;
- }
-}
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubHandshakeHandler.java b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubHandshakeHandler.java
index 33b9b1562..55f989039 100644
--- a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubHandshakeHandler.java
+++ b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubHandshakeHandler.java
@@ -1,8 +1,12 @@
package org.opengroup.osdu.notification.provider.gcp.pubsub;
import org.opengroup.osdu.notification.pubsub.IPubsubHandshakeHandler;
+import org.springframework.context.annotation.Lazy;
import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+@Component
+@Lazy
public class PubsubHandshakeHandler implements IPubsubHandshakeHandler {
@Override
--
GitLab