some renamings

icatproject · May 16, 2024 · fdfd88e · fdfd88e
1 parent 6a8bced
commit fdfd88e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/src/main/java/org/icatproject/ids/requestHandlers/PrepareDataHandler.java b/src/main/java/org/icatproject/ids/requestHandlers/PrepareDataHandler.java
@@ -68,7 +68,7 @@ public ValueContainer handleDataRequest(DataSelectionService dataSelectionServic
     }
 
     @Override
-    public String getCustomRequestParametersLogString() { 
+    public String addCustomParametersToLogString() { 
         return "zip='" + this.zip + "'' compress='" + compress + "'";
     }
 

diff --git a/src/main/java/org/icatproject/ids/requestHandlers/PutHandler.java b/src/main/java/org/icatproject/ids/requestHandlers/PutHandler.java
@@ -348,7 +348,7 @@ private Long registerDatafile(String sessionId, String name, long datafileFormat
         }
     }
 
-    public String getRequestParametersLogString() {
+    public String addParametersToLogString() {
         return "name='" + name + "' " + "datafileFormatId='"
             + datafileFormatIdString + "' " + "datasetId='" + datasetIdString + "' " + "description='"
             + description + "' " + "doi='" + doi + "' " + "datafileCreateTime='" + datafileCreateTimeString

diff --git a/src/main/java/org/icatproject/ids/requestHandlers/base/DataControllerBase.java b/src/main/java/org/icatproject/ids/requestHandlers/base/DataControllerBase.java
@@ -26,7 +26,7 @@ public abstract class DataControllerBase {
 
     public abstract void validateUUID() throws BadRequestException;
 
-    public abstract String getRequestParametersLogString();
+    public abstract String addParametersToLogString();
 
     public abstract void addParametersToTransmitterJSON(JsonGenerator gen) throws IcatException_Exception, BadRequestException;
 

diff --git a/src/main/java/org/icatproject/ids/requestHandlers/base/DataRequestHandler.java b/src/main/java/org/icatproject/ids/requestHandlers/base/DataRequestHandler.java
@@ -62,8 +62,9 @@ protected void addParametersToTransmitterJSON(JsonGenerator gen) throws IcatExce
 
     protected abstract ValueContainer handleDataRequest(DataSelectionService dataSelectionService) throws NotImplementedException, InternalException, BadRequestException, NotFoundException, InsufficientPrivilegesException, DataNotOnlineException;
 
-    protected String getRequestParametersLogString() {
-        return this.dataController.getRequestParametersLogString() + " " + this.getCustomRequestParametersLogString();
+    @Override
+    protected String addParametersToLogString() {
+        return this.dataController.addParametersToLogString() + " " + this.addCustomParametersToLogString();
     }
 
     /**
@@ -75,5 +76,5 @@ protected void addCustomParametersToTransmitterJSON(JsonGenerator gen) {}
     /**
      * Override this method in your concrete DataRequestHandler to add custom parameters to the log output.
      */
-    protected String getCustomRequestParametersLogString() { return "";}
+    protected String addCustomParametersToLogString() { return "";}
 }
diff --git a/src/main/java/org/icatproject/ids/requestHandlers/base/PreparedDataController.java b/src/main/java/org/icatproject/ids/requestHandlers/base/PreparedDataController.java
@@ -57,7 +57,7 @@ public void validateUUID() throws BadRequestException {
     }
 
     @Override
-    public String getRequestParametersLogString() {
+    public String addParametersToLogString() {
         return "preparedId = '" + preparedId;
     }
 

diff --git a/src/main/java/org/icatproject/ids/requestHandlers/base/RequestHandlerBase.java b/src/main/java/org/icatproject/ids/requestHandlers/base/RequestHandlerBase.java
@@ -81,7 +81,7 @@ public ValueContainer handle() throws BadRequestException, InternalException, In
 
         // some preprocessing
         long start = System.currentTimeMillis();
-        logger.info("New webservice request: " + this.requestType.toString().toLowerCase() + " " + this.getRequestParametersLogString());
+        logger.info("New webservice request: " + this.requestType.toString().toLowerCase() + " " + this.addParametersToLogString());
 
         // Do it
         ValueContainer result = this.handleRequest();
@@ -119,7 +119,7 @@ public String provideTransmissionBody() throws BadRequestException, IcatExceptio
      * Override to add additional parameters to the log output for the current request
      * @return
      */
-    protected String getRequestParametersLogString() { return ""; }
+    protected String addParametersToLogString() { return ""; }
 
     /**
      * Override to add additional parameters to the transmitter JSON

diff --git a/src/main/java/org/icatproject/ids/requestHandlers/base/UnpreparedDataController.java b/src/main/java/org/icatproject/ids/requestHandlers/base/UnpreparedDataController.java
@@ -33,7 +33,7 @@ public void validateUUID() throws BadRequestException {
     }
 
     @Override
-    public String getRequestParametersLogString() {
+    public String addParametersToLogString() {
         return "investigationIds='" + investigationIds + "' " + "datasetIds='"
         + datasetIds + "' " + "datafileIds='" + datafileIds + "'";
     }

diff --git a/.../org/icatproject/ids/requestHandlers/getSizeHandlers/GetSizeHandlerForFastProcessing.java b/.../org/icatproject/ids/requestHandlers/getSizeHandlers/GetSizeHandlerForFastProcessing.java
@@ -81,7 +81,7 @@ public CallType getCallType() {
         return CallType.INFO;
     }
 
-    public String getRequestParametersLogString() { return this.dataController.getRequestParametersLogString(); }
+    public String addParametersToLogString() { return this.dataController.addParametersToLogString(); }
 
     public void addParametersToTransmitterJSON(JsonGenerator gen) throws IcatException_Exception, BadRequestException {
         this.dataController.addParametersToTransmitterJSON(gen);