AdminService tests

Author: PujaDeshmukh17

sdm/src/main/java/com/sap/cds/sdm/configuration/Registration.java

@@ -71,7 +71,11 @@ public void eventHandlers(CdsRuntimeConfigurer configurer) {
             persistenceService, sdmService, tokenHandlerInstance, dbQueryInstance));
     configurer.eventHandler(
         new SDMAttachmentsServiceHandler(
-            persistenceService, sdmService, documentService, tokenHandlerInstance));
+            persistenceService,
+            sdmService,
+            documentService,
+            tokenHandlerInstance,
+            dbQueryInstance));
   }
 
   private AttachmentService buildAttachmentService() {

sdm/src/main/java/com/sap/cds/sdm/handler/TokenHandler.java

@@ -70,14 +70,11 @@ public static String toString(byte[] bytes) {
   private static final String CLIENT_ID = "clientid";
   private static final String CLIENT_SECRET = "clientsecret";
   private static TokenHandler tokenHandlerInstance = new TokenHandler();
-  private static int i = 0;
 
   public static TokenHandler getTokenHandlerInstance() {
     if (tokenHandlerInstance == null) {
       tokenHandlerInstance = new TokenHandler();
-      i++;
     }
-    System.out.println("Number of objects created for token handler: " + i);
     return tokenHandlerInstance;
   }
 

sdm/src/main/java/com/sap/cds/sdm/persistence/DBQuery.java

@@ -16,7 +16,6 @@
 public class DBQuery {
 
   private static DBQuery dbQueryInstance = new DBQuery();
-  private static int i = 0;
 
   private DBQuery() {
     // Doesn't do anything
@@ -25,9 +24,7 @@ private DBQuery() {
   public static DBQuery getDBQueryInstance() {
     if (dbQueryInstance == null) {
       dbQueryInstance = new DBQuery();
-      i++;
     }
-    System.out.println("Number of objects created for db query: " + i);
     return dbQueryInstance;
   }
 

sdm/src/main/java/com/sap/cds/sdm/service/handler/SDMAttachmentsServiceHandler.java

@@ -1,7 +1,5 @@
 package com.sap.cds.sdm.service.handler;
 
-import static com.sap.cds.sdm.persistence.DBQuery.*;
-
 import com.sap.cds.Result;
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.MediaData;
 import com.sap.cds.feature.attachments.service.AttachmentService;
@@ -41,16 +39,19 @@ public class SDMAttachmentsServiceHandler implements EventHandler {
   private final DocumentUploadService documentService;
   private static final Logger logger = LoggerFactory.getLogger(SDMAttachmentsServiceHandler.class);
   private final TokenHandler tokenHandler;
+  private final DBQuery dbQuery;
 
   public SDMAttachmentsServiceHandler(
       PersistenceService persistenceService,
       SDMService sdmService,
       DocumentUploadService documentService,
-      TokenHandler tokenHandler) {
+      TokenHandler tokenHandler,
+      DBQuery dbQuery) {
     this.persistenceService = persistenceService;
     this.sdmService = sdmService;
     this.documentService = documentService;
     this.tokenHandler = tokenHandler;
+    this.dbQuery = dbQuery;
   }
 
   @On(event = AttachmentService.EVENT_CREATE_ATTACHMENT)
@@ -77,8 +78,7 @@ public void markAttachmentAsDeleted(AttachmentMarkAsDeletedEventContext context)
       String subdomain = contextValues[3];
       // check if only attachment exists against the folderId
       List<CmisDocument> cmisDocuments =
-          DBQuery.getDBQueryInstance()
-              .getAttachmentsForFolder(entity, persistenceService, folderId, context);
+          dbQuery.getAttachmentsForFolder(entity, persistenceService, folderId, context);
       if (cmisDocuments.isEmpty()) {
         // deleteFolder API
         sdmService.deleteDocument("deleteTree", folderId, userEmail, subdomain);
@@ -165,8 +165,7 @@ private void processEntities(AttachmentCreateEventContext eventContext)
     String upID = (String) attachmentIds.get(upIdKey);
 
     Result result =
-        DBQuery.getDBQueryInstance()
-            .getAttachmentsForUPID(attachmentDraftEntity, persistenceService, upID, upIdKey);
+        dbQuery.getAttachmentsForUPID(attachmentDraftEntity, persistenceService, upID, upIdKey);
     checkAttachmentConstraints(eventContext, attachmentDraftEntity, upID, upIdKey);
 
     MediaData data = eventContext.getData();
@@ -204,9 +203,8 @@ private void checkAttachmentConstraints(
       throws ServiceException {
     // Fetch the row count for current repository
     Result result =
-        DBQuery.getDBQueryInstance()
-            .getAttachmentsForUPIDAndRepository(
-                attachmentDraftEntity, persistenceService, upID, upIdKey);
+        dbQuery.getAttachmentsForUPIDAndRepository(
+            attachmentDraftEntity, persistenceService, upID, upIdKey);
     long rowCount = result.rowCount();
     String errorMessageCount =
         SDMUtils.getAttachmentCountAndMessage(
@@ -305,9 +303,8 @@ private void handleCreateDocumentResult(
         throw new ServiceException(SDMConstants.USER_NOT_AUTHORISED_ERROR);
       default:
         cmisDocument.setObjectId(createResult.get("objectId").toString());
-        DBQuery.getDBQueryInstance()
-            .addAttachmentToDraft(
-                getAttachmentDraftEntity(eventContext), persistenceService, cmisDocument);
+        dbQuery.addAttachmentToDraft(
+            getAttachmentDraftEntity(eventContext), persistenceService, cmisDocument);
         finalizeContext(eventContext, cmisDocument);
     }
   }