- split ILLEGAL_PARAMETER to ILLEGAL_MESSAGE_NAME_LENGTH & ILLEGAL_MESSAGE_CONTENT_LENGTH

Author: keinproblem

sampling-message-proto/src/main/proto/service.proto

@@ -86,6 +86,7 @@ enum StatusCode {
     SUCCESS = 1;
     CONFLICT = 2;
     NOT_FOUND = 3;
-    ILLEGAL_PARAMETER = 4;
-    MESSAGE_COUNT_EXCEEDED = 5;
+    ILLEGAL_MESSAGE_NAME_LENGTH = 4;
+    ILLEGAL_MESSAGE_CONTENT_LENGTH = 5;
+    MESSAGE_COUNT_EXCEEDED = 6;
 }

sampling-message-server/src/it/java/de/dhbw/ravensburg/verteiltesysteme/server/SamplingMessageServerIT.java

@@ -286,15 +286,15 @@ public void exceedMaxMessageNameLengthAtCreation() {
         final String tooLongMsgName = String.join("", Collections.nCopies(maxSamplingMessageNameLength + 1, "x"));
         SamplingMessageGrpcService.CreateSamplingMessageRequest createSamplingMessageRequest = createSamplingMessageRequest(tooLongMsgName, 120);
         SamplingMessageGrpcService.CreateSamplingMessageResponse createSamplingMessageResponse = this.samplingMessageBlockingStub.createSamplingMessage(createSamplingMessageRequest);
-        Assert.assertEquals(createSamplingMessageResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_PARAMETER);
+        Assert.assertEquals(createSamplingMessageResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_MESSAGE_NAME_LENGTH);
     }
 
     @Test
     public void exceedMaxMessageNameLengthAtGetingStatus() {
         final String tooLongMsgName = String.join("", Collections.nCopies(maxSamplingMessageNameLength + 1, "x"));
         SamplingMessageGrpcService.GetSamplingMessageStatusRequest getSamplingMessageStatusRequest = getSamplingMessageStatusRequest(tooLongMsgName);
         SamplingMessageGrpcService.GetSamplingMessageStatusResponse getSamplingMessageStatusResponse = this.samplingMessageBlockingStub.getSamplingMessageStatus(getSamplingMessageStatusRequest);
-        Assert.assertEquals(getSamplingMessageStatusResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_PARAMETER);
+        Assert.assertEquals(getSamplingMessageStatusResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_MESSAGE_NAME_LENGTH);
         Assert.assertFalse(getSamplingMessageStatusResponse.getMessageIsEmpty());
         Assert.assertFalse(getSamplingMessageStatusResponse.getMessageIsValid());
     }
@@ -304,7 +304,7 @@ public void exceedMaxMessageNameLengthAtRading() {
         final String tooLongMsgName = String.join("", Collections.nCopies(maxSamplingMessageNameLength + 1, "x"));
         SamplingMessageGrpcService.ReadSamplingMessageRequest readSamplingMessageRequest = readSamplingMessageRequest(tooLongMsgName);
         SamplingMessageGrpcService.ReadSamplingMessageResponse readSamplingMessageResponse = this.samplingMessageBlockingStub.readSamplingMessage(readSamplingMessageRequest);
-        Assert.assertEquals(readSamplingMessageResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_PARAMETER);
+        Assert.assertEquals(readSamplingMessageResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_MESSAGE_NAME_LENGTH);
         Assert.assertFalse(readSamplingMessageResponse.getMessageIsValid());
     }
 
@@ -313,7 +313,7 @@ public void exceedMaxMessageNameLengthAtClearing() {
         final String tooLongMsgName = String.join("", Collections.nCopies(maxSamplingMessageNameLength + 1, "x"));
         SamplingMessageGrpcService.ClearSamplingMessageRequest clearSamplingMessageRequest = clearSamplingMessageRequest(tooLongMsgName);
         SamplingMessageGrpcService.ClearSamplingMessageResponse clearSamplingMessageResponse = this.samplingMessageBlockingStub.clearSamplingMessage(clearSamplingMessageRequest);
-        Assert.assertEquals(clearSamplingMessageResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_PARAMETER);
+        Assert.assertEquals(clearSamplingMessageResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_MESSAGE_NAME_LENGTH);
     }
 
     @Test
