move packages and use java8 compliant syntax

Author: fst-john

…slack/api/model/annotation/Required.java …/slack/api/util/annotation/Required.javaslack-api-model/src/main/java/com/slack/api/model/annotation/Required.java renamed to slack-api-model/src/main/java/com/slack/api/util/annotation/Required.java slack-api-model/src/main/java/com/slack/api/model/annotation/Required.java renamed to slack-api-model/src/main/java/com/slack/api/util/annotation/Required.java

@@ -1,7 +1,7 @@
-package com.slack.api.model.annotation;
+package com.slack.api.util.annotation;
 
-import com.slack.api.model.predicate.FieldPredicate;
-import com.slack.api.model.predicate.IsNotNullFieldPredicate;
+import com.slack.api.util.predicate.FieldPredicate;
+import com.slack.api.util.predicate.IsNotNullFieldPredicate;
 import com.slack.api.util.json.RequiredPropertyDetectionAdapterFactory;
 
 import java.lang.annotation.ElementType;

slack-api-model/src/main/java/com/slack/api/util/json/RequiredPropertyDetectionAdapterFactory.java

@@ -7,8 +7,8 @@
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import com.slack.api.model.predicate.FieldPredicate;
-import com.slack.api.model.annotation.Required;
+import com.slack.api.util.predicate.FieldPredicate;
+import com.slack.api.util.annotation.Required;
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 
@@ -22,7 +22,7 @@
 /**
  * Adapter factory for processing objects annotated with {@link Required}.  This annotation signals what properties
  * of a model object are required, and thus should be expected to be initialized on instantiated instances. For all
- * fields on the model objected annotated with {@link Required} applies the {@link FieldPredicate#test(Object)} via the
+ * fields on the model objected annotated with {@link Required} applies the {@link FieldPredicate#validate(Object)} via the
  * specified {@link Required#validator()}.
  * <p>
  * Note that this adapter handles both deserialization (JSON --> POJO) and serialization (POJO --> JSON).

…/api/model/predicate/FieldPredicate.java …k/api/util/predicate/FieldPredicate.javaslack-api-model/src/main/java/com/slack/api/model/predicate/FieldPredicate.java renamed to slack-api-model/src/main/java/com/slack/api/util/predicate/FieldPredicate.java slack-api-model/src/main/java/com/slack/api/model/predicate/FieldPredicate.java renamed to slack-api-model/src/main/java/com/slack/api/util/predicate/FieldPredicate.java

@@ -1,8 +1,8 @@
-package com.slack.api.model.predicate;
+package com.slack.api.util.predicate;
 
 /**
  * A functional interface for defining validation predicates against {@link java.lang.reflect.Field}.  Used by
- * {@link com.slack.api.model.annotation.Required} during object serialization and deserialization to ensure the
+ * {@link com.slack.api.util.annotation.Required} during object serialization and deserialization to ensure the
  * field member is "valid" per the defined predicate.
  */
 @FunctionalInterface

…l/predicate/IsNotNullFieldPredicate.java …l/predicate/IsNotNullFieldPredicate.javaslack-api-model/src/main/java/com/slack/api/model/predicate/IsNotNullFieldPredicate.java renamed to slack-api-model/src/main/java/com/slack/api/util/predicate/IsNotNullFieldPredicate.java slack-api-model/src/main/java/com/slack/api/model/predicate/IsNotNullFieldPredicate.java renamed to slack-api-model/src/main/java/com/slack/api/util/predicate/IsNotNullFieldPredicate.java

@@ -1,4 +1,4 @@
-package com.slack.api.model.predicate;
+package com.slack.api.util.predicate;
 
 import java.util.Objects;
 

slack-api-model/src/test/java/test_locally/util/JSONUtilityTest.java

@@ -1,7 +1,6 @@
 package test_locally.util;
 
 import com.google.gson.*;
-import com.slack.api.model.predicate.FieldPredicate;
 import com.slack.api.model.block.ContextBlockElement;
 import com.slack.api.model.block.DividerBlock;
 import com.slack.api.model.block.LayoutBlock;
@@ -12,14 +11,16 @@
 import com.slack.api.model.block.element.ImageElement;
 import com.slack.api.model.block.element.OverflowMenuElement;
 import com.slack.api.model.event.FunctionExecutedEvent;
-import com.slack.api.model.annotation.Required;
+import com.slack.api.util.annotation.Required;
 import com.slack.api.util.json.*;
+import com.slack.api.util.predicate.FieldPredicate;
 import lombok.Builder;
 import lombok.Data;
 import org.junit.Test;
 import test_locally.unit.GsonFactory;
 
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -202,7 +203,7 @@ public void testRequiredPropertyDetectionAdapterFactory_basicCase_happyPath() {
     @Test
     public void testRequiredPropertyDetectionAdapterFactory_advancedCase_failureCases() {
         Gson gson = GsonFactory.createSnakeCaseWithRequiredPropertyDetection();
-
+        List<String> users = new ArrayList<>();
         // Serialization
         JsonParseException e = assertThrows(JsonParseException.class, () -> gson.toJson(TestClassWithRequiredAdvanced.builder().build()));
         assertThat(e.getMessage(), equalToIgnoringCase("Required field 'id' failed validation in TestClassWithRequiredAdvanced using predicate IntegerGreaterThanZero"));
@@ -216,7 +217,8 @@ public void testRequiredPropertyDetectionAdapterFactory_advancedCase_failureCase
         e = assertThrows(JsonParseException.class, () -> gson.toJson(TestClassWithRequiredAdvanced.builder().id(1).name("Hello").build()));
         assertThat(e.getMessage(), equalToIgnoringCase("Required field 'users' failed validation in TestClassWithRequiredAdvanced using predicate NonEmptyCollection"));
 
-        e = assertThrows(JsonParseException.class, () -> gson.toJson(TestClassWithRequiredAdvanced.builder().id(1).name("Hello").users(List.of("user1")).build()));
+        users.add("user1");
+        e = assertThrows(JsonParseException.class, () -> gson.toJson(TestClassWithRequiredAdvanced.builder().id(1).name("Hello").users(users).build()));
         assertThat(e.getMessage(), equalToIgnoringCase("Required field 'myBool' failed validation in TestClassWithRequiredAdvanced using predicate isNotNullFieldPredicate"));
 
         // Deserialization
@@ -239,10 +241,12 @@ public void testRequiredPropertyDetectionAdapterFactory_advancedCase_failureCase
     @Test
     public void testRequiredPropertyDetectionAdapterFactory_advancedCase_happyPath() {
         Gson gson = GsonFactory.createSnakeCaseWithRequiredPropertyDetection();
+        List<String> users = new ArrayList<>();
+        users.add("testUser");
         TestClassWithRequiredAdvanced instance = TestClassWithRequiredAdvanced.builder()
                 .id(1)
                 .name("test")
-                .users(List.of("testUser"))
+                .users(users)
                 .myBool(true)
                 .build();