Remove Lombok dependency

Author: bbakerman

build.gradle

@@ -73,9 +73,6 @@ dependencies {
     compile 'javax.validation:validation-api:1.1.0.Final'
     compile 'com.graphql-java:graphql-java:2.2.0'
 
-    // Remove some boilerplate
-    compile 'org.projectlombok:lombok:1.16.6'
-
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'
     compileOnly 'org.osgi:org.osgi.service.cm:1.5.0'

src/main/java/graphql/annotations/BatchedMethodDataFetcher.java

@@ -16,7 +16,6 @@
 
 import graphql.execution.batched.Batched;
 import graphql.schema.DataFetchingEnvironment;
-import lombok.SneakyThrows;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -36,7 +35,6 @@ public BatchedMethodDataFetcher(Method method, TypeFunction typeFunction) {
         }
     }
 
-    @SneakyThrows
     @Batched
     @Override
     public Object get(DataFetchingEnvironment environment) {

src/main/java/graphql/annotations/DefaultTypeFunction.java

@@ -19,7 +19,6 @@
 import graphql.schema.GraphQLList;
 import graphql.schema.GraphQLType;
 import graphql.schema.GraphQLTypeReference;
-import lombok.SneakyThrows;
 import org.osgi.service.component.annotations.*;
 
 import java.lang.reflect.AnnotatedParameterizedType;
@@ -166,7 +165,6 @@ public GraphQLType apply(Class<?> aClass, AnnotatedType annotatedType) {
     private class OptionalFunction implements TypeFunction {
 
         @Override
-        @SneakyThrows
         public GraphQLType apply(Class<?> aClass, AnnotatedType annotatedType) {
             if (!(annotatedType instanceof AnnotatedParameterizedType)) {
                 throw new IllegalArgumentException("Optional type parameter should be specified");
@@ -230,7 +228,6 @@ private class ObjectFunction implements TypeFunction {
         private final Map<String, GraphQLType> types = new ConcurrentHashMap<>();
 
         @Override
-        @SneakyThrows
         public GraphQLType apply(Class<?> aClass, AnnotatedType annotatedType) {
             GraphQLName name = aClass.getAnnotation(GraphQLName.class);
             String typeName = name == null ? aClass.getSimpleName() : name.value();

src/main/java/graphql/annotations/GraphQLAnnotations.java

@@ -39,7 +39,6 @@
 import java.lang.reflect.AnnotatedType;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Parameter;
@@ -53,6 +52,8 @@
 import java.util.stream.Collectors;
 
 import static graphql.Scalars.GraphQLBoolean;
+import static graphql.annotations.ReflectionKit.constructNewInstance;
+import static graphql.annotations.ReflectionKit.newInstance;
 import static graphql.schema.GraphQLArgument.newArgument;
 import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLInputObjectField.newInputObjectField;
@@ -316,7 +317,7 @@ protected GraphQLFieldDefinition getField(Field field) throws GraphQLAnnotations
 
         if (actualDataFetcher == null) {
 
-            StringBuffer fluentBuffer = new StringBuffer(field.getName());
+            StringBuilder fluentBuffer = new StringBuilder(field.getName());
             fluentBuffer.setCharAt(0, Character.toLowerCase(fluentBuffer.charAt(0)));
             String fluentGetter = fluentBuffer.toString();
 
@@ -428,25 +429,22 @@ protected GraphQLFieldDefinition getField(Method method) throws GraphQLAnnotatio
         TypeFunction finalTypeFunction = typeFunction;
         List<GraphQLArgument> args = Arrays.asList(method.getParameters()).stream().
                 filter(p -> !DataFetchingEnvironment.class.isAssignableFrom(p.getType())).
-                map(new Function<Parameter, GraphQLArgument>() {
-                    @Override
-                    public GraphQLArgument apply(Parameter parameter) {
-                        Class<?> t = parameter.getType();
-                        graphql.schema.GraphQLType graphQLType = finalTypeFunction.apply(t, parameter.getAnnotatedType());
-                        if (graphQLType instanceof GraphQLObjectType) {
-                            GraphQLInputObjectType inputObject = getInputObject((GraphQLObjectType) graphQLType);
-                            graphQLType = inputObject;
-                        }
-                        return getArgument(parameter, graphQLType);
+                map(parameter -> {
+                    Class<?> t = parameter.getType();
+                    graphql.schema.GraphQLType graphQLType = finalTypeFunction.apply(t, parameter.getAnnotatedType());
+                    if (graphQLType instanceof GraphQLObjectType) {
+                        GraphQLInputObjectType inputObject = getInputObject((GraphQLObjectType) graphQLType);
+                        graphQLType = inputObject;
                     }
+                    return getArgument(parameter, graphQLType);
                 }).collect(Collectors.toList());
 
         GraphQLFieldDefinition relay = null;
         if (method.isAnnotationPresent(GraphQLRelayMutation.class)) {
             if (!(outputType instanceof GraphQLObjectType || outputType instanceof GraphQLInterfaceType)) {
                 throw new RuntimeException("outputType should be an object or an interface");
             }
-            StringBuffer titleBuffer = new StringBuffer(method.getName());
+            StringBuilder titleBuffer = new StringBuilder(method.getName());
             titleBuffer.setCharAt(0, Character.toUpperCase(titleBuffer.charAt(0)));
             String title = titleBuffer.toString();
             List<GraphQLFieldDefinition> fieldDefinitions = outputType instanceof GraphQLObjectType ?
@@ -613,21 +611,4 @@ public GraphQLObjectType getType(Object object) {
             }
         }
     }
-
-    private <T> T newInstance(Class<T> clazz) throws GraphQLAnnotationsException {
-        try {
-            return clazz.newInstance();
-        } catch (InstantiationException | IllegalAccessException e) {
-            throw new GraphQLAnnotationsException("Unable to instantiate class : " + clazz, e);
-        }
-    }
-
-    private static <T> T constructNewInstance(Constructor<T> constructor, Object... args) throws GraphQLAnnotationsException {
-        try {
-            return constructor.newInstance(args);
-
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
-            throw new GraphQLAnnotationsException("Unable to instantiate via constructor : " + constructor, e);
-        }
-    }
 }

src/main/java/graphql/annotations/GraphQLObjectTypeWrapper.java

@@ -15,11 +15,9 @@
 package graphql.annotations;
 
 import graphql.schema.GraphQLObjectType;
-import lombok.Getter;
 
 public class GraphQLObjectTypeWrapper extends GraphQLObjectType implements GraphQLObjectBackedByClass {
 
-    @Getter
     private final Class<?> objectClass;
 
     public GraphQLObjectTypeWrapper(Class<?> objectClass, GraphQLObjectType objectType) {
@@ -28,6 +26,11 @@ public GraphQLObjectTypeWrapper(Class<?> objectClass, GraphQLObjectType objectTy
         this.objectClass = objectClass;
     }
 
+    @Override
+    public Class<?> getObjectClass() {
+        return objectClass;
+    }
+
     @Override
     public boolean equals(Object obj) {
         return obj instanceof GraphQLObjectType &&

src/main/java/graphql/annotations/MethodDataFetcher.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,10 +17,20 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.GraphQLObjectType;
-import lombok.SneakyThrows;
 
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import static graphql.annotations.ReflectionKit.constructNewInstance;
+import static graphql.annotations.ReflectionKit.constructor;
+import static graphql.annotations.ReflectionKit.newInstance;
 
 class MethodDataFetcher implements DataFetcher {
     private final Method method;
@@ -35,7 +45,6 @@ public MethodDataFetcher(Method method, TypeFunction typeFunction) {
         this.typeFunction = typeFunction;
     }
 
-    @SneakyThrows
     @Override
     public Object get(DataFetchingEnvironment environment) {
         try {
@@ -49,17 +58,16 @@ public Object get(DataFetchingEnvironment environment) {
                     return null;
                 }
             } else {
-                obj = method.getDeclaringClass().newInstance();
+                obj = newInstance(method.getDeclaringClass());
             }
             return method.invoke(obj, invocationArgs(environment));
         } catch (IllegalAccessException | InvocationTargetException e) {
             throw new RuntimeException(e);
         }
     }
 
-    @SneakyThrows
     private Object[] invocationArgs(DataFetchingEnvironment environment) {
-        List result = new ArrayList();
+        List<Object> result = new ArrayList<>();
         Iterator envArgs = environment.getArguments().values().iterator();
         for (Parameter p : method.getParameters()) {
             Class<?> paramType = p.getType();
@@ -69,8 +77,8 @@ private Object[] invocationArgs(DataFetchingEnvironment environment) {
             }
             graphql.schema.GraphQLType graphQLType = typeFunction.apply(paramType, p.getAnnotatedType());
             if (graphQLType instanceof GraphQLObjectType) {
-                Constructor<?> constructor = paramType.getConstructor(HashMap.class);
-                result.add(constructor.newInstance(envArgs.next()));
+                Constructor<?> constructor = constructor(paramType, HashMap.class);
+                result.add(constructNewInstance(constructor, envArgs.next()));
 
             } else {
                 result.add(envArgs.next());

src/main/java/graphql/annotations/ReflectionKit.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
+package graphql.annotations;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * A package level helper in calling reflective methods and turning them into
+ * GraphQLAnnotationsException runtime exceptions
+ */
+class ReflectionKit {
+    static <T> T newInstance(Class<T> clazz) throws GraphQLAnnotationsException {
+        try {
+            return clazz.newInstance();
+        } catch (InstantiationException | IllegalAccessException e) {
+            throw new GraphQLAnnotationsException("Unable to instantiate class : " + clazz, e);
+        }
+    }
+
+    static <T> T constructNewInstance(Constructor<T> constructor, Object... args) throws GraphQLAnnotationsException {
+        try {
+            return constructor.newInstance(args);
+
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+            throw new GraphQLAnnotationsException("Unable to instantiate via constructor : " + constructor, e);
+        }
+    }
+
+    static <T> Constructor<T> constructor(Class<T> type, Class<?>... parameterTypes) {
+        try {
+            return type.getConstructor(parameterTypes);
+        } catch (NoSuchMethodException e) {
+            throw new GraphQLAnnotationsException("Unable to find constructor", e);
+        }
+    }
+
+}

src/test/java/graphql/annotations/DefaultTypeFunctionTest.java

@@ -16,10 +16,8 @@
 
 import graphql.schema.*;
 import graphql.schema.GraphQLType;
-import lombok.SneakyThrows;
 import org.testng.annotations.Test;
 
-import java.lang.reflect.AnnotatedParameterizedType;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
@@ -89,15 +87,15 @@ public void long_() {
 
 
     @SuppressWarnings("unused")
-    public List<List<@GraphQLNonNull String>> listMethod() { return null;};
+    public List<List<@GraphQLNonNull String>> listMethod() { return null;}
 
     @SuppressWarnings("unused")
-    public Stream<List<@GraphQLNonNull String>> streamMethod() { return null;};
+    public Stream<List<@GraphQLNonNull String>> streamMethod() { return null;}
 
     @Test
     public void list() throws NoSuchMethodException {
         DefaultTypeFunction instance = new DefaultTypeFunction();
-        graphql.schema.GraphQLType type = instance.apply(getClass().getMethod("listMethod").getReturnType(), (AnnotatedParameterizedType) getClass().getMethod("listMethod").getAnnotatedReturnType());
+        graphql.schema.GraphQLType type = instance.apply(getClass().getMethod("listMethod").getReturnType(), getClass().getMethod("listMethod").getAnnotatedReturnType());
         assertTrue(type instanceof GraphQLList);
         GraphQLList subtype = (GraphQLList) ((GraphQLList) type).getWrappedType();
         assertTrue(subtype.getWrappedType() instanceof graphql.schema.GraphQLNonNull);
@@ -115,7 +113,7 @@ public void unparametrizedList() {
     @Test
     public void stream() throws NoSuchMethodException {
         DefaultTypeFunction instance = new DefaultTypeFunction();
-        graphql.schema.GraphQLType type = instance.apply(getClass().getMethod("streamMethod").getReturnType(), (AnnotatedParameterizedType) getClass().getMethod("listMethod").getAnnotatedReturnType());
+        graphql.schema.GraphQLType type = instance.apply(getClass().getMethod("streamMethod").getReturnType(), getClass().getMethod("listMethod").getAnnotatedReturnType());
         assertTrue(type instanceof GraphQLList);
         GraphQLList subtype = (GraphQLList) ((GraphQLList) type).getWrappedType();
         assertTrue(subtype.getWrappedType() instanceof graphql.schema.GraphQLNonNull);
@@ -124,12 +122,12 @@ public void stream() throws NoSuchMethodException {
     }
 
     @SuppressWarnings("unused")
-    public Optional<List<@GraphQLNonNull String>> optionalMethod() { return Optional.empty();};
+    public Optional<List<@GraphQLNonNull String>> optionalMethod() { return Optional.empty();}
 
     @Test
     public void optional() throws NoSuchMethodException {
         DefaultTypeFunction instance = new DefaultTypeFunction();
-        graphql.schema.GraphQLType type = instance.apply(getClass().getMethod("optionalMethod").getReturnType(), (AnnotatedParameterizedType) getClass().getMethod("listMethod").getAnnotatedReturnType());
+        graphql.schema.GraphQLType type = instance.apply(getClass().getMethod("optionalMethod").getReturnType(), getClass().getMethod("listMethod").getAnnotatedReturnType());
         assertTrue(type instanceof GraphQLList);
         GraphQLType subtype = ((GraphQLList) type).getWrappedType();
         assertTrue(subtype instanceof graphql.schema.GraphQLNonNull);
@@ -157,8 +155,8 @@ public static class Class2 {
         public Class2 class2;
     }
 
-    @Test @SneakyThrows
-    public void recursiveTypes() {
+    @Test
+    public void recursiveTypes() throws Exception {
         DefaultTypeFunction instance = (DefaultTypeFunction) GraphQLAnnotations.getInstance().defaultTypeFunction;
         GraphQLType type = instance.apply(Class1.class, Class2.class.getField("class1").getAnnotatedType());
         GraphQLFieldDefinition class1class2 = ((GraphQLObjectType) type).getFieldDefinition("class2");

src/test/java/graphql/annotations/GraphQLBatchedTest.java

@@ -20,7 +20,6 @@
 import graphql.execution.batched.BatchedExecutionStrategy;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
-import lombok.SneakyThrows;
 import org.testng.annotations.Test;
 
 import java.util.Arrays;
@@ -32,6 +31,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+@SuppressWarnings("unchecked")
 public class GraphQLBatchedTest {
     private static class SimpleBatchedField {
         @GraphQLField
@@ -49,8 +49,7 @@ public List<SimpleBatchedField> fields() {
     }
 
     @Test
-    @SneakyThrows
-    public void batchedDataFetcher() {
+    public void batchedDataFetcher() throws Throwable {
         GraphQLObjectType nestedObject = GraphQLAnnotations.object(SimpleBatchedField.class);
         assertEquals(nestedObject.getFieldDefinition("a").getType(), GraphQLString);
 
@@ -77,7 +76,7 @@ public List<String> a() {
         }
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class) @SneakyThrows
+    @Test(expectedExceptions = IllegalArgumentException.class)
     public void noStaticField() {
         GraphQLObjectType object = GraphQLAnnotations.object(NoStaticBatchedField.class);
     }
@@ -90,7 +89,7 @@ public String a() {
         }
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class) @SneakyThrows
+    @Test(expectedExceptions = IllegalArgumentException.class)
     public void noListField() {
         GraphQLObjectType object = GraphQLAnnotations.object(NoStaticBatchedField.class);
     }
@@ -103,7 +102,7 @@ public List a() {
         }
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class) @SneakyThrows
+    @Test(expectedExceptions = IllegalArgumentException.class)
     public void noParameterizedReturnField() {
         GraphQLObjectType object = GraphQLAnnotations.object(NoStaticBatchedField.class);
     }