Merge pull request #37 from phocassoftware/name-space

Name space

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
       - name: set name
         run: |
           git config --global user.name "release-bot";
-          git config --global user.email "release-bot@fleetpin.co.nz";
+          git config --global user.email "release-bot@phocas.co.nz";
 
       - name: add key
         run: |

graphql-builder/pom.xml

@@ -18,7 +18,7 @@
 	<url>https://github.com/ashley-taylor/graphql-builder</url>
 
 	<parent>
-		<groupId>com.fleetpin</groupId>
+		<groupId>com.phocas</groupId>
 		<artifactId>graphql-database-manager</artifactId>
 		<version>3.0.4-SNAPSHOT</version>
 	</parent>
@@ -62,15 +62,6 @@
 		</license>
 	</licenses>
 
-	<developers>
-		<developer>
-			<name>Ashley Taylor</name>
-			<email>[email protected]</email>
-			<organization>Fleetpin</organization>
-			<organizationUrl>http://www.fleetpin.co.nz</organizationUrl>
-		</developer>
-	</developers>
-
 	<build>
 		<plugins>
 			<plugin>

graphql-builder/src/main/java/com/fleetpin/graphql/builder/Authorizer.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/Authorizer.java

@@ -9,6 +9,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
 public interface Authorizer {}

graphql-builder/src/main/java/com/fleetpin/graphql/builder/AuthorizerSchema.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/AuthorizerSchema.java

@@ -9,9 +9,9 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
-import static com.fleetpin.graphql.builder.EntityUtil.isContext;
+import static com.phocassoftware.graphql.builder.EntityUtil.isContext;
 
 import graphql.GraphQLContext;
 import graphql.GraphqlErrorException;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/DataFetcherRunner.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DataFetcherRunner.java

@@ -1,4 +1,4 @@
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
 import graphql.schema.DataFetcher;
 import java.lang.reflect.Method;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectiveCaller.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DirectiveCaller.java

@@ -9,7 +9,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectiveOperation.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DirectiveOperation.java

@@ -9,7 +9,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
 import java.lang.annotation.Annotation;
 

graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectiveProcessor.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DirectiveProcessor.java

@@ -1,6 +1,6 @@
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
-import com.fleetpin.graphql.builder.annotations.Directive;
+import com.phocassoftware.graphql.builder.annotations.Directive;
 import graphql.introspection.Introspection;
 import graphql.schema.*;
 import java.lang.annotation.Annotation;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectivesSchema.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DirectivesSchema.java

@@ -9,10 +9,10 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
-import com.fleetpin.graphql.builder.annotations.DataFetcherWrapper;
-import com.fleetpin.graphql.builder.annotations.Directive;
+import com.phocassoftware.graphql.builder.annotations.DataFetcherWrapper;
+import com.phocassoftware.graphql.builder.annotations.Directive;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.GraphQLAppliedDirective;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/EntityHolder.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EntityHolder.java

@@ -9,11 +9,11 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
-import com.fleetpin.graphql.builder.TypeMeta.Flag;
-import com.fleetpin.graphql.builder.annotations.Id;
-import com.fleetpin.graphql.builder.mapper.InputTypeBuilder;
+import com.phocassoftware.graphql.builder.TypeMeta.Flag;
+import com.phocassoftware.graphql.builder.annotations.Id;
+import com.phocassoftware.graphql.builder.mapper.InputTypeBuilder;
 import graphql.Scalars;
 import graphql.schema.GraphQLInputType;
 import graphql.schema.GraphQLList;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/EntityProcessor.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EntityProcessor.java

@@ -9,11 +9,11 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
-import com.fleetpin.graphql.builder.annotations.Scalar;
-import com.fleetpin.graphql.builder.annotations.Union;
-import com.fleetpin.graphql.builder.mapper.InputTypeBuilder;
+import com.phocassoftware.graphql.builder.annotations.Scalar;
+import com.phocassoftware.graphql.builder.annotations.Union;
+import com.phocassoftware.graphql.builder.mapper.InputTypeBuilder;
 import graphql.Scalars;
 import graphql.schema.GraphQLAppliedDirective;
 import graphql.schema.GraphQLCodeRegistry;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/EntityUtil.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EntityUtil.java

@@ -9,12 +9,12 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
-import com.fleetpin.graphql.builder.annotations.Context;
-import com.fleetpin.graphql.builder.annotations.GraphQLIgnore;
-import com.fleetpin.graphql.builder.annotations.GraphQLName;
-import com.fleetpin.graphql.builder.annotations.InputIgnore;
+import com.phocassoftware.graphql.builder.annotations.Context;
+import com.phocassoftware.graphql.builder.annotations.GraphQLIgnore;
+import com.phocassoftware.graphql.builder.annotations.GraphQLName;
+import com.phocassoftware.graphql.builder.annotations.InputIgnore;
 import graphql.GraphQLContext;
 import graphql.schema.DataFetchingEnvironment;
 import java.lang.annotation.Annotation;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/EnumEntity.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EnumEntity.java

