Refactor proxy handlers

Author: vojtapol

src/main/kotlin/graphql/kickstart/tools/JavassistProxyHandler.kt

@@ -1,6 +1,7 @@
 package graphql.kickstart.tools
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import graphql.kickstart.tools.proxy.*
 import graphql.kickstart.tools.relay.RelayConnectionFactory
 import graphql.kickstart.tools.util.BiMap
 import graphql.kickstart.tools.util.JavaType

src/main/kotlin/graphql/kickstart/tools/ProxyHandler.java

@@ -1,6 +1,9 @@
-package graphql.kickstart.tools;
+package graphql.kickstart.tools.proxy;
+
+import graphql.kickstart.tools.GraphQLResolver;
 
 public class GuiceAopProxyHandler implements ProxyHandler {
+
     @Override
     public boolean canHandle(GraphQLResolver<?> resolver) {
         return isGuiceProxy(resolver);

src/main/kotlin/graphql/kickstart/tools/SchemaParserBuilder.kt

@@ -0,0 +1,24 @@
+package graphql.kickstart.tools.proxy
+
+import graphql.kickstart.tools.GraphQLResolver
+import javassist.util.proxy.ProxyFactory
+
+/**
+ * @author Marcus Thiesen
+ */
+class JavassistProxyHandler : ProxyHandler {
+
+    private val isEnabled: Boolean =
+        try {
+            Class.forName("javassist.util.proxy.ProxyFactory")
+            true
+        } catch (_: ClassNotFoundException) {
+            false
+        }
+
+    override fun canHandle(resolver: GraphQLResolver<*>): Boolean {
+        return isEnabled && ProxyFactory.isProxyClass(resolver.javaClass)
+    }
+
+    override fun getTargetClass(resolver: GraphQLResolver<*>): Class<*> = resolver.javaClass.superclass
+}

src/main/kotlin/graphql/kickstart/tools/GuiceAopProxyHandler.java renamed to src/main/kotlin/graphql/kickstart/tools/proxy/GuiceAopProxyHandler.java

@@ -0,0 +1,13 @@
+package graphql.kickstart.tools.proxy
+
+import graphql.kickstart.tools.GraphQLResolver
+
+/**
+ * @author Marcus Thiesen
+ */
+interface ProxyHandler {
+
+    fun canHandle(resolver: GraphQLResolver<*>): Boolean
+
+    fun getTargetClass(resolver: GraphQLResolver<*>): Class<*>
+}

src/main/kotlin/graphql/kickstart/tools/proxy/JavassistProxyHandler.kt

@@ -1,12 +1,12 @@
-package graphql.kickstart.tools
+package graphql.kickstart.tools.proxy
 
+import graphql.kickstart.tools.GraphQLResolver
 import org.springframework.aop.support.AopUtils
 
 /**
  * @author Andrew Potter
  */
-
-class Spring4AopProxyHandler: ProxyHandler {
+class Spring4AopProxyHandler : ProxyHandler {
 
     val isEnabled: Boolean =
         try {
@@ -16,9 +16,9 @@ class Spring4AopProxyHandler: ProxyHandler {
             false
         }
 
-    override fun canHandle(resolver: GraphQLResolver<*>?): Boolean {
+    override fun canHandle(resolver: GraphQLResolver<*>): Boolean {
         return isEnabled && AopUtils.isAopProxy(resolver)
     }
 
-    override fun getTargetClass(resolver: GraphQLResolver<*>?): Class<*> = AopUtils.getTargetClass(resolver)
-}
+    override fun getTargetClass(resolver: GraphQLResolver<*>): Class<*> = AopUtils.getTargetClass(resolver)
+}

src/main/kotlin/graphql/kickstart/tools/proxy/ProxyHandler.kt

@@ -1,7 +1,9 @@
-package graphql.kickstart.tools;
+package graphql.kickstart.tools.proxy;
+
+import graphql.kickstart.tools.GraphQLResolver;
+
+public class WeldProxyHandler implements ProxyHandler {
 
-public class WeldProxyHandler implements ProxyHandler
-{
     @Override
     public boolean canHandle(GraphQLResolver<?> resolver) {
         return isWeldProxy(resolver);

src/main/kotlin/graphql/kickstart/tools/Spring4AopProxyHandler.kt renamed to src/main/kotlin/graphql/kickstart/tools/proxy/Spring4AopProxyHandler.kt

@@ -7,11 +7,11 @@ import org.junit.Test
 class PlaceTest {
 
     @Test
-    fun shouldHandleGenericsDeepHierarchy() {
+    fun `should handle generics deep hierarchy`() {
         val schema = SchemaParser.newParser()
-                .file("Place.graphqls")
-                .resolvers(PlaceQuery())
-                .build().makeExecutableSchema()
+            .file("Place.graphqls")
+            .resolvers(PlaceQuery())
+            .build().makeExecutableSchema()
 
         val graphql = GraphQL.newGraphQL(schema).build()
         val query = "query { places1 { id } places2 { id } }"

src/main/kotlin/graphql/kickstart/tools/WeldProxyHandler.java renamed to src/main/kotlin/graphql/kickstart/tools/proxy/WeldProxyHandler.java

@@ -27,7 +27,6 @@ fun createSchema() = SchemaParser.newParser()
     .makeExecutableSchema()
 
 private const val schemaDefinition = """
-
 ## Private comment!
 scalar UUID
 scalar customScalarMap
@@ -211,38 +210,38 @@ type ItemWithGenericProperties {
 """
 
 
-val items = mutableListOf(
+val items = listOf(
     Item(0, "item1", Type.TYPE_1, UUID.fromString("38f685f1-b460-4a54-a17f-7fd69e8cf3f8"), listOf(Tag(1, "item1-tag1"), Tag(2, "item1-tag2"))),
     Item(1, "item2", Type.TYPE_2, UUID.fromString("38f685f1-b460-4a54-b17f-7fd69e8cf3f8"), listOf(Tag(3, "item2-tag1"), Tag(4, "item2-tag2")))
 )
 
-val otherItems = mutableListOf(
+val otherItems = listOf(
     OtherItemWithWrongName(0, "otherItem1", Type.TYPE_1, UUID.fromString("38f685f1-b460-4a54-c17f-7fd69e8cf3f8")),
     OtherItemWithWrongName(1, "otherItem2", Type.TYPE_2, UUID.fromString("38f685f1-b460-4a54-d17f-7fd69e8cf3f8"))
 )
 
-val thirdItems = mutableListOf(
+val thirdItems = listOf(
     ThirdItem(100)
 )
 
-val propetyHashMapItems = mutableListOf(
+val propetyHashMapItems = listOf(
     hashMapOf("name" to "bob", "age" to 55)
 )
 
-val propertyMapMissingNamePropItems = mutableListOf(
+val propertyMapMissingNamePropItems = listOf(
     hashMapOf<String, Any>("age" to 55)
 )
 
-val propetySortedMapItems = mutableListOf(
+val propetySortedMapItems = listOf(
     sortedMapOf("name" to "Arthur", "age" to 76),
     sortedMapOf("name" to "Jane", "age" to 28)
 )
 
-val propertyMapWithComplexItems = mutableListOf(
+val propertyMapWithComplexItems = listOf(
     hashMapOf("nameId" to ComplexMapItem(150), "age" to 72)
 )
 
-val propertyMapWithNestedComplexItems = mutableListOf(
+val propertyMapWithNestedComplexItems = listOf(
     hashMapOf("nested" to NestedComplexMapItem(UndiscoveredItem(63)), "age" to 72)
 )
 
@@ -446,7 +445,7 @@ val customScalarMap = GraphQLScalarType.newScalar()
     })
     .build()
 
-//Definition from https://github.com/graphql-java-kickstart/graphql-java-servlet/blob/master/src/main/java/graphql/servlet/core/ApolloScalars.java
+// definition from https://github.com/graphql-java-kickstart/graphql-java-servlet/blob/master/src/main/java/graphql/servlet/core/ApolloScalars.java
 val uploadScalar: GraphQLScalarType = GraphQLScalarType.newScalar()
     .name("Upload")
     .description("A file part in a multipart request")