Merge pull request #125 from SpineEventEngine/msg-validation-fixes

AlexanderLitus · AlexanderLitus · commit 5ae42af2a403 · 2016-04-18T13:21:09.000+03:00
Msg validation fixes
diff --git a/client/src/main/java/org/spine3/validate/Validate.java b/client/src/main/java/org/spine3/validate/Validate.java
@@ -24,7 +24,7 @@
 import com.google.protobuf.Timestamp;
 import org.spine3.base.CommandId;
 import org.spine3.base.EventId;
-import org.spine3.validation.options.ConstraintViolation;
+import org.spine3.validate.options.ConstraintViolation;
 
 import javax.annotation.Nullable;
 import java.util.List;
diff --git a/client/src/main/proto/spine/validation.proto b/client/src/main/proto/spine/validation.proto
@@ -32,7 +32,7 @@ syntax = "proto3";
 option java_generate_equals_and_hash = false;
 option java_multiple_files = true;
 option java_outer_classname = "ValidationProto";
-option java_package = "org.spine3.validation.options";
+option java_package = "org.spine3.validate.options";
 
 import "google/protobuf/descriptor.proto";
 import "google/protobuf/any.proto";
@@ -98,7 +98,7 @@ message RequiredOption {
     bool value = 1;
 
     // A user-defined validation error format message.
-    string msg = 2;
+    string msg_format = 2;
 }
 
 // The field value must be greater than (or equal to, if the `inclusive` parameter is true) the given minimum number.
@@ -124,7 +124,7 @@ message DecimalMinOption {
     bool inclusive = 2;
 
     // A user-defined validation error format message.
-    string msg = 3;
+    string msg_format = 3;
 }
 
 // The field value must be less than (or equal to, if the `inclusive` option is true) the given maximum number.
@@ -150,7 +150,7 @@ message DecimalMaxOption {
     bool inclusive = 2;
 
     // A user-defined validation error format message.
-    string msg = 3;
+    string msg_format = 3;
 }
 
 // The field value must be greater than or equal to the given minimum number.
@@ -170,7 +170,7 @@ message MinOption {
     string value = 1;
 
     // A user-defined validation error format message.
-    string msg = 2;
+    string msg_format = 2;
 }
 
 // The field value must be less than or equal to the given maximum number.
@@ -190,7 +190,7 @@ message MaxOption {
     string value = 1;
 
     // A user-defined validation error format message.
-    string msg = 2;
+    string msg_format = 2;
 }
 
 // The field value must be a number with the certain integral/fractional digit count.
@@ -218,7 +218,7 @@ message DigitsOption {
     int32 fraction_max = 2;
 
     // A user-defined validation error format message.
-    string msg = 3;
+    string msg_format = 3;
 }
 
 // The field value is a Timestamp which points to the moment in the future or the past.
@@ -238,7 +238,7 @@ message TimeOption {
     Time in = 1;
 
     // A user-defined validation error format message.
-    string msg = 2;
+    string msg_format = 2;
 }
 
 // This enumeration defines restriction for date/time values.
@@ -273,7 +273,7 @@ message PatternOption {
     int32 flag = 2;
 
     // A user-defined validation error format message.
-    string msg = 3;
+    string msg_format = 3;
 }
 
 // Specifies if the message field value is validated.
@@ -293,5 +293,5 @@ message ValidOption {
     bool value = 1;
 
     // A user-defined validation error format message.
-    string msg = 2;
+    string msg_format = 2;
 }
diff --git a/client/src/test/java/org/spine3/validate/ValidateShould.java b/client/src/test/java/org/spine3/validate/ValidateShould.java
@@ -29,7 +29,7 @@
 import org.spine3.base.Commands;
 import org.spine3.base.EventId;
 import org.spine3.base.Events;
-import org.spine3.validation.options.ConstraintViolation;
+import org.spine3.validate.options.ConstraintViolation;
 
 import static org.junit.Assert.*;
 import static org.spine3.protobuf.Values.newStringValue;
diff --git a/server/src/main/java/org/spine3/server/command/CommandBus.java b/server/src/main/java/org/spine3/server/command/CommandBus.java
@@ -37,7 +37,7 @@
 import org.spine3.server.internal.CommandHandlerMethod;
 import org.spine3.server.validate.MessageValidator;
 import org.spine3.type.CommandClass;
