Merge pull request #22 from kailash/refactoring/general

Refactoring - rename method, add service unregister
datakaveri · Feb 2, 2023 · 66fcb15 · 66fcb15
2 parents 28f5954 + 13b2ae2
commit 66fcb15
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/iudx/auditing/server/postgres/PostgresVerticle.java b/src/main/java/iudx/auditing/server/postgres/PostgresVerticle.java
@@ -60,4 +60,9 @@ public void start() throws Exception {
 
     LOGGER.info("Postgres Verticle deployed.");
   }
+
+  @Override
+  public void stop() {
+    binder.unregister(consumer);
+  }
 }
diff --git a/src/main/java/iudx/auditing/server/processor/MessageProcessorImpl.java b/src/main/java/iudx/auditing/server/processor/MessageProcessorImpl.java
@@ -80,7 +80,7 @@ private JsonObject queryBuilder(JsonObject request) {
     AuditingServerStrategy serverStrategy = serverOriginContextFactory.create(serverOrigin);
     String postgresWriteQuery = serverStrategy.buildPostgresWriteQuery(request);
     String postgresDeleteQuery = serverStrategy.buildPostgresDeleteQuery(request);
-    String immudbWriteQuery = serverStrategy.buildImmudbDeleteQuery(request);
+    String immudbWriteQuery = serverStrategy.buildImmudbWriteQuery(request);
     return new JsonObject()
         .put(PG_INSERT_QUERY_KEY, postgresWriteQuery)
         .put(PG_DELETE_QUERY_KEY, postgresDeleteQuery)

diff --git a/src/main/java/iudx/auditing/server/queryStrategy/AuditingServerStrategy.java b/src/main/java/iudx/auditing/server/queryStrategy/AuditingServerStrategy.java
@@ -7,5 +7,5 @@ public interface AuditingServerStrategy {
 
   String buildPostgresDeleteQuery(JsonObject request);
 
-  String buildImmudbDeleteQuery(JsonObject request);
+  String buildImmudbWriteQuery(JsonObject request);
 }
diff --git a/src/main/java/iudx/auditing/server/queryStrategy/AuthAuditingStrategy.java b/src/main/java/iudx/auditing/server/queryStrategy/AuthAuditingStrategy.java
@@ -49,7 +49,7 @@ public String buildPostgresDeleteQuery(JsonObject request) {
   }
 
   @Override
-  public String buildImmudbDeleteQuery(JsonObject request) {
+  public String buildImmudbWriteQuery(JsonObject request) {
     String primaryKey = request.getString(PRIMARY_KEY);
     String body = request.getJsonObject(BODY).toString();
     String endPoint = request.getString(API);

diff --git a/src/main/java/iudx/auditing/server/queryStrategy/CatalogueAuditingStrategy.java b/src/main/java/iudx/auditing/server/queryStrategy/CatalogueAuditingStrategy.java
@@ -55,7 +55,7 @@ public String buildPostgresDeleteQuery(JsonObject request) {
   }
 
   @Override
-  public String buildImmudbDeleteQuery(JsonObject request) {
+  public String buildImmudbWriteQuery(JsonObject request) {
     String primaryKey = request.getString(PRIMARY_KEY);
     String userRole = request.getString(USER_ROLE);
     String userId = request.getString(USER_ID);

diff --git a/src/main/java/iudx/auditing/server/queryStrategy/ResourceAuditingStrategy.java b/src/main/java/iudx/auditing/server/queryStrategy/ResourceAuditingStrategy.java
@@ -55,7 +55,7 @@ public String buildPostgresDeleteQuery(JsonObject request) {
   }
 
   @Override
-  public String buildImmudbDeleteQuery(JsonObject request) {
+  public String buildImmudbWriteQuery(JsonObject request) {
     String userId = request.getString(USER_ID);
     String primaryKey = request.getString(PRIMARY_KEY);
     String resourceId = request.getString(ID);