Merge pull request datakaveri#519 from ankitmashu/enhancement/callbac…

…k_subs remove call back subscriptions
ananjaykumar2 · Jun 12, 2024 · 0c6e08d · 0c6e08d
2 parents c46067c + 493e74c
commit 0c6e08d
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 2,324 deletions.
diff --git a/src/main/java/iudx/resource/server/apiserver/subscription/CallbackSubscription.java b/src/main/java/iudx/resource/server/apiserver/subscription/CallbackSubscription.java
diff --git a/src/main/java/iudx/resource/server/apiserver/subscription/SubsType.java b/src/main/java/iudx/resource/server/apiserver/subscription/SubsType.java
@@ -1,13 +1,11 @@
 package iudx.resource.server.apiserver.subscription;
 
 public enum SubsType {
-  CALLBACK("CALLBACK"), 
   STREAMING("STREAMING");
 
   public final String type;
 
   SubsType(String type) {
     this.type = type;
   }
-
 }
diff --git a/src/main/java/iudx/resource/server/apiserver/subscription/SubscriptionService.java b/src/main/java/iudx/resource/server/apiserver/subscription/SubscriptionService.java
@@ -29,19 +29,12 @@ public class SubscriptionService {
   /**
    * get the context of subscription according to the type passed in message body.
    *
-   * @param type type of subscription either <strong>streaming</strong> or <strong>callback</strong>
    * @param databroker databroker verticle object
    * @return an object of Subscription class
    */
-  private Subscription getSubscriptionContext(SubsType type, DataBrokerService databroker) {
-    LOGGER.info("getSubscriptionContext() method started");
-    if (type != null && type.equals(SubsType.CALLBACK)) {
-      LOGGER.info("callback subscription context");
-      return new CallbackSubscription(databroker);
-    } else {
-      LOGGER.info("streaming subscription context");
-      return new StreamingSubscription(databroker);
-    }
+  private Subscription getSubscriptionContext(DataBrokerService databroker) {
+    LOGGER.info("streaming subscription context");
+    return new StreamingSubscription(databroker);
   }
 
   /**
@@ -62,7 +55,7 @@ public Future<JsonObject> createSubscription(
     Promise<JsonObject> promise = Promise.promise();
     SubsType subType = SubsType.valueOf(json.getString(SUB_TYPE));
     if (subscription == null) {
-      subscription = getSubscriptionContext(subType, databroker);
+      subscription = getSubscriptionContext(databroker);
     }
     assertNotNull(subscription);
     subscription
@@ -239,9 +232,8 @@ public Future<JsonObject> deleteSubscription(
       JsonObject json, DataBrokerService databroker, PostgresService pgService) {
     LOGGER.info("deleteSubscription() method started");
     Promise<JsonObject> promise = Promise.promise();
-    SubsType subType = SubsType.valueOf(json.getString(SUB_TYPE));
     if (subscription == null) {
-      subscription = getSubscriptionContext(subType, databroker);
+      subscription = getSubscriptionContext(databroker);
     }
     assertNotNull(subscription);
     subscription
@@ -284,9 +276,8 @@ public Future<JsonObject> getSubscription(
       JsonObject json, DataBrokerService databroker, PostgresService pgService) {
     LOGGER.info("getSubscription() method started");
     Promise<JsonObject> promise = Promise.promise();
-    SubsType subType = SubsType.valueOf(json.getString(SUB_TYPE));
     if (subscription == null) {
-      subscription = getSubscriptionContext(subType, databroker);
+      subscription = getSubscriptionContext(databroker);
     }
     assertNotNull(subscription);
     subscription
@@ -342,7 +333,7 @@ public Future<JsonObject> appendSubscription(
     Promise<JsonObject> promise = Promise.promise();
     SubsType subType = SubsType.valueOf(json.getString(SUB_TYPE));
     if (subscription == null) {
-      subscription = getSubscriptionContext(subType, databroker);
+      subscription = getSubscriptionContext(databroker);
     }
     assertNotNull(subscription);
     subscription

diff --git a/src/main/java/iudx/resource/server/callback/CallbackService.java b/src/main/java/iudx/resource/server/callback/CallbackService.java