@@ -322,15 +322,15 @@ public void exceedMaxMessageNameLengthAtWriting() {
         final String msgContent = "random";
         SamplingMessageGrpcService.WriteSamplingMessageRequest writeSamplingMessageRequest = writeSamplingMessageRequest(tooLongMsgName, msgContent);
         SamplingMessageGrpcService.WriteSamplingMessageResponse writeSamplingMessageResponse = this.samplingMessageBlockingStub.writeSamplingMessage(writeSamplingMessageRequest);
-        Assert.assertEquals(writeSamplingMessageResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_PARAMETER);
+        Assert.assertEquals(writeSamplingMessageResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_MESSAGE_NAME_LENGTH);
     }
 
     @Test
     public void exceedMaxMessageNameLengthAtDeleting() {
         final String tooLongMsgName = String.join("", Collections.nCopies(maxSamplingMessageNameLength + 1, "x"));
         SamplingMessageGrpcService.DeleteSamplingMessageRequest deleteSamplingMessageRequest = deleteSamplingMessageRequest(tooLongMsgName);
         SamplingMessageGrpcService.DeleteSamplingMessageResponse deleteSamplingMessageResponse = this.samplingMessageBlockingStub.deleteSamplingMessage(deleteSamplingMessageRequest);
-        Assert.assertEquals(deleteSamplingMessageResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_PARAMETER);
+        Assert.assertEquals(deleteSamplingMessageResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_MESSAGE_NAME_LENGTH);
     }
 
 
@@ -345,7 +345,7 @@ public void exceedMaxMessageContentLength() {
 
         SamplingMessageGrpcService.WriteSamplingMessageRequest writeSamplingMessageRequest = writeSamplingMessageRequest(msgName, tooLongMsgContent);
         SamplingMessageGrpcService.WriteSamplingMessageResponse writeSamplingMessageResponse = this.samplingMessageBlockingStub.writeSamplingMessage(writeSamplingMessageRequest);
-        Assert.assertEquals(writeSamplingMessageResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_PARAMETER);
+        Assert.assertEquals(writeSamplingMessageResponse.getStatusCode(), SamplingMessageGrpcService.StatusCode.ILLEGAL_MESSAGE_CONTENT_LENGTH);
 
     }
 

sampling-message-server/src/main/java/de/dhbw/ravensburg/verteiltesysteme/server/rpc/RpcService.java