-import org.spine3.validation.options.ConstraintViolation;
+import org.spine3.validate.options.ConstraintViolation;
 
 import javax.annotation.CheckReturnValue;
 import java.lang.reflect.InvocationTargetException;
diff --git a/server/src/main/java/org/spine3/server/command/CommandValidation.java b/server/src/main/java/org/spine3/server/command/CommandValidation.java
@@ -29,7 +29,7 @@
 import org.spine3.base.Failure;
 import org.spine3.base.Response;
 import org.spine3.base.ValidationFailure;
-import org.spine3.validation.options.ConstraintViolation;
+import org.spine3.validate.options.ConstraintViolation;
 
 import java.util.List;
 import java.util.Map;
diff --git a/server/src/main/java/org/spine3/server/validate/ByteStringFieldValidator.java b/server/src/main/java/org/spine3/server/validate/ByteStringFieldValidator.java
@@ -24,7 +24,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import org.spine3.base.FieldPath;
-import org.spine3.validation.options.ConstraintViolation;
+import org.spine3.validate.options.ConstraintViolation;
 
 import java.util.List;
 
diff --git a/server/src/main/java/org/spine3/server/validate/FieldValidator.java b/server/src/main/java/org/spine3/server/validate/FieldValidator.java
@@ -28,9 +28,9 @@
 import com.google.protobuf.GeneratedMessage.GeneratedExtension;
 import com.google.protobuf.Message;
 import org.spine3.base.FieldPath;
-import org.spine3.validation.options.ConstraintViolation;
-import org.spine3.validation.options.RequiredOption;
-import org.spine3.validation.options.ValidationProto;
+import org.spine3.validate.options.ConstraintViolation;
+import org.spine3.validate.options.RequiredOption;
+import org.spine3.validate.options.ValidationProto;
 
 import java.util.List;
 
@@ -167,7 +167,7 @@ protected void addViolation(ConstraintViolation violation) {
     }
 
     private ConstraintViolation newViolation(RequiredOption option) {
-        final String msg = getErrorMsgFormat(option, option.getMsg());
+        final String msg = getErrorMsgFormat(option, option.getMsgFormat());
         final ConstraintViolation violation = ConstraintViolation.newBuilder()
                 .setMsgFormat(msg)
                 .setFieldPath(getFieldPath())
diff --git a/server/src/main/java/org/spine3/server/validate/FloatFieldValidatorBase.java b/server/src/main/java/org/spine3/server/validate/FloatFieldValidatorBase.java
@@ -23,7 +23,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import org.spine3.base.FieldPath;
-import org.spine3.validation.options.ConstraintViolation;
+import org.spine3.validate.options.ConstraintViolation;
 
 /**
  * A base for floating point number field validators.
diff --git a/server/src/main/java/org/spine3/server/validate/MessageFieldValidator.java b/server/src/main/java/org/spine3/server/validate/MessageFieldValidator.java
@@ -25,20 +25,20 @@
 import com.google.protobuf.Message;
 import com.google.protobuf.Timestamp;
 import org.spine3.base.FieldPath;
-import org.spine3.validation.options.ConstraintViolation;
-import org.spine3.validation.options.Time;
-import org.spine3.validation.options.TimeOption;
-import org.spine3.validation.options.ValidOption;
-import org.spine3.validation.options.ValidationProto;
+import org.spine3.validate.options.ConstraintViolation;
+import org.spine3.validate.options.Time;
+import org.spine3.validate.options.TimeOption;
+import org.spine3.validate.options.ValidOption;
+import org.spine3.validate.options.ValidationProto;
 
 import java.util.List;
 
 import static com.google.protobuf.util.TimeUtil.getCurrentTime;
 import static org.spine3.protobuf.Messages.toAny;
 import static org.spine3.protobuf.Timestamps.isAfter;
 import static org.spine3.validate.Validate.isDefault;
-import static org.spine3.validation.options.Time.FUTURE;
-import static org.spine3.validation.options.Time.UNDEFINED;
+import static org.spine3.validate.options.Time.FUTURE;
+import static org.spine3.validate.options.Time.UNDEFINED;
 
 /**
  * Validates fields of type {@link Message}.
@@ -128,7 +128,7 @@ private static boolean isTimeInvalid(Timestamp time, Time when, Timestamp now) {
     }
 
     private ConstraintViolation newTimeViolation(Timestamp fieldValue) {
-        final String msg = getErrorMsgFormat(timeOption, timeOption.getMsg());
+        final String msg = getErrorMsgFormat(timeOption, timeOption.getMsgFormat());
         final String when = timeOption.getIn().toString().toLowerCase();
         final ConstraintViolation violation = ConstraintViolation.newBuilder()
                 .setMsgFormat(msg)
@@ -140,7 +140,7 @@ private ConstraintViolation newTimeViolation(Timestamp fieldValue) {
     }
 
     private ConstraintViolation newValidViolation(Message fieldValue, Iterable<ConstraintViolation> violations) {
-        final String msg = getErrorMsgFormat(validOption, validOption.getMsg());
+        final String msg = getErrorMsgFormat(validOption, validOption.getMsgFormat());
         final ConstraintViolation violation = ConstraintViolation.newBuilder()
                 .setMsgFormat(msg)
                 .setFieldPath(getFieldPath())
diff --git a/server/src/main/java/org/spine3/server/validate/MessageValidator.java b/server/src/main/java/org/spine3/server/validate/MessageValidator.java
@@ -25,7 +25,7 @@
 import com.google.protobuf.Message;
 import org.spine3.Internal;
 import org.spine3.base.FieldPath;
-import org.spine3.validation.options.ConstraintViolation;
+import org.spine3.validate.options.ConstraintViolation;
 
 import java.util.List;
 
diff --git a/server/src/main/java/org/spine3/server/validate/NumberFieldValidator.java b/server/src/main/java/org/spine3/server/validate/NumberFieldValidator.java
@@ -27,13 +27,13 @@
 import com.google.protobuf.Int32Value;
 import com.google.protobuf.Message;
 import org.spine3.base.FieldPath;
-import org.spine3.validation.options.ConstraintViolation;
-import org.spine3.validation.options.DecimalMaxOption;
-import org.spine3.validation.options.DecimalMinOption;
-import org.spine3.validation.options.DigitsOption;
-import org.spine3.validation.options.MaxOption;
-import org.spine3.validation.options.MinOption;
-import org.spine3.validation.options.ValidationProto;
+import org.spine3.validate.options.ConstraintViolation;
+import org.spine3.validate.options.DecimalMaxOption;
+import org.spine3.validate.options.DecimalMinOption;
+import org.spine3.validate.options.DigitsOption;
+import org.spine3.validate.options.MaxOption;
+import org.spine3.validate.options.MinOption;
+import org.spine3.validate.options.ValidationProto;
 
 import java.util.List;
 import java.util.regex.Pattern;
@@ -112,19 +112,19 @@ protected boolean isValueNotSet(V value) {
     private void validateRangeOptions(V value) {
         if (notFitToDecimalMin(value)) {
             addViolation(
-                    newDecimalViolation(value, minDecimalOpt, minDecimalOpt.getMsg(),
+                    newDecimalViolation(value, minDecimalOpt, minDecimalOpt.getMsgFormat(),
                             minDecimalOpt.getInclusive(), minDecimalOpt.getValue()));
         }
         if (notFitToDecimalMax(value)) {
             addViolation(
-                    newDecimalViolation(value, maxDecimalOpt, maxDecimalOpt.getMsg(),
+                    newDecimalViolation(value, maxDecimalOpt, maxDecimalOpt.getMsgFormat(),
                             maxDecimalOpt.getInclusive(), maxDecimalOpt.getValue()));
         }
         if (notFitToMin(value)) {
-            addViolation(newMinOrMaxViolation(value, minOption, minOption.getMsg(), minOption.getValue()));
+            addViolation(newMinOrMaxViolation(value, minOption, minOption.getMsgFormat(), minOption.getValue()));
         }
         if (notFitToMax(value)) {
-            addViolation(newMinOrMaxViolation(value, maxOption, maxOption.getMsg(), maxOption.getValue()));
+            addViolation(newMinOrMaxViolation(value, maxOption, maxOption.getMsgFormat(), maxOption.getValue()));
         }
     }
 
@@ -219,7 +219,7 @@ private ConstraintViolation newMinOrMaxViolation(V value, Message option, String
     }
 
     private ConstraintViolation newDigitsViolation(V value) {
-        final String msg = getErrorMsgFormat(digitsOption, digitsOption.getMsg());
+        final String msg = getErrorMsgFormat(digitsOption, digitsOption.getMsgFormat());
         final String intMax = String.valueOf(digitsOption.getIntegerMax());
         final String fractionMax = String.valueOf(digitsOption.getFractionMax());
         final ConstraintViolation.Builder violation = ConstraintViolation.newBuilder()
diff --git a/server/src/main/java/org/spine3/server/validate/StringFieldValidator.java b/server/src/main/java/org/spine3/server/validate/StringFieldValidator.java
@@ -23,9 +23,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import org.spine3.base.FieldPath;
-import org.spine3.validation.options.ConstraintViolation;
-import org.spine3.validation.options.PatternOption;
-import org.spine3.validation.options.ValidationProto;
+import org.spine3.validate.options.ConstraintViolation;
+import org.spine3.validate.options.PatternOption;
+import org.spine3.validate.options.ValidationProto;
 
 import java.util.List;
 
@@ -75,7 +75,7 @@ private void checkIfMatchesToRegexp() {
     }
 
     private ConstraintViolation newViolation(String fieldValue) {
-        final String msg = getErrorMsgFormat(patternOption, patternOption.getMsg());
+        final String msg = getErrorMsgFormat(patternOption, patternOption.getMsgFormat());
         final ConstraintViolation violation = ConstraintViolation.newBuilder()
                 .setMsgFormat(msg)
                 .addParam(regex)
diff --git a/server/src/test/java/org/spine3/server/validate/FieldValidatorFactoryShould.java b/server/src/test/java/org/spine3/server/validate/FieldValidatorFactoryShould.java
@@ -28,9 +28,9 @@
 import com.google.protobuf.StringValue;
 import org.junit.Test;
 import org.spine3.base.FieldPath;
-import org.spine3.test.validation.msg.AnnotatedEnumFieldValue;
-import org.spine3.test.validation.msg.RequiredByteStringFieldValue;
-import org.spine3.test.validation.msg.RequiredMsgFieldValue;
+import org.spine3.test.validate.msg.AnnotatedEnumFieldValue;
+import org.spine3.test.validate.msg.RequiredByteStringFieldValue;
+import org.spine3.test.validate.msg.RequiredMsgFieldValue;
 
 import static com.google.protobuf.Descriptors.FieldDescriptor;
 import static org.junit.Assert.assertTrue;
diff --git a/server/src/test/java/org/spine3/server/validate/MessageValidatorShould.java b/server/src/test/java/org/spine3/server/validate/MessageValidatorShould.java
@@ -30,33 +30,33 @@
 import org.spine3.base.FieldPath;
 import org.spine3.protobuf.Durations;
 import org.spine3.protobuf.Values;
-import org.spine3.test.validation.msg.AnnotatedBooleanFieldValue;
-import org.spine3.test.validation.msg.AnnotatedEnumFieldValue;
-import org.spine3.test.validation.msg.DecimalMaxIncNumberFieldValue;
-import org.spine3.test.validation.msg.DecimalMaxNotIncNumberFieldValue;
-import org.spine3.test.validation.msg.DecimalMinIncNumberFieldValue;
-import org.spine3.test.validation.msg.DecimalMinNotIncNumberFieldValue;
-import org.spine3.test.validation.msg.DigitsCountNumberFieldValue;
-import org.spine3.test.validation.msg.EnclosedMessageFieldValue;
-import org.spine3.test.validation.msg.EnclosedMessageWithoutAnnotationFieldValue;
-import org.spine3.test.validation.msg.EntityIdByteStringFieldValue;
-import org.spine3.test.validation.msg.EntityIdDoubleFieldValue;
-import org.spine3.test.validation.msg.EntityIdIntFieldValue;
-import org.spine3.test.validation.msg.EntityIdLongFieldValue;
-import org.spine3.test.validation.msg.EntityIdMsgFieldValue;
-import org.spine3.test.validation.msg.EntityIdRepeatedFieldValue;
-import org.spine3.test.validation.msg.EntityIdStringFieldValue;
-import org.spine3.test.validation.msg.MaxNumberFieldValue;
-import org.spine3.test.validation.msg.MinNumberFieldValue;
-import org.spine3.test.validation.msg.PatternStringFieldValue;
-import org.spine3.test.validation.msg.RepeatedRequiredMsgFieldValue;
-import org.spine3.test.validation.msg.RequiredByteStringFieldValue;
-import org.spine3.test.validation.msg.RequiredMsgFieldValue;
-import org.spine3.test.validation.msg.RequiredStringFieldValue;
-import org.spine3.test.validation.msg.TimeInFutureFieldValue;
-import org.spine3.test.validation.msg.TimeInPastFieldValue;
-import org.spine3.test.validation.msg.TimeWithoutOptsFieldValue;
-import org.spine3.validation.options.ConstraintViolation;
+import org.spine3.test.validate.msg.AnnotatedBooleanFieldValue;
+import org.spine3.test.validate.msg.AnnotatedEnumFieldValue;
+import org.spine3.test.validate.msg.DecimalMaxIncNumberFieldValue;
+import org.spine3.test.validate.msg.DecimalMaxNotIncNumberFieldValue;
+import org.spine3.test.validate.msg.DecimalMinIncNumberFieldValue;
+import org.spine3.test.validate.msg.DecimalMinNotIncNumberFieldValue;
+import org.spine3.test.validate.msg.DigitsCountNumberFieldValue;
+import org.spine3.test.validate.msg.EnclosedMessageFieldValue;
+import org.spine3.test.validate.msg.EnclosedMessageWithoutAnnotationFieldValue;
+import org.spine3.test.validate.msg.EntityIdByteStringFieldValue;
+import org.spine3.test.validate.msg.EntityIdDoubleFieldValue;
+import org.spine3.test.validate.msg.EntityIdIntFieldValue;
+import org.spine3.test.validate.msg.EntityIdLongFieldValue;
+import org.spine3.test.validate.msg.EntityIdMsgFieldValue;
+import org.spine3.test.validate.msg.EntityIdRepeatedFieldValue;
+import org.spine3.test.validate.msg.EntityIdStringFieldValue;
+import org.spine3.test.validate.msg.MaxNumberFieldValue;
+import org.spine3.test.validate.msg.MinNumberFieldValue;
+import org.spine3.test.validate.msg.PatternStringFieldValue;
+import org.spine3.test.validate.msg.RepeatedRequiredMsgFieldValue;
+import org.spine3.test.validate.msg.RequiredByteStringFieldValue;
+import org.spine3.test.validate.msg.RequiredMsgFieldValue;
+import org.spine3.test.validate.msg.RequiredStringFieldValue;
+import org.spine3.test.validate.msg.TimeInFutureFieldValue;
+import org.spine3.test.validate.msg.TimeInPastFieldValue;
+import org.spine3.test.validate.msg.TimeWithoutOptsFieldValue;
+import org.spine3.validate.options.ConstraintViolation;
 
 import java.util.List;
 
diff --git a/server/src/test/proto/spine/test/validate/msg/commands.proto b/server/src/test/proto/spine/test/validate/msg/commands.proto
@@ -19,12 +19,12 @@
 //
 syntax = "proto3";
 
-package spine.test.validation.msg;
+package spine.test.validate.msg;
 
 option java_generate_equals_and_hash = true;
 option java_multiple_files = true;
 option java_outer_classname = "ValidationTestCommandsProto";
-option java_package = "org.spine3.test.validation.msg";
+option java_package = "org.spine3.test.validate.msg";
 
 import "google/protobuf/wrappers.proto";
 import "spine/validation.proto";
diff --git a/server/src/test/proto/spine/test/validate/msg/messages.proto b/server/src/test/proto/spine/test/validate/msg/messages.proto
@@ -19,12 +19,12 @@
 //
 syntax = "proto3";
 
-package spine.test.validation.msg;
+package spine.test.validate.msg;
 
 option java_generate_equals_and_hash = true;
 option java_multiple_files = true;
 option java_outer_classname = "ValidationTestMessagesProto";
-option java_package = "org.spine3.test.validation.msg";
+option java_package = "org.spine3.test.validate.msg";
 
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
diff --git a/server/src/test/proto/spine/test/validate/msg/stub_aggregate.proto b/server/src/test/proto/spine/test/validate/msg/stub_aggregate.proto
