Issue #145 feat:More logging in Dao layer

Sunbird-RC · May 8, 2018 · db15a1f · db15a1f
1 parent 789517c
commit db15a1f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.../authorization/src/main/java/io/opensaber/registry/authorization/AuthorizationFilter.java b/.../authorization/src/main/java/io/opensaber/registry/authorization/AuthorizationFilter.java
@@ -51,11 +51,11 @@ public Map<String, Object> execute(Map<String, Object> mapObject) throws Middlew
           String token = tokenObject.toString();
           try {
               if (!keyCloakServiceImpl.verifyToken(token).trim().isEmpty()) {
-               /*   if(mapObject.containsKey("userName")) {
+                  if (mapObject.containsKey("userName")) {
                       logger.info("Access token for user {} verified successfully with KeyCloak server !", mapObject.get("userName"));
-                  }else {*/
+                  } else {
                       logger.info("Access token verified successfully with KeyCloak server !");
-                //  }
+                  }
                   AuthInfo authInfo = extractTokenIntoAuthInfo(token);
                   if (authInfo.getSub() == null || authInfo.getAud() == null || authInfo.getName() == null) {
                       throw new MiddlewareHaltException(TOKEN_IS_INVALID);

diff --git a/java/registry/src/main/java/io/opensaber/registry/dao/impl/RegistryDaoImpl.java b/java/registry/src/main/java/io/opensaber/registry/dao/impl/RegistryDaoImpl.java
@@ -390,7 +390,12 @@ private void verifyAndDelete(Vertex dbSourceVertex, Edge e, Optional<Edge> edgeA
 	 * @throws AuditFailedException
 	 */
 	private void deleteEdgeAndNode(Vertex v, Edge dbEdgeToBeRemoved, Vertex dbVertexToBeDeleted) throws AuditFailedException{
-		logger.info("Deleting edge and node for edge-label :	{} , vertex-label :	{}", dbEdgeToBeRemoved.label(),dbVertexToBeDeleted.label());
+		if(dbVertexToBeDeleted !=null) {
+			logger.info("Deleting edge and node for edge-label :	{} , vertex-label :	{}", dbEdgeToBeRemoved.label(), dbVertexToBeDeleted.label());
+		}else{
+			logger.info("Deleting edge and node for edge-label :	{} ", dbEdgeToBeRemoved.label());
+		}
+
 		if(dbVertexToBeDeleted == null){
 			dbVertexToBeDeleted = dbEdgeToBeRemoved.inVertex();
 		}