@@ -9,13 +9,13 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
 import static graphql.schema.GraphQLEnumValueDefinition.newEnumValueDefinition;
 
-import com.fleetpin.graphql.builder.annotations.GraphQLDescription;
-import com.fleetpin.graphql.builder.annotations.GraphQLIgnore;
-import com.fleetpin.graphql.builder.mapper.InputTypeBuilder;
+import com.phocassoftware.graphql.builder.annotations.GraphQLDescription;
+import com.phocassoftware.graphql.builder.annotations.GraphQLIgnore;
+import com.phocassoftware.graphql.builder.mapper.InputTypeBuilder;
 import graphql.schema.GraphQLEnumType;
 import graphql.schema.GraphQLNamedInputType;
 import graphql.schema.GraphQLNamedOutputType;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/ErrorType.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/ErrorType.java

@@ -9,7 +9,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
 import graphql.ErrorClassification;
 

graphql-builder/src/main/java/com/fleetpin/graphql/builder/FilteredPublisher.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/FilteredPublisher.java

@@ -9,7 +9,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiConsumer;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/InputBuilder.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/InputBuilder.java

@@ -9,20 +9,20 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
-
-import com.fleetpin.graphql.builder.annotations.Entity;
-import com.fleetpin.graphql.builder.annotations.GraphQLDescription;
-import com.fleetpin.graphql.builder.annotations.GraphQLIgnore;
-import com.fleetpin.graphql.builder.annotations.InputIgnore;
-import com.fleetpin.graphql.builder.annotations.OneOf;
-import com.fleetpin.graphql.builder.annotations.SchemaOption;
-import com.fleetpin.graphql.builder.mapper.ConstructorFieldBuilder;
-import com.fleetpin.graphql.builder.mapper.ConstructorFieldBuilder.RecordMapper;
-import com.fleetpin.graphql.builder.mapper.InputTypeBuilder;
-import com.fleetpin.graphql.builder.mapper.ObjectFieldBuilder;
-import com.fleetpin.graphql.builder.mapper.ObjectFieldBuilder.FieldMapper;
-import com.fleetpin.graphql.builder.mapper.OneOfBuilder;
+package com.phocassoftware.graphql.builder;
+
+import com.phocassoftware.graphql.builder.annotations.Entity;
+import com.phocassoftware.graphql.builder.annotations.GraphQLDescription;
+import com.phocassoftware.graphql.builder.annotations.GraphQLIgnore;
+import com.phocassoftware.graphql.builder.annotations.InputIgnore;
+import com.phocassoftware.graphql.builder.annotations.OneOf;
+import com.phocassoftware.graphql.builder.annotations.SchemaOption;
+import com.phocassoftware.graphql.builder.mapper.ConstructorFieldBuilder;
+import com.phocassoftware.graphql.builder.mapper.ConstructorFieldBuilder.RecordMapper;
+import com.phocassoftware.graphql.builder.mapper.InputTypeBuilder;
+import com.phocassoftware.graphql.builder.mapper.ObjectFieldBuilder;
+import com.phocassoftware.graphql.builder.mapper.ObjectFieldBuilder.FieldMapper;
+import com.phocassoftware.graphql.builder.mapper.OneOfBuilder;
 import graphql.schema.GraphQLInputObjectField;
 import graphql.schema.GraphQLInputObjectType;
 import graphql.schema.GraphQLInputObjectType.Builder;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/MethodProcessor.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/MethodProcessor.java

@@ -1,13 +1,13 @@
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
-import static com.fleetpin.graphql.builder.EntityUtil.isContext;
+import static com.phocassoftware.graphql.builder.EntityUtil.isContext;
 
-import com.fleetpin.graphql.builder.annotations.Directive;
-import com.fleetpin.graphql.builder.annotations.GraphQLDeprecated;
-import com.fleetpin.graphql.builder.annotations.GraphQLDescription;
-import com.fleetpin.graphql.builder.annotations.Mutation;
-import com.fleetpin.graphql.builder.annotations.Query;
-import com.fleetpin.graphql.builder.annotations.Subscription;
+import com.phocassoftware.graphql.builder.annotations.Directive;
+import com.phocassoftware.graphql.builder.annotations.GraphQLDeprecated;
+import com.phocassoftware.graphql.builder.annotations.GraphQLDescription;
+import com.phocassoftware.graphql.builder.annotations.Mutation;
+import com.phocassoftware.graphql.builder.annotations.Query;
+import com.phocassoftware.graphql.builder.annotations.Subscription;
 import graphql.GraphQLContext;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
@@ -91,6 +91,7 @@ Builder process(AuthorizerSchema authorizer, FieldCoordinates coordinates, TypeM
 
 		field.name(coordinates.getFieldName());
 
+
 		TypeMeta meta = new TypeMeta(parentMeta, method.getReturnType(), method.getGenericReturnType(), method);
 		var type = entityProcessor.getType(meta, method.getAnnotations());
 		field.type(type);

graphql-builder/src/main/java/com/fleetpin/graphql/builder/ObjectEntity.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/ObjectEntity.java

@@ -9,11 +9,11 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
-import com.fleetpin.graphql.builder.annotations.GraphQLCreator;
-import com.fleetpin.graphql.builder.annotations.OneOf;
-import com.fleetpin.graphql.builder.mapper.InputTypeBuilder;
+import com.phocassoftware.graphql.builder.annotations.GraphQLCreator;
+import com.phocassoftware.graphql.builder.annotations.OneOf;
+import com.phocassoftware.graphql.builder.mapper.InputTypeBuilder;
 import graphql.schema.GraphQLNamedInputType;
 import graphql.schema.GraphQLNamedOutputType;
 

graphql-builder/src/main/java/com/fleetpin/graphql/builder/RestrictType.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/RestrictType.java

@@ -9,7 +9,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
 import java.util.ArrayList;
 import java.util.List;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/RestrictTypeFactory.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/RestrictTypeFactory.java

@@ -9,7 +9,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
 import graphql.schema.DataFetchingEnvironment;
 import java.lang.reflect.ParameterizedType;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/ScalarEntity.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/ScalarEntity.java

@@ -9,11 +9,11 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
-import com.fleetpin.graphql.builder.annotations.GraphQLDescription;
-import com.fleetpin.graphql.builder.annotations.Scalar;
-import com.fleetpin.graphql.builder.mapper.InputTypeBuilder;
+import com.phocassoftware.graphql.builder.annotations.GraphQLDescription;
+import com.phocassoftware.graphql.builder.annotations.Scalar;
+import com.phocassoftware.graphql.builder.mapper.InputTypeBuilder;
 import graphql.schema.Coercing;
 import graphql.schema.GraphQLNamedInputType;
 import graphql.schema.GraphQLNamedOutputType;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/SchemaBuilder.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/SchemaBuilder.java

@@ -9,9 +9,9 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
-import com.fleetpin.graphql.builder.annotations.*;
+import com.phocassoftware.graphql.builder.annotations.*;
 import graphql.schema.GraphQLScalarType;
 import graphql.schema.GraphQLSchema;
 import java.lang.reflect.Method;

graphql-builder/src/main/java/com/fleetpin/graphql/builder/SchemaConfiguration.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/SchemaConfiguration.java

@@ -9,7 +9,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
 /**
  * Used to add extra information to the schema. Currently only supports directives. That are inferred using the annotation

graphql-builder/src/main/java/com/fleetpin/graphql/builder/TypeBuilder.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/TypeBuilder.java

@@ -9,11 +9,11 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
+package com.phocassoftware.graphql.builder;
 
-import com.fleetpin.graphql.builder.annotations.Entity;
-import com.fleetpin.graphql.builder.annotations.GraphQLDescription;
-import com.fleetpin.graphql.builder.annotations.GraphQLIgnore;
+import com.phocassoftware.graphql.builder.annotations.Entity;
+import com.phocassoftware.graphql.builder.annotations.GraphQLDescription;
+import com.phocassoftware.graphql.builder.annotations.GraphQLIgnore;
 import graphql.schema.FieldCoordinates;
 import graphql.schema.GraphQLInterfaceType;
 import graphql.schema.GraphQLNamedOutputType;
@@ -22,6 +22,7 @@
 import graphql.schema.GraphQLTypeReference;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.util.Objects;
 
 public abstract class TypeBuilder {
 
@@ -167,6 +168,7 @@ public ObjectType(EntityProcessor entityProcessor, TypeMeta meta) {
 		protected void processFields(String typeName, Builder graphType, graphql.schema.GraphQLInterfaceType.Builder interfaceBuilder)
 			throws ReflectiveOperationException {
 			var type = meta.getType();
+
 			for (Method method : type.getMethods()) {
 				try {
 					var name = EntityUtil.getter(method);

graphql-builder/src/main/java/com/fleetpin/graphql/builder/TypeMeta.java → graphql-builder/src/main/java/com/phocassoftware/graphql/builder/TypeMeta.java

@@ -9,14 +9,11 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.fleetpin.graphql.builder;
-
-import com.fleetpin.graphql.builder.annotations.InnerNullable;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
+package com.phocassoftware.graphql.builder;
+
+import com.phocassoftware.graphql.builder.annotations.InnerNullable;
+
+import java.lang.reflect.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -70,6 +67,13 @@ private void processGeneric(TypeMeta target, TypeVariable type, AnnotatedElement
 		if (owningClass instanceof Class) {
 			findType(target, type, (Class) owningClass, element);
 		} else if (owningClass instanceof ParameterizedType) {
+			if (element instanceof Member member) {
+				var declaringClass = member.getDeclaringClass();
+				if (declaringClass.equals(target.type)) {
+					findType(target, type, target.type, element);
+					return;
+				}
+			}
 			var pt = (ParameterizedType) owningClass;
 			if (!matchType(target, type.getTypeName(), pt, true, element)) {
 				throw new UnsupportedOperationException("Does not handle type " + owningClass);