feat(jans-config-api): added patch endpoint for custom script

JanssenProject · Apr 20, 2022 · e274e20 · e274e20
1 parent f8da77d
commit e274e20
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/...server/src/main/java/io/jans/configapi/rest/resource/auth/CacheConfigurationResource.java b/...server/src/main/java/io/jans/configapi/rest/resource/auth/CacheConfigurationResource.java
@@ -26,18 +26,13 @@
 import java.io.IOException;
 import java.util.function.Function;
 
-import org.slf4j.Logger;
-
 @Path(ApiConstants.CONFIG + ApiConstants.CACHE)
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
 public class CacheConfigurationResource extends ConfigBaseResource {
 
     private static final String ERROR_MSG = "Unable to apply patch.";
 
-    @Inject
-    Logger logger;
-
     @Inject
     ConfigurationService configurationService;
 
@@ -74,7 +69,7 @@ public Response patchCacheConfiguration(@NotNull String requestString) {
             try {
                 return Jackson.applyPatch(requestString, cache);
             } catch (IOException | JsonPatchException e) {
-                throw new RuntimeException(ERROR_MSG, e);
+                throw new InternalServerErrorException(ERROR_MSG, e);
             }
         });
         return Response.ok(modifiedCache).build();
@@ -111,7 +106,7 @@ public Response patchRedisConfiguration(@NotNull String requestString) {
                         Jackson.applyPatch(requestString, loadCacheConfiguration().getRedisConfiguration()));
                 return cache;
             } catch (IOException | JsonPatchException e) {
-                throw new RuntimeException(ERROR_MSG, e);
+                throw new InternalServerErrorException(ERROR_MSG, e);
             }
         });
         return Response.ok(loadCacheConfiguration().getRedisConfiguration()).build();
@@ -148,7 +143,7 @@ public Response patchInMemoryConfiguration(@NotNull String requestString) {
                 cache.setInMemoryConfiguration(Jackson.applyPatch(requestString, cache.getInMemoryConfiguration()));
                 return cache;
             } catch (IOException | JsonPatchException e) {
-                throw new RuntimeException(ERROR_MSG, e);
+                throw new InternalServerErrorException(ERROR_MSG, e);
             }
         });
         return Response.ok(loadCacheConfiguration().getInMemoryConfiguration()).build();
@@ -187,7 +182,7 @@ public Response patchNativePersistenceConfiguration(@NotNull String requestStrin
                         Jackson.applyPatch(requestString, cache.getNativePersistenceConfiguration()));
                 return cache;
             } catch (IOException | JsonPatchException e) {
-                throw new RuntimeException(ERROR_MSG, e);
+                throw new InternalServerErrorException(ERROR_MSG, e);
             }
         });
         return Response.ok(loadCacheConfiguration().getNativePersistenceConfiguration()).build();
@@ -223,10 +218,10 @@ public Response patchMemcachedConfiguration(@NotNull String requestString) {
                 cache.setMemcachedConfiguration(Jackson.applyPatch(requestString, cache.getMemcachedConfiguration()));
                 return cache;
             } catch (IOException | JsonPatchException e) {
-                throw new RuntimeException(ERROR_MSG, e);
+                throw new InternalServerErrorException(ERROR_MSG, e);
             }
         });
         return Response.ok(loadCacheConfiguration().getMemcachedConfiguration()).build();
-    }
-
+    }   
+    
 }
diff --git a/...g-api/server/src/main/java/io/jans/configapi/rest/resource/auth/CustomScriptResource.java b/...g-api/server/src/main/java/io/jans/configapi/rest/resource/auth/CustomScriptResource.java
@@ -193,13 +193,18 @@ public Response deleteScript(@PathParam(ApiConstants.INUM) @NotNull String inum)
     @Path(ApiConstants.INUM_PATH)
     public Response patchAtribute(@PathParam(ApiConstants.INUM) @NotNull String inum, @NotNull String pathString)
             throws JsonPatchException, IOException {
-        log.debug(" Custom Script Resource to patch - inum:{} , pathString:{}", inum, pathString);
+        if (log.isDebugEnabled()) {
+            log.debug("Custom Script Resource to patch - inum:{} , pathString:{}", escapeLog(inum),
+                    escapeLog(pathString));
+        }
+
         CustomScript existingScript = customScriptService.getScriptByInum(inum);
         checkResourceNotNull(existingScript, CUSTOM_SCRIPT);
         existingScript = Jackson.applyPatch(pathString, existingScript);
         customScriptService.update(existingScript);
         existingScript = customScriptService.getScriptByInum(inum);
-        log.debug(" Custom Script Resource after patch - inum:{} , pathString:{}", inum, pathString);
+
+        log.debug(" Custom Script Resource after patch - existingScript:{}", existingScript);
         return Response.ok(existingScript).build();
     }
 

diff --git a/jans-config-api/shared/src/main/java/io/jans/configapi/core/rest/BaseResource.java b/jans-config-api/shared/src/main/java/io/jans/configapi/core/rest/BaseResource.java
@@ -13,6 +13,7 @@
 
 import javax.inject.Inject;
 import javax.ws.rs.BadRequestException;
+import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.core.Response;
 import java.util.List;
@@ -62,6 +63,10 @@ public static void checkNotEmpty(String attribute, String attributeName) {
     public static void thorwBadRequestException(String msg) {
         throw new BadRequestException(getBadRequestException(msg));
     }
+
+    public static void thorwInternalServerException(String msg) {
+        throw new InternalServerErrorException(getInternalServerException(msg));
+    }
 
     /**
      * @param attributeName