Merge pull request #244 from SpineEventEngine/yet-more-style

Yet more style

Author: alexander-aleksandrov

.idea/inspectionProfiles/Project_Default.xml

@@ -30,7 +30,7 @@
 import org.spine3.client.CommandFactory;
 import org.spine3.protobuf.AnyPacker;
 import org.spine3.protobuf.Timestamps;
-import org.spine3.protobuf.TypeUrl;
+import org.spine3.protobuf.TypeName;
 import org.spine3.time.ZoneOffset;
 import org.spine3.users.TenantId;
 import org.spine3.users.UserId;
@@ -229,8 +229,7 @@ public static String formatMessageTypeAndId(String format, Message commandMessag
         checkNotNull(format);
         checkNotEmptyOrBlank(format, "format string");
 
-        final String cmdType = TypeUrl.of(commandMessage)
-                                      .getTypeName();
+        final String cmdType = TypeName.of(commandMessage);
         final String id = idToString(commandId);
         final String result = String.format(format, cmdType, id);
         return result;

client/src/main/java/org/spine3/base/Commands.java

@@ -27,7 +27,7 @@
 import com.google.protobuf.Timestamp;
 import org.spine3.protobuf.AnyPacker;
 import org.spine3.protobuf.Timestamps;
-import org.spine3.protobuf.TypeUrl;
+import org.spine3.protobuf.TypeName;
 import org.spine3.users.UserId;
 
 import javax.annotation.Nullable;
@@ -275,8 +275,7 @@ public static <E extends Message> Optional<E> getEnrichment(Class<E> enrichmentC
             return Optional.absent();
         }
         final Enrichments enrichments = value.get();
-        final String typeName = TypeUrl.of(enrichmentClass)
-                                       .getTypeName();
+        final String typeName = TypeName.of(enrichmentClass);
         final Any any = enrichments.getMapMap()
                                    .get(typeName);
         if (any == null) {

client/src/main/java/org/spine3/base/Events.java

@@ -29,6 +29,7 @@
 import org.spine3.client.Target;
 import org.spine3.protobuf.AnyPacker;
 import org.spine3.protobuf.KnownTypes;
+import org.spine3.protobuf.TypeName;
 import org.spine3.protobuf.TypeUrl;
 
 import javax.annotation.Nullable;
@@ -191,11 +192,9 @@ public static Target allOf(Class<? extends Message> entityClass) {
             return result;
         }
 
-        /* package */
-        static Target composeTarget(Class<? extends Message> entityClass, @Nullable Set<? extends Message> ids) {
-            final TypeUrl type = TypeUrl.of(entityClass);
-
-            final boolean includeAll = ids == null;
+        /* package */ static Target composeTarget(Class<? extends Message> entityClass,
+                                                  @Nullable Set<? extends Message> ids) {
+            final boolean includeAll = (ids == null);
 
             final EntityIdFilter.Builder idFilterBuilder = EntityIdFilter.newBuilder();
 
@@ -213,7 +212,7 @@ static Target composeTarget(Class<? extends Message> entityClass, @Nullable Set<
                                                        .setIdFilter(idFilter)
                                                        .build();
             final Target.Builder builder = Target.newBuilder()
-                                                 .setType(type.getTypeName());
+                                                 .setType(TypeName.of(entityClass));
             if (includeAll) {
                 builder.setIncludeAll(true);
             } else {

client/src/main/java/org/spine3/base/Queries.java

@@ -30,13 +30,15 @@
  */
 /* package */ class Mismatches {
 
+    private static final String ERR_CANNOT_BE_EQUAL = "`expected` and `actual` cannot be equal in ValueMismatch";
+
     private Mismatches() {
         // Prevent instantiations.
     }
 
     /* package */ static void checkNotNullOrEqual(Object expected, Object actual) {
         checkNotNull(expected);
         checkNotNull(actual);
-        checkArgument(!expected.equals(actual), ErrorMessage.EXPECTED_AND_ACTUAL_CANNOT_BE_EQUAL);
+        checkArgument(!expected.equals(actual), ERR_CANNOT_BE_EQUAL);
     }
 }

client/src/main/java/org/spine3/change/Mismatches.java

@@ -25,9 +25,14 @@
  *
  * @author Alexander Yevsyukov
  */
-public interface ConnectionConstants {
+public class ConnectionConstants {
 
-    /** The default port number on which a client server runs. */
-    int DEFAULT_CLIENT_SERVICE_PORT = 50051;
+    /**
+     * The default port number on which a client server runs.
+     */
+    public static final int DEFAULT_CLIENT_SERVICE_PORT = 50051;
 
+    private ConnectionConstants() {
+        // Prevent instantiation.
+    }
 }

client/src/main/java/org/spine3/client/ConnectionConstants.java

@@ -45,7 +45,7 @@ private AnyPacker() {}
      * @return the instance of {@link Any} object that wraps given message
      */
     public static Any pack(Message message) {
-        final TypeUrl typeUrl = TypeUrl.of(message.getDescriptorForType());
+        final TypeUrl typeUrl = TypeUrl.from(message.getDescriptorForType());
         final String typeUrlPrefix = typeUrl.getPrefix();
         final Any result = Any.pack(message, typeUrlPrefix);
         return result;

client/src/main/java/org/spine3/protobuf/AnyPacker.java

@@ -309,7 +309,7 @@ private void put(Class<? extends GeneratedMessageV3> clazz) {
         }
 
         private void putEnum(EnumDescriptor desc, Class<? extends EnumLite> enumClass) {
-            final TypeUrl typeUrl = TypeUrl.of(desc);
+            final TypeUrl typeUrl = TypeUrl.from(desc);
             final ClassName className = ClassName.of(enumClass);
             put(typeUrl, className);
         }

client/src/main/java/org/spine3/protobuf/KnownTypes.java

@@ -177,7 +177,7 @@ public static Class<?> getFieldClass(FieldDescriptor field) {
                 final Class<? extends Message> enumClass = toMessageClass(TypeUrl.of(enumTypeName));
                 return enumClass;
             case MESSAGE:
-                final TypeUrl typeUrl = TypeUrl.of(field.getMessageType());
+                final TypeUrl typeUrl = TypeUrl.from(field.getMessageType());
                 final Class<? extends Message> msgClass = toMessageClass(typeUrl);
                 return msgClass;
             default:

client/src/main/java/org/spine3/protobuf/Messages.java

@@ -31,6 +31,8 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.protobuf.util.Timestamps.add;
+import static com.google.protobuf.util.Timestamps.fromMillis;
 import static com.google.protobuf.util.Timestamps.subtract;
 
 /**
@@ -120,7 +122,7 @@ public static Timestamp getCurrentTime() {
      * @return current system time
      */
     public static Timestamp systemTime() {
-        return com.google.protobuf.util.Timestamps.fromMillis(System.currentTimeMillis());
+        return fromMillis(System.currentTimeMillis());
     }
 
     /**
@@ -162,7 +164,7 @@ public static void resetProvider() {
     private static class SystemTimeProvider implements Provider {
         @Override
         public Timestamp getCurrentTime() {
-            final Timestamp result = com.google.protobuf.util.Timestamps.fromMillis(System.currentTimeMillis());
+            final Timestamp result = fromMillis(System.currentTimeMillis());
             return result;
         }
     }
@@ -274,12 +276,13 @@ public static long convertToNanos(TimestampOrBuilder timestamp) {
     }
 
     private static class TimestampComparator implements Comparator<Timestamp>, Serializable {
+
+        private static final long serialVersionUID = 0;
+
         @Override
         public int compare(Timestamp t1, Timestamp t2) {
             return Timestamps.compare(t1, t2);
         }
-
-        private static final long serialVersionUID = 0;
     }
 
 
@@ -313,7 +316,9 @@ public static Timestamp secondsAgo(long value) {
     }
 
     private static void checkPositive(long value) {
-        checkArgument(value > 0, "value must be positive");
+        if (value <= 0) {
+            throw new IllegalArgumentException(String.format("value must be positive. Passed: %d", value));
+        }
     }
 
     /**
@@ -326,7 +331,7 @@ private static void checkPositive(long value) {
     public static Timestamp secondsFromNow(int seconds) {
         checkPositive(seconds);
         final Timestamp currentTime = getCurrentTime();
-        final Timestamp result = com.google.protobuf.util.Timestamps.add(currentTime, Durations.ofSeconds(seconds));
+        final Timestamp result = add(currentTime, Durations.ofSeconds(seconds));
         return result;
     }
 }