@@ -40,8 +40,10 @@ private static SamplingMessageGrpcService.StatusCode fromServiceResultStatus(fin
                 return SamplingMessageGrpcService.StatusCode.NOT_FOUND;
             case ALREADY_EXISTS:
                 return SamplingMessageGrpcService.StatusCode.CONFLICT;
-            case ILLEGAL_PARAMETER:
-                return SamplingMessageGrpcService.StatusCode.ILLEGAL_PARAMETER;
+            case ILLEGAL_MESSAGE_NAME_LENGTH:
+                return SamplingMessageGrpcService.StatusCode.ILLEGAL_MESSAGE_NAME_LENGTH;
+            case ILLEGAL_MESSAGE_CONTENT_LENGTH:
+                return SamplingMessageGrpcService.StatusCode.ILLEGAL_MESSAGE_CONTENT_LENGTH;
             case MSG_COUNT_EXCEEDED:
                 return SamplingMessageGrpcService.StatusCode.MESSAGE_COUNT_EXCEEDED;
             default:

sampling-message-server/src/main/java/de/dhbw/ravensburg/verteiltesysteme/server/service/SamplingMessageServiceImpl.java

@@ -31,7 +31,7 @@ public ServiceResult createSamplingMessage(@NonNull final String messageName, @N
 
         if (inputValidator.isInvalidMessageName(messageName)) {
             log.info(String.format("Invalid messageName provided: %s", messageName));
-            return new ServiceResult(ServiceResult.Status.ILLEGAL_PARAMETER);
+            return new ServiceResult(ServiceResult.Status.ILLEGAL_MESSAGE_NAME_LENGTH);
         }
 
         final long totalMessageCount = databaseAccessObject.getTotalMessageCount();
@@ -70,11 +70,11 @@ public ServiceResult writeSamplingMessage(@NonNull final String messageName, @No
 
         if (inputValidator.isInvalidMessageName(messageName)) {
             log.info(String.format("Invalid messageName provided: %s", messageName));
-            return new ServiceResult(ServiceResult.Status.ILLEGAL_PARAMETER);
+            return new ServiceResult(ServiceResult.Status.ILLEGAL_MESSAGE_NAME_LENGTH);
         }
         if (inputValidator.isInvalidMessageContent(messageContent)) {
             log.info(String.format("Invalid messageContent provided: %s", messageContent));
-            return new ServiceResult(ServiceResult.Status.ILLEGAL_PARAMETER);
+            return new ServiceResult(ServiceResult.Status.ILLEGAL_MESSAGE_CONTENT_LENGTH);
         }
 
         final ServiceResult serviceResult;
@@ -100,7 +100,7 @@ public ServiceResult clearSamplingMessage(@NonNull final String messageName) {
 
         if (inputValidator.isInvalidMessageName(messageName)) {
             log.info(String.format("Invalid messageName provided: %s", messageName));
-            return new ServiceResult(ServiceResult.Status.ILLEGAL_PARAMETER);
+            return new ServiceResult(ServiceResult.Status.ILLEGAL_MESSAGE_NAME_LENGTH);
         }
 
         final ServiceResult serviceResult;
@@ -129,7 +129,7 @@ public ServiceResult<SamplingMessage> readSamplingMessage(@NonNull final String
 
         if (inputValidator.isInvalidMessageName(messageName)) {
             log.info(String.format("Invalid messageName provided: %s", messageName));
-            return new ServiceResult<>(Optional.empty(), ServiceResult.Status.ILLEGAL_PARAMETER);
+            return new ServiceResult<>(Optional.empty(), ServiceResult.Status.ILLEGAL_MESSAGE_NAME_LENGTH);
         }
 
         final ServiceResult<SamplingMessage> serviceResult;
@@ -160,7 +160,7 @@ public ServiceResult<SamplingMessageStatus> getSamplingMessageStatus(@NonNull fi
 
         if (inputValidator.isInvalidMessageName(messageName)) {
             log.info(String.format("Invalid messageName provided: %s", messageName));
-            return new ServiceResult<>(Optional.empty(), ServiceResult.Status.ILLEGAL_PARAMETER);
+            return new ServiceResult<>(Optional.empty(), ServiceResult.Status.ILLEGAL_MESSAGE_NAME_LENGTH);
         }
 
         final ServiceResult<SamplingMessageStatus> serviceResult;
@@ -192,7 +192,7 @@ public ServiceResult deleteSamplingMessage(@NonNull final String messageName) {
 
         if (inputValidator.isInvalidMessageName(messageName)) {
             log.info(String.format("Invalid messageName provided: %s", messageName));
-            return new ServiceResult<>(Optional.empty(), ServiceResult.Status.ILLEGAL_PARAMETER);
+            return new ServiceResult<>(Optional.empty(), ServiceResult.Status.ILLEGAL_MESSAGE_NAME_LENGTH);
         }
         final ServiceResult serviceResult;
         if (databaseAccessObject.deleteSamplingMessage(messageName)) {

sampling-message-server/src/main/java/de/dhbw/ravensburg/verteiltesysteme/server/service/ServiceResult.java

@@ -19,7 +19,7 @@ public ServiceResult(Optional<T> resultItem, Status status) {
     }
 
     public enum Status {
-        SUCCESS, NOT_FOUND, ALREADY_EXISTS, MSG_COUNT_EXCEEDED, ILLEGAL_PARAMETER
+        SUCCESS, NOT_FOUND, ALREADY_EXISTS, MSG_COUNT_EXCEEDED, ILLEGAL_MESSAGE_NAME_LENGTH, ILLEGAL_MESSAGE_CONTENT_LENGTH
     }
 
     @Override