Remove lombok (fixes #24).

Author: apottere

build.gradle

@@ -25,6 +25,10 @@ repositories {
     mavenCentral()
 }
 
+configurations.all {
+    exclude group:"org.projectlombok", module: "lombok"
+}
+
 dependencies {
     compile 'org.slf4j:slf4j-api:1.7.21'
 
@@ -40,9 +44,6 @@ dependencies {
     testCompile 'org.springframework:spring-test:4.3.7.RELEASE' // MockHttpServletRequest, MockHttpServletResponse
     testRuntime 'org.springframework:spring-web:4.3.7.RELEASE'
 
-    // Remove boilerplate
-    compile 'org.projectlombok:lombok:1.16.8'
-
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'
     compileOnly 'org.osgi:org.osgi.service.cm:1.5.0'
@@ -57,7 +58,6 @@ dependencies {
     // GraphQL
     compile 'com.graphql-java:graphql-java:2.4.0'
 
-    // Optional, but used for testing... not sure if there's a better way.
     compileOnly 'com.graphql-java:graphql-java-annotations:0.13.1'
     testCompile 'com.graphql-java:graphql-java-annotations:0.13.1'
 
@@ -175,15 +175,5 @@ idea {
     project {
         languageLevel = '1.8'
         vcs = 'Git'
-        ipr.withXml { xmlFile ->
-            // enable 'Annotation Processors'
-            xmlFile.asNode().component.find {
-                it.@name == 'CompilerConfiguration'
-            }['annotationProcessing'][0].replaceNode {
-                annotationProcessing {
-                    profile(default: true, name: 'Default', useClasspath: 'true', enabled: true)
-                }
-            }
-        }
     }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Thu Oct 27 10:17:46 ICT 2016
+#Mon Apr 24 13:12:01 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew

@@ -14,34 +14,56 @@
  */
 package graphql.servlet;
 
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
 import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemIterator;
-import org.apache.commons.fileupload.FileItemStream;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
 
 import javax.security.auth.Subject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Part;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-@RequiredArgsConstructor
 public class GraphQLContext {
-    @Getter @Setter @NonNull
     private Optional<HttpServletRequest> request;
-    @Getter @Setter @NonNull
     private Optional<HttpServletResponse> response;
-    @Getter @Setter
-    private Optional<Subject> subject = Optional.empty();
 
-    @Getter @Setter
+    private Optional<Subject> subject = Optional.empty();
     private Optional<Map<String, List<FileItem>>> files = Optional.empty();
+
+    public GraphQLContext(Optional<HttpServletRequest> request, Optional<HttpServletResponse> response) {
+        this.request = request;
+        this.response = response;
+    }
+
+    public Optional<HttpServletRequest> getRequest() {
+        return request;
+    }
+
+    public void setRequest(Optional<HttpServletRequest> request) {
+        this.request = request;
+    }
+
+    public Optional<HttpServletResponse> getResponse() {
+        return response;
+    }
+
+    public void setResponse(Optional<HttpServletResponse> response) {
+        this.response = response;
+    }
+
+    public Optional<Subject> getSubject() {
+        return subject;
+    }
+
+    public void setSubject(Optional<Subject> subject) {
+        this.subject = subject;
+    }
+
+    public Optional<Map<String, List<FileItem>>> getFiles() {
+        return files;
+    }
+
+    public void setFiles(Optional<Map<String, List<FileItem>>> files) {
+        this.files = files;
+    }
 }

src/main/java/graphql/servlet/GraphQLContext.java

@@ -30,14 +30,12 @@
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLSchema;
 import graphql.validation.ValidationError;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.security.auth.Subject;
 import javax.servlet.Servlet;
@@ -62,9 +60,10 @@
 /**
  * @author Andrew Potter
  */
-@Slf4j
 public abstract class GraphQLServlet extends HttpServlet implements Servlet, GraphQLMBean, GraphQLSchemaProvider {
 
+    public static final Logger log = LoggerFactory.getLogger(GraphQLServlet.class);
+
     public static final String APPLICATION_JSON_UTF8 = "application/json;charset=UTF-8";
     public static final int STATUS_OK = 200;
     public static final int STATUS_BAD_REQUEST = 400;
@@ -212,7 +211,7 @@ public String[] getMutations() {
         return getSchema().getMutationType().getFieldDefinitions().stream().map(GraphQLFieldDefinition::getName).toArray(String[]::new);
     }
 
-    @Override @SneakyThrows
+    @Override
     public String executeQuery(String query) {
         try {
             final ExecutionResult result = new GraphQL(getSchema()).execute(query, createContext(Optional.empty(), Optional.empty()), new HashMap<>());
@@ -258,12 +257,13 @@ private Optional<FileItem> getFileItem(Map<String, List<FileItem>> fileItems, St
 
     private void query(String query, String operationName, Map<String, Object> variables, GraphQLSchema schema, HttpServletRequest req, HttpServletResponse resp, GraphQLContext context) throws IOException {
         if (Subject.getSubject(AccessController.getContext()) == null && context.getSubject().isPresent()) {
-            Subject.doAs(context.getSubject().get(), new PrivilegedAction<Void>() {
-                @Override @SneakyThrows
-                public Void run() {
+            Subject.doAs(context.getSubject().get(), (PrivilegedAction<Void>) () -> {
+                try {
                     query(query, operationName, variables, schema, req, resp, context);
-                    return null;
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
                 }
+                return null;
             });
         } else {
             runListeners(operationListeners, l -> runListener(l, it -> it.beforeGraphQLOperation(context, operationName, query, variables)));
@@ -345,13 +345,34 @@ public Map<String, Object> deserialize(JsonParser p, DeserializationContext ctxt
     }
 
     protected static class GraphQLRequest {
-        @Getter
-        @Setter
         private String query;
-        @Getter @Setter @JsonDeserialize(using = GraphQLServlet.VariablesDeserializer.class)
+        @JsonDeserialize(using = GraphQLServlet.VariablesDeserializer.class)
         private Map<String, Object> variables = new HashMap<>();
-        @Getter @Setter
         private String operationName;
+
+        public String getQuery() {
+            return query;
+        }
+
+        public void setQuery(String query) {
+            this.query = query;
+        }
+
+        public Map<String, Object> getVariables() {
+            return variables;
+        }
+
+        public void setVariables(Map<String, Object> variables) {
+            this.variables = variables;
+        }
+
+        public String getOperationName() {
+            return operationName;
+        }
+
+        public void setOperationName(String operationName) {
+            this.operationName = operationName;
+        }
     }
 
     protected interface RequestHandler extends BiConsumer<HttpServletRequest, HttpServletResponse> {

src/main/java/graphql/servlet/GraphQLServlet.java

@@ -17,12 +17,16 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.annotations.GraphQLObjectBackedByClass;
-import graphql.language.*;
+import graphql.language.NonNullType;
+import graphql.language.OperationDefinition;
+import graphql.language.Type;
+import graphql.language.TypeName;
+import graphql.language.VariableDefinition;
 import graphql.parser.Parser;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.GraphQLType;
-import lombok.SneakyThrows;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -44,7 +48,6 @@ public GraphQLVariables(GraphQLSchema schema, String query, Map<String, Object>
                     .map(d -> (OperationDefinition) d)
                     .flatMap(d -> d.getVariableDefinitions().stream())
                     .forEach(new Consumer<VariableDefinition>() {
-                        @SneakyThrows
                         @Override public void accept(VariableDefinition d) {
                             GraphQLType type;
                             Type t = d.getType();
@@ -57,8 +60,14 @@ public GraphQLVariables(GraphQLSchema schema, String query, Map<String, Object>
                                 type = null;
                             }
                             if (type instanceof GraphQLObjectBackedByClass) {
-                                String value = objectMapper.writeValueAsString(variables.get(d.getName()));
-                                Object val = objectMapper.readValue(value, ((GraphQLObjectBackedByClass) type).getObjectClass());
+                                String value;
+                                Object val;
+                                try {
+                                    value = objectMapper.writeValueAsString(variables.get(d.getName()));
+                                    val = objectMapper.readValue(value, ((GraphQLObjectBackedByClass) type).getObjectClass());
+                                } catch (IOException e) {
+                                    throw new RuntimeException(e);
+                                }
                                 GraphQLVariables.this.put(d.getName(), val);
                             } else {
                                 GraphQLVariables.this.put(d.getName(), variables.get(d.getName()));

src/main/java/graphql/servlet/GraphQLVariables.java

@@ -19,7 +19,6 @@
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.GraphQLType;
-import lombok.extern.slf4j.Slf4j;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
@@ -37,7 +36,6 @@
 import static graphql.schema.GraphQLObjectType.newObject;
 import static graphql.schema.GraphQLSchema.newSchema;
 
-@Slf4j
 @Component(
         service={javax.servlet.http.HttpServlet.class,javax.servlet.Servlet.class},
         property = {"osgi.http.whiteboard.servlet.pattern=/graphql/*", "jmx.objectname=graphql.servlet:type=graphql"}

src/main/java/graphql/servlet/OsgiGraphQLServlet.java

@@ -18,9 +18,7 @@ import graphql.annotations.GraphQLAnnotations
 import graphql.annotations.GraphQLField
 import graphql.annotations.GraphQLName
 import graphql.schema.GraphQLFieldDefinition
-import graphql.schema.GraphQLObjectType
 import graphql.schema.GraphQLSchema
-import lombok.SneakyThrows
 import spock.lang.Specification
 
 import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition

src/test/groovy/graphql/servlet/GraphQLVariablesSpec.groovy

@@ -18,8 +18,6 @@ import graphql.annotations.GraphQLAnnotations
 import graphql.annotations.GraphQLField
 import graphql.annotations.GraphQLName
 import graphql.schema.GraphQLFieldDefinition
-import graphql.schema.GraphQLObjectType
-import lombok.SneakyThrows
 import spock.lang.Specification
 
 import static graphql.Scalars.GraphQLInt