diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 99794fc9..056c2345 100644 --- a/.github/workflows/release.yml +++ b/.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: | diff --git a/graphql-builder/pom.xml b/graphql-builder/pom.xml index 79cbf343..0d64ccce 100644 --- a/graphql-builder/pom.xml +++ b/graphql-builder/pom.xml @@ -18,7 +18,7 @@ https://github.com/ashley-taylor/graphql-builder - com.fleetpin + com.phocas graphql-database-manager 3.0.4-SNAPSHOT @@ -62,15 +62,6 @@ - - - Ashley Taylor - ashley.taylor@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - - diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/Authorizer.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/Authorizer.java similarity index 92% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/Authorizer.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/Authorizer.java index f6480f4f..1a44d2ad 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/Authorizer.java +++ b/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 {} diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/AuthorizerSchema.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/AuthorizerSchema.java similarity index 98% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/AuthorizerSchema.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/AuthorizerSchema.java index 2eff1236..a18269c5 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/AuthorizerSchema.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/DataFetcherRunner.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DataFetcherRunner.java similarity index 80% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/DataFetcherRunner.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DataFetcherRunner.java index 1b134792..4851ce8d 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/DataFetcherRunner.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectiveCaller.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DirectiveCaller.java similarity index 95% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectiveCaller.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DirectiveCaller.java index 73b3bd9d..b945d767 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectiveCaller.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectiveOperation.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DirectiveOperation.java similarity index 95% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectiveOperation.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DirectiveOperation.java index e278c2c7..2f69b969 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectiveOperation.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectiveProcessor.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DirectiveProcessor.java similarity index 96% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectiveProcessor.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DirectiveProcessor.java index 18d429d8..3e54c6e9 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectiveProcessor.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectivesSchema.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DirectivesSchema.java similarity index 97% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectivesSchema.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/DirectivesSchema.java index ce6e59e7..1ce5af9c 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/DirectivesSchema.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/EntityHolder.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EntityHolder.java similarity index 97% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/EntityHolder.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EntityHolder.java index d585319f..03efa5b2 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/EntityHolder.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/EntityProcessor.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EntityProcessor.java similarity index 95% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/EntityProcessor.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EntityProcessor.java index 0deb63cb..abecf176 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/EntityProcessor.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/EntityUtil.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EntityUtil.java similarity index 94% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/EntityUtil.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EntityUtil.java index f63efdf1..fdc17d18 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/EntityUtil.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/EnumEntity.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EnumEntity.java similarity index 89% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/EnumEntity.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/EnumEntity.java index b05bc208..da72e5e4 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/EnumEntity.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/ErrorType.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/ErrorType.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/ErrorType.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/ErrorType.java index 16e7e679..4485457e 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/ErrorType.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/FilteredPublisher.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/FilteredPublisher.java similarity index 98% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/FilteredPublisher.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/FilteredPublisher.java index afe8cc91..30aa5c2a 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/FilteredPublisher.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/InputBuilder.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/InputBuilder.java similarity index 91% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/InputBuilder.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/InputBuilder.java index ff00057f..eff66d11 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/InputBuilder.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/MethodProcessor.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/MethodProcessor.java similarity index 94% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/MethodProcessor.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/MethodProcessor.java index 8bef984f..c40a546d 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/MethodProcessor.java +++ b/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); diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/ObjectEntity.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/ObjectEntity.java similarity index 90% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/ObjectEntity.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/ObjectEntity.java index cffab6b5..bf0fbdeb 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/ObjectEntity.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/RestrictType.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/RestrictType.java similarity index 96% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/RestrictType.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/RestrictType.java index b234d5ac..6716135d 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/RestrictType.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/RestrictTypeFactory.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/RestrictTypeFactory.java similarity index 96% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/RestrictTypeFactory.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/RestrictTypeFactory.java index 05e4be2e..c26a53fa 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/RestrictTypeFactory.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/ScalarEntity.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/ScalarEntity.java similarity index 88% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/ScalarEntity.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/ScalarEntity.java index d1c0422b..a86e1e47 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/ScalarEntity.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/SchemaBuilder.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/SchemaBuilder.java similarity index 98% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/SchemaBuilder.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/SchemaBuilder.java index 24bf2fcb..6078dc8a 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/SchemaBuilder.java +++ b/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; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/SchemaConfiguration.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/SchemaConfiguration.java similarity index 94% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/SchemaConfiguration.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/SchemaConfiguration.java index 4eb2412b..0da03eb6 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/SchemaConfiguration.java +++ b/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 diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/TypeBuilder.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/TypeBuilder.java similarity index 96% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/TypeBuilder.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/TypeBuilder.java index 7d35b9c1..95eb05bc 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/TypeBuilder.java +++ b/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); diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/TypeMeta.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/TypeMeta.java similarity index 96% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/TypeMeta.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/TypeMeta.java index 37cf193f..a42c71d2 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/TypeMeta.java +++ b/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); diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/UnionType.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/UnionType.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/UnionType.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/UnionType.java index c25ccc66..39118bd4 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/UnionType.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/UnionType.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.Union; -import com.fleetpin.graphql.builder.mapper.InputTypeBuilder; +import com.phocassoftware.graphql.builder.annotations.Union; +import com.phocassoftware.graphql.builder.mapper.InputTypeBuilder; import graphql.schema.GraphQLNamedInputType; import graphql.schema.GraphQLNamedOutputType; import graphql.schema.GraphQLObjectType; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Context.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Context.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Context.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Context.java index 0ebe5d75..42e968f4 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Context.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Context.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/DataFetcherWrapper.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/DataFetcherWrapper.java similarity index 73% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/DataFetcherWrapper.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/DataFetcherWrapper.java index 1f11f01e..f3d13670 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/DataFetcherWrapper.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/DataFetcherWrapper.java @@ -1,8 +1,8 @@ -package com.fleetpin.graphql.builder.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.fleetpin.graphql.builder.DirectiveOperation; +import com.phocassoftware.graphql.builder.DirectiveOperation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Directive.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Directive.java similarity index 85% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Directive.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Directive.java index 7dbd6895..7d07acdd 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Directive.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Directive.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.fleetpin.graphql.builder.DirectiveCaller; -import com.fleetpin.graphql.builder.DirectiveOperation; +import com.phocassoftware.graphql.builder.DirectiveCaller; +import com.phocassoftware.graphql.builder.DirectiveOperation; import graphql.introspection.Introspection; import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Entity.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Entity.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Entity.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Entity.java index 32184cfb..1863829b 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Entity.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Entity.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLCreator.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLCreator.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLCreator.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLCreator.java index e70af410..84b41ca9 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLCreator.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLCreator.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLDeprecated.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLDeprecated.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLDeprecated.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLDeprecated.java index 49666f72..e53ad7a1 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLDeprecated.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLDeprecated.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLDescription.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLDescription.java similarity index 94% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLDescription.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLDescription.java index ce6c6d7f..7f03f6e1 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLDescription.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLDescription.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLIgnore.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLIgnore.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLIgnore.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLIgnore.java index e51c4ae5..712ec867 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLIgnore.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLIgnore.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLName.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLName.java similarity index 94% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLName.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLName.java index 726f7ee9..ea5a69d5 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/GraphQLName.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/GraphQLName.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Id.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Id.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Id.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Id.java index c1fe3766..b31e5038 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Id.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Id.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/InnerNullable.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/InnerNullable.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/InnerNullable.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/InnerNullable.java index 2802df1c..4107cc58 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/InnerNullable.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/InnerNullable.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/InputIgnore.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/InputIgnore.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/InputIgnore.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/InputIgnore.java index 23362b38..159fc24c 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/InputIgnore.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/InputIgnore.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Mutation.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Mutation.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Mutation.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Mutation.java index 411e98c7..46b12e0a 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Mutation.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Mutation.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/OneOf.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/OneOf.java similarity index 94% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/OneOf.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/OneOf.java index b05736e2..03b97a85 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/OneOf.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/OneOf.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Query.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Query.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Query.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Query.java index bc5a73bd..0642fa9e 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Query.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Query.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Restrict.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Restrict.java similarity index 88% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Restrict.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Restrict.java index b577f50f..3c18c0be 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Restrict.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Restrict.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.fleetpin.graphql.builder.RestrictTypeFactory; +import com.phocassoftware.graphql.builder.RestrictTypeFactory; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Restricts.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Restricts.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Restricts.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Restricts.java index dff1c64e..c09720d2 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Restricts.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Restricts.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Scalar.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Scalar.java similarity index 94% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Scalar.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Scalar.java index 39024222..c2ce9718 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Scalar.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Scalar.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/SchemaOption.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/SchemaOption.java similarity index 91% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/SchemaOption.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/SchemaOption.java index 391851b2..5c605a34 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/SchemaOption.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/SchemaOption.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.annotations; +package com.phocassoftware.graphql.builder.annotations; public enum SchemaOption { INPUT, diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Subscription.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Subscription.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Subscription.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Subscription.java index f6617054..c51a69ff 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Subscription.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Subscription.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Union.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Union.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Union.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Union.java index d373c92f..ae525ff2 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/annotations/Union.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/annotations/Union.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.annotations; +package com.phocassoftware.graphql.builder.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/exceptions/InvalidOneOfException.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/exceptions/InvalidOneOfException.java similarity index 71% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/exceptions/InvalidOneOfException.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/exceptions/InvalidOneOfException.java index e5cbf0e8..d63a64aa 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/exceptions/InvalidOneOfException.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/exceptions/InvalidOneOfException.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.builder.exceptions; +package com.phocassoftware.graphql.builder.exceptions; public class InvalidOneOfException extends RuntimeException { diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/mapper/ConstructorFieldBuilder.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/mapper/ConstructorFieldBuilder.java similarity index 97% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/mapper/ConstructorFieldBuilder.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/mapper/ConstructorFieldBuilder.java index 35670637..40e47652 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/mapper/ConstructorFieldBuilder.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/mapper/ConstructorFieldBuilder.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.mapper; +package com.phocassoftware.graphql.builder.mapper; import graphql.GraphQLContext; import java.util.ArrayList; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/mapper/InputTypeBuilder.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/mapper/InputTypeBuilder.java similarity index 93% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/mapper/InputTypeBuilder.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/mapper/InputTypeBuilder.java index 0554a41e..5fe8b12d 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/mapper/InputTypeBuilder.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/mapper/InputTypeBuilder.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.mapper; +package com.phocassoftware.graphql.builder.mapper; import graphql.GraphQLContext; import java.util.Locale; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/mapper/ObjectFieldBuilder.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/mapper/ObjectFieldBuilder.java similarity index 94% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/mapper/ObjectFieldBuilder.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/mapper/ObjectFieldBuilder.java index 9fb20d83..1af88f26 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/mapper/ObjectFieldBuilder.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/mapper/ObjectFieldBuilder.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.mapper; +package com.phocassoftware.graphql.builder.mapper; -import com.fleetpin.graphql.builder.EntityProcessor; -import com.fleetpin.graphql.builder.TypeMeta; +import com.phocassoftware.graphql.builder.EntityProcessor; +import com.phocassoftware.graphql.builder.TypeMeta; import graphql.GraphQLContext; import graphql.com.google.common.base.Preconditions; import java.lang.reflect.InvocationTargetException; diff --git a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/mapper/OneOfBuilder.java b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/mapper/OneOfBuilder.java similarity index 88% rename from graphql-builder/src/main/java/com/fleetpin/graphql/builder/mapper/OneOfBuilder.java rename to graphql-builder/src/main/java/com/phocassoftware/graphql/builder/mapper/OneOfBuilder.java index 0484dcbb..8192b84f 100644 --- a/graphql-builder/src/main/java/com/fleetpin/graphql/builder/mapper/OneOfBuilder.java +++ b/graphql-builder/src/main/java/com/phocassoftware/graphql/builder/mapper/OneOfBuilder.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.mapper; +package com.phocassoftware.graphql.builder.mapper; -import com.fleetpin.graphql.builder.EntityProcessor; -import com.fleetpin.graphql.builder.annotations.OneOf; -import com.fleetpin.graphql.builder.exceptions.InvalidOneOfException; +import com.phocassoftware.graphql.builder.EntityProcessor; +import com.phocassoftware.graphql.builder.annotations.OneOf; +import com.phocassoftware.graphql.builder.exceptions.InvalidOneOfException; import graphql.GraphQLContext; import java.util.HashMap; import java.util.Locale; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/AuthorizerTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/AuthorizerTest.java similarity index 92% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/AuthorizerTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/AuthorizerTest.java index 11663049..d7461839 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/AuthorizerTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/AuthorizerTest.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 static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -53,7 +53,7 @@ private ExecutionResult execute(String query) { } private ExecutionResult execute(String query, Map variables) { - GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.authorizer")).build(); + GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.authorizer")).build(); var input = ExecutionInput.newExecutionInput(); input.query(query); if (variables != null) { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/ContextTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ContextTest.java similarity index 90% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/ContextTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ContextTest.java index e6e56e65..b14588ba 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/ContextTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ContextTest.java @@ -9,14 +9,14 @@ * 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 org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.fleetpin.graphql.builder.annotations.Context; -import com.fleetpin.graphql.builder.annotations.Query; -import com.fleetpin.graphql.builder.context.GraphContext; +import com.phocassoftware.graphql.builder.annotations.Context; +import com.phocassoftware.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.context.GraphContext; import graphql.ExecutionInput; import graphql.ExecutionResult; import graphql.GraphQL; @@ -68,7 +68,7 @@ public void testMissing() throws ReflectiveOperationException { private ExecutionResult execute(String query, Consumer modify) { GraphQL schema = GraphQL - .newGraphQL(new IntrospectionWithDirectivesSupport().apply(SchemaBuilder.build("com.fleetpin.graphql.builder.context"))) + .newGraphQL(new IntrospectionWithDirectivesSupport().apply(SchemaBuilder.build("com.phocassoftware.graphql.builder.context"))) .build(); var input = ExecutionInput.newExecutionInput(); input.query(query); diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/DirectiveTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/DirectiveTest.java similarity index 87% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/DirectiveTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/DirectiveTest.java index a374f6a2..b888c31e 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/DirectiveTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/DirectiveTest.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 static org.junit.jupiter.api.Assertions.*; @@ -29,7 +29,7 @@ public class DirectiveTest { @Test public void testDirectiveAppliedToQuery() throws ReflectiveOperationException { - GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.type.directive")).build(); + GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.type.directive")).build(); var cat = schema.getGraphQLSchema().getFieldDefinition(FieldCoordinates.coordinates(schema.getGraphQLSchema().getQueryType(), "getCat")); var capture = cat.getAppliedDirective("Capture"); var argument = capture.getArgument("color"); @@ -39,7 +39,7 @@ public void testDirectiveAppliedToQuery() throws ReflectiveOperationException { @Test public void testNoArgumentDirective() throws ReflectiveOperationException { - GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.type.directive")).build(); + GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.type.directive")).build(); var cat = schema.getGraphQLSchema().getFieldDefinition(FieldCoordinates.coordinates(schema.getGraphQLSchema().getQueryType(), "getUpper")); var uppercase = cat.getAppliedDirective("Uppercase"); assertNotNull(uppercase); @@ -48,7 +48,7 @@ public void testNoArgumentDirective() throws ReflectiveOperationException { @Test public void testPresentOnSchema() throws ReflectiveOperationException { - GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.type.directive")).build(); + GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.type.directive")).build(); var capture = schema.getGraphQLSchema().getSchemaAppliedDirective("Capture"); var argument = capture.getArgument("color"); var color = argument.getValue(); @@ -72,7 +72,7 @@ public void testDirectiveFail() throws ReflectiveOperationException { @Test public void testDirectiveArgument() { - GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.type.directive")).build(); + GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.type.directive")).build(); var cat = schema.getGraphQLSchema().getFieldDefinition(FieldCoordinates.coordinates(schema.getGraphQLSchema().getQueryType(), "getNickname")); var argument = cat.getArgument("nickName"); var directive = argument.getAppliedDirective("Input"); @@ -95,7 +95,7 @@ public void testDirectiveArgumentDefinition() { } private ExecutionResult execute(String query, Map variables) { - GraphQLSchema preSchema = SchemaBuilder.builder().classpath("com.fleetpin.graphql.builder.type.directive").build().build(); + GraphQLSchema preSchema = SchemaBuilder.builder().classpath("com.phocassoftware.graphql.builder.type.directive").build().build(); GraphQL schema = GraphQL.newGraphQL(new IntrospectionWithDirectivesSupport().apply(preSchema)).build(); var input = ExecutionInput.newExecutionInput(); diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/MetaTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/MetaTest.java similarity index 89% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/MetaTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/MetaTest.java index 5e939ff4..f9134b01 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/MetaTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/MetaTest.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 static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -21,7 +21,7 @@ public class MetaTest { @Test public void testDeprecated() throws ReflectiveOperationException { - var schema = SchemaBuilder.build("com.fleetpin.graphql.builder.type"); + var schema = SchemaBuilder.build("com.phocassoftware.graphql.builder.type"); var query = schema.getQueryType().getField("deprecatedTest"); assertTrue(query.isDeprecated()); @@ -35,7 +35,7 @@ public void testDeprecated() throws ReflectiveOperationException { @Test public void testDescription() throws ReflectiveOperationException { - var schema = SchemaBuilder.build("com.fleetpin.graphql.builder.type"); + var schema = SchemaBuilder.build("com.phocassoftware.graphql.builder.type"); var query = schema.getQueryType().getField("descriptionTest"); assertEquals("returns something", query.getDescription()); diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/ParameterParsingTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ParameterParsingTest.java similarity index 98% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/ParameterParsingTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ParameterParsingTest.java index a5be89fb..ee413cd1 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/ParameterParsingTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ParameterParsingTest.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 static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -226,7 +226,7 @@ public void testMultipleArgumentsMix3() throws ReflectiveOperationException { } private ExecutionResult execute(String query) throws ReflectiveOperationException { - var schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.parameter")).build(); + var schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.parameter")).build(); ExecutionResult result = schema.execute(query); if (!result.getErrors().isEmpty()) { throw new RuntimeException(result.getErrors().toString()); //TODO:cleanup diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/ParameterTypeParsingTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ParameterTypeParsingTest.java similarity index 98% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/ParameterTypeParsingTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ParameterTypeParsingTest.java index 27e53b91..dedd6796 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/ParameterTypeParsingTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ParameterTypeParsingTest.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 static org.junit.jupiter.api.Assertions.assertEquals; @@ -174,7 +174,7 @@ private ExecutionResult execute(String query, String type) throws ReflectiveOper Map variables = new HashMap<>(); variables.put("type", obj); - var schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.parameter")).build(); + var schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.parameter")).build(); var input = ExecutionInput.newExecutionInput().query(query).variables(variables).build(); ExecutionResult result = schema.execute(input); if (!result.getErrors().isEmpty()) { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/PublishRestrictions.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/PublishRestrictions.java similarity index 87% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/PublishRestrictions.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/PublishRestrictions.java index 9d137f9d..45c43c08 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/PublishRestrictions.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/PublishRestrictions.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 static org.junit.jupiter.api.Assertions.assertEquals; @@ -25,7 +25,7 @@ public class PublishRestrictions { @Test public void testOptionalArray() throws ReflectiveOperationException { - var schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.publishRestrictions")).build(); + var schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.publishRestrictions")).build(); var res = schema.execute("subscription {test {value}} "); Publisher response = res.getData(); assertEquals(0, Flowable.fromPublisher(response).count().blockingGet()); diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/RecordTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/RecordTest.java similarity index 97% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/RecordTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/RecordTest.java index f077c4d3..4027c940 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/RecordTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/RecordTest.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 static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -162,7 +162,7 @@ public void testInnerNullableArrayFails() { } private ExecutionResult execute(String query, Map variables) { - GraphQL schema = GraphQL.newGraphQL(new IntrospectionWithDirectivesSupport().apply(SchemaBuilder.build("com.fleetpin.graphql.builder.record"))).build(); + GraphQL schema = GraphQL.newGraphQL(new IntrospectionWithDirectivesSupport().apply(SchemaBuilder.build("com.phocassoftware.graphql.builder.record"))).build(); var input = ExecutionInput.newExecutionInput(); input.query(query); if (variables != null) { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/RenameTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/RenameTest.java similarity index 94% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/RenameTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/RenameTest.java index 5133f278..90235d93 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/RenameTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/RenameTest.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 com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -71,7 +71,7 @@ query passthroughRecord($type: RecordTypeInput!) { } private ExecutionResult execute(String query, Map variables) { - GraphQL schema = GraphQL.newGraphQL(new IntrospectionWithDirectivesSupport().apply(SchemaBuilder.build("com.fleetpin.graphql.builder.rename"))).build(); + GraphQL schema = GraphQL.newGraphQL(new IntrospectionWithDirectivesSupport().apply(SchemaBuilder.build("com.phocassoftware.graphql.builder.rename"))).build(); var input = ExecutionInput.newExecutionInput(); input.query(query); if (variables != null) { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/ScalarTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ScalarTest.java similarity index 91% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/ScalarTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ScalarTest.java index 76bd04eb..f3b1e80a 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/ScalarTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/ScalarTest.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 static org.junit.jupiter.api.Assertions.assertEquals; -import com.fleetpin.graphql.builder.scalar.Fur; -import com.fleetpin.graphql.builder.scalar.Shape; +import com.phocassoftware.graphql.builder.scalar.Fur; +import com.phocassoftware.graphql.builder.scalar.Shape; import graphql.ExecutionInput; import graphql.ExecutionResult; import graphql.GraphQL; @@ -98,7 +98,7 @@ private ExecutionResult execute(String query, Map variables) { GraphQL schema = GraphQL .newGraphQL( new IntrospectionWithDirectivesSupport() - .apply(SchemaBuilder.builder().classpath("com.fleetpin.graphql.builder.scalar").scalar(ExtendedScalars.GraphQLLong).build().build()) + .apply(SchemaBuilder.builder().classpath("com.phocassoftware.graphql.builder.scalar").scalar(ExtendedScalars.GraphQLLong).build().build()) ) .build(); var input = ExecutionInput.newExecutionInput(); diff --git a/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeGenericEncapsulationParsingTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeGenericEncapsulationParsingTest.java new file mode 100644 index 00000000..d3f97a37 --- /dev/null +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeGenericEncapsulationParsingTest.java @@ -0,0 +1,184 @@ +/* + * 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 limitations under + * the License. + */ +package com.phocassoftware.graphql.builder; + +import graphql.ExecutionResult; +import graphql.GraphQL; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.util.List; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class TypeGenericEncapsulationParsingTest { + @Test + public void testCatName() throws ReflectiveOperationException { + var name = getField("Cat", "OBJECT", "name"); + var nonNull = confirmNonNull(name); + confirmString(nonNull); + } + + @Test + public void testCatFur() throws ReflectiveOperationException { + var name = getField("Cat", "OBJECT", "fur"); + var nonNull = confirmNonNull(name); + confirmObject(nonNull, "CatFur"); + } + + @Test + public void testCatFurs() throws ReflectiveOperationException { + var name = getField("Cat", "OBJECT", "furs"); + var type = confirmNonNull(name); + type = confirmArray(type); + type = confirmNonNull(type); + confirmObject(type, "CatFur"); + } + + @Test + public void testDogName() throws ReflectiveOperationException { + var name = getField("Dog", "OBJECT", "name"); + var nonNull = confirmNonNull(name); + confirmString(nonNull); + } + + @Test + public void testDogFur() throws ReflectiveOperationException { + var name = getField("Dog", "OBJECT", "fur"); + var nonNull = confirmNonNull(name); + confirmObject(nonNull, "DogFur"); + } + + @Test + public void testDogFurs() throws ReflectiveOperationException { + var name = getField("Dog", "OBJECT", "furs"); + var type = confirmNonNull(name); + type = confirmArray(type); + type = confirmNonNull(type); + confirmObject(type, "DogFur"); + } + + private void confirmString(Map type) { + Assertions.assertEquals("SCALAR", type.get("kind")); + Assertions.assertEquals("String", type.get("name")); + } + + private void confirmInterface(Map type, String name) { + Assertions.assertEquals("INTERFACE", type.get("kind")); + Assertions.assertEquals(name, type.get("name")); + } + + private void confirmObject(Map type, String name) { + Assertions.assertEquals("OBJECT", type.get("kind")); + Assertions.assertEquals(name, type.get("name")); + } + + private void confirmBoolean(Map type) { + Assertions.assertEquals("SCALAR", type.get("kind")); + Assertions.assertEquals("Boolean", type.get("name")); + } + + private void confirmNumber(Map type) { + Assertions.assertEquals("SCALAR", type.get("kind")); + Assertions.assertEquals("Int", type.get("name")); + } + + private Map confirmNonNull(Map type) { + Assertions.assertEquals("NON_NULL", type.get("kind")); + var toReturn = (Map) type.get("ofType"); + Assertions.assertNotNull(toReturn); + return toReturn; + } + + private Map confirmArray(Map type) { + Assertions.assertEquals("LIST", type.get("kind")); + var toReturn = (Map) type.get("ofType"); + Assertions.assertNotNull(toReturn); + return toReturn; + } + + public Map getField(String typeName, String kind, String name) throws ReflectiveOperationException { + Map> response = execute( + "{" + + " __type(name: \"" + + typeName + + "\") {" + + " name" + + " kind" + + " fields {" + + " name" + + " type {" + + " name" + + " kind" + + " ofType {" + + " name" + + " kind" + + " ofType {" + + " name" + + " kind" + + " ofType {" + + " name" + + " kind" + + " }" + + " }" + + " }" + + " }" + + " }" + + " }" + + "} " + ) + .getData(); + var type = response.get("__type"); + Assertions.assertEquals(typeName, type.get("name")); + Assertions.assertEquals(kind, type.get("kind")); + + List> fields = (List>) type.get("fields"); + var field = fields.stream().filter(map -> map.get("name").equals(name)).findAny().get(); + Assertions.assertEquals(name, field.get("name")); + return (Map) field.get("type"); + } + + @Test + public void testQueryCatFur() throws ReflectiveOperationException { + Map> response = execute( + "query { " + + "getCat {" + + " name " + + " fur{ " + + " calico " + + " length" + + " long" + + " }" + + " } " + + "} " + ) + .getData(); + + var cat = response.get("getCat"); + var catFur = (Map) cat.get("fur"); + + assertEquals("name", cat.get("name")); + assertEquals(4, catFur.get("length")); + assertEquals(true, catFur.get("calico")); + + } + + private ExecutionResult execute(String query) { + GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.generics.encapsulation")).build(); + ExecutionResult result = schema.execute(query); + if (!result.getErrors().isEmpty()) { + throw new RuntimeException(result.getErrors().toString()); + } + return result; + } +} diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeGenericInputParsingTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeGenericInputParsingTest.java similarity index 97% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeGenericInputParsingTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeGenericInputParsingTest.java index b8b0ba80..957a1db0 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeGenericInputParsingTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeGenericInputParsingTest.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 static org.junit.jupiter.api.Assertions.assertEquals; @@ -195,7 +195,7 @@ public void testQueryCatFurGeneric() throws ReflectiveOperationException { } private ExecutionResult execute(String query) { - GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.inputgenerics")).build(); + GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.inputgenerics")).build(); ExecutionResult result = schema.execute(query); if (!result.getErrors().isEmpty()) { throw new RuntimeException(result.getErrors().toString()); diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeGenericInputRecords.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeGenericInputRecords.java similarity index 92% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeGenericInputRecords.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeGenericInputRecords.java index babab3b7..350c84ec 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeGenericInputRecords.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeGenericInputRecords.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 static org.junit.jupiter.api.Assertions.assertEquals; @@ -69,7 +69,7 @@ public void textQueryNull() throws ReflectiveOperationException { } private ExecutionResult execute(String query) { - GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.inputgenericsRecords")).build(); + GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.inputgenericsRecords")).build(); ExecutionResult result = schema.execute(query); if (!result.getErrors().isEmpty()) { ExceptionWhileDataFetching d = (ExceptionWhileDataFetching) result.getErrors().get(0); diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeGenericParsingTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeGenericParsingTest.java similarity index 98% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeGenericParsingTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeGenericParsingTest.java index 4d588ee1..2011106b 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeGenericParsingTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeGenericParsingTest.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 static org.junit.jupiter.api.Assertions.assertEquals; @@ -308,7 +308,7 @@ public void testMutationCatFur() throws ReflectiveOperationException { } private ExecutionResult execute(String query) { - GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.generics")).build(); + GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.generics.inheritance")).build(); ExecutionResult result = schema.execute(query); if (!result.getErrors().isEmpty()) { throw new RuntimeException(result.getErrors().toString()); diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeInheritanceParsingTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeInheritanceParsingTest.java similarity index 98% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeInheritanceParsingTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeInheritanceParsingTest.java index 36808ac6..3fc505cc 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeInheritanceParsingTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeInheritanceParsingTest.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 static org.junit.jupiter.api.Assertions.*; -import com.fleetpin.graphql.builder.exceptions.InvalidOneOfException; +import com.phocassoftware.graphql.builder.exceptions.InvalidOneOfException; import graphql.ExceptionWhileDataFetching; import graphql.ExecutionInput; import graphql.ExecutionResult; @@ -487,7 +487,7 @@ private ExecutionResult execute(String query) { } private ExecutionResult execute(String query, Map variables) { - GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.type")).build(); + GraphQL schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.type")).build(); var input = ExecutionInput.newExecutionInput(); input.query(query); if (variables != null) { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeParsingTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeParsingTest.java similarity index 97% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeParsingTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeParsingTest.java index feaec82e..58c47190 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/TypeParsingTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/TypeParsingTest.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 static org.junit.jupiter.api.Assertions.assertEquals; @@ -237,7 +237,7 @@ public void testQuery() throws ReflectiveOperationException { } private ExecutionResult execute(String query) throws ReflectiveOperationException { - var schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.type")).build(); + var schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.type")).build(); ExecutionResult result = schema.execute(query); if (!result.getErrors().isEmpty()) { throw new RuntimeException(result.getErrors().toString()); //TODO:cleanup diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/UnionTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/UnionTest.java similarity index 94% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/UnionTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/UnionTest.java index 58cec936..e1989960 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/UnionTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/UnionTest.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 static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -75,7 +75,7 @@ public void testUnionFailure() throws ReflectiveOperationException { } private ExecutionResult execute(String query) throws ReflectiveOperationException { - var schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.type")).build(); + var schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.type")).build(); ExecutionResult result = schema.execute(query); if (!result.getErrors().isEmpty()) { throw new RuntimeException(result.getErrors().toString()); //TODO:cleanup diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/authorizer/Cat.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/authorizer/Cat.java similarity index 81% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/authorizer/Cat.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/authorizer/Cat.java index e228c565..136358be 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/authorizer/Cat.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/authorizer/Cat.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.authorizer; +package com.phocassoftware.graphql.builder.authorizer; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Query; @Entity public class Cat { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/authorizer/CatAuthorizer.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/authorizer/CatAuthorizer.java similarity index 86% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/authorizer/CatAuthorizer.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/authorizer/CatAuthorizer.java index bc0fe8f6..3814b787 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/authorizer/CatAuthorizer.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/authorizer/CatAuthorizer.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.authorizer; +package com.phocassoftware.graphql.builder.authorizer; -import com.fleetpin.graphql.builder.Authorizer; +import com.phocassoftware.graphql.builder.Authorizer; public class CatAuthorizer implements Authorizer { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/context/GraphContext.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/context/GraphContext.java similarity index 86% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/context/GraphContext.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/context/GraphContext.java index 22101ac5..d74757a0 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/context/GraphContext.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/context/GraphContext.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.context; +package com.phocassoftware.graphql.builder.context; -import com.fleetpin.graphql.builder.annotations.Context; +import com.phocassoftware.graphql.builder.annotations.Context; @Context public class GraphContext { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/context/Queries.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/context/Queries.java similarity index 87% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/context/Queries.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/context/Queries.java index f4aefff3..fd201b0e 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/context/Queries.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/context/Queries.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.context; +package com.phocassoftware.graphql.builder.context; -import com.fleetpin.graphql.builder.annotations.Context; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Context; +import com.phocassoftware.graphql.builder.annotations.Query; import graphql.GraphQLContext; import graphql.schema.DataFetchingEnvironment; diff --git a/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/Animal.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/Animal.java new file mode 100644 index 00000000..132a4a03 --- /dev/null +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/Animal.java @@ -0,0 +1,73 @@ +/* + * 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 limitations under + * the License. + */ +package com.phocassoftware.graphql.builder.generics.encapsulation; + +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Mutation; +import com.phocassoftware.graphql.builder.annotations.Query; + +import java.util.Arrays; +import java.util.List; +import java.util.Optional; + +public abstract class Animal { + + private final T fur; + + Animal(T fur) { + this.fur = fur; + } + + public String getName() { + return "name"; + } + + public T getFur() { + return fur; + } + + public List getFurs() { + return Arrays.asList(fur); + } + +// @Query +// public static List> animals() { +// return Arrays.asList(new Cat(), new Dog()); +// } +// +// @Mutation +// public static MutationResponse makeCat() { +// return new GenericMutationResponse<>(Optional.of(new Cat())); +// } +// +// @Entity +// public abstract static class MutationResponse { +// +// private Optional> item; +// +// public MutationResponse(Optional> item) { +// this.item = item; +// } +// +// public Optional> getItem() { +// return item; +// } +// } +// +// @Entity +// public static class GenericMutationResponse extends MutationResponse { +// +// public GenericMutationResponse(Optional> item) { +// super(item); +// } +// } +} diff --git a/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/Cat.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/Cat.java new file mode 100644 index 00000000..a78d4bcd --- /dev/null +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/Cat.java @@ -0,0 +1,29 @@ +/* + * 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 limitations under + * the License. + */ +package com.phocassoftware.graphql.builder.generics.encapsulation; + +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Mutation; +import com.phocassoftware.graphql.builder.annotations.Query; + + +public class Cat extends CatFamily { + + public Cat() { + super(new CatFur()); + } + + @Query + public static Cat getCat() { + return new Cat(); + } +} diff --git a/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/CatFamily.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/CatFamily.java new file mode 100644 index 00000000..fdd0c0c5 --- /dev/null +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/CatFamily.java @@ -0,0 +1,21 @@ +/* + * 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 limitations under + * the License. + */ +package com.phocassoftware.graphql.builder.generics.encapsulation; + +import com.phocassoftware.graphql.builder.annotations.Entity; + +public abstract class CatFamily extends Animal { + + CatFamily(R fur) { + super(fur); + } +} diff --git a/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/CatFamilyFur.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/CatFamilyFur.java new file mode 100644 index 00000000..44e83896 --- /dev/null +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/CatFamilyFur.java @@ -0,0 +1,21 @@ +/* + * 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 limitations under + * the License. + */ +package com.phocassoftware.graphql.builder.generics.encapsulation; + +import com.phocassoftware.graphql.builder.annotations.Entity; + +public abstract class CatFamilyFur extends Fur { + + public boolean isLong() { + return true; + } +} diff --git a/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/CatFur.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/CatFur.java new file mode 100644 index 00000000..23bad358 --- /dev/null +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/CatFur.java @@ -0,0 +1,22 @@ +/* + * 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 limitations under + * the License. + */ +package com.phocassoftware.graphql.builder.generics.encapsulation; + +import com.phocassoftware.graphql.builder.annotations.Entity; + + +public class CatFur extends CatFamilyFur { + + public boolean isCalico() { + return true; + } +} diff --git a/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/Dog.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/Dog.java new file mode 100644 index 00000000..5a1480f5 --- /dev/null +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/Dog.java @@ -0,0 +1,33 @@ +/* + * 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 limitations under + * the License. + */ +package com.phocassoftware.graphql.builder.generics.encapsulation; + +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Mutation; +import com.phocassoftware.graphql.builder.annotations.Query; + + +public class Dog extends Animal { + + public Dog() { + super(new DogFur()); + } + + public int getAge() { + return 6; + } + + @Query + public static Dog getDog() { + return new Dog(); + } +} diff --git a/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/DogFur.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/DogFur.java new file mode 100644 index 00000000..99cc77c6 --- /dev/null +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/DogFur.java @@ -0,0 +1,25 @@ +/* + * 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 limitations under + * the License. + */ +package com.phocassoftware.graphql.builder.generics.encapsulation; + +import com.phocassoftware.graphql.builder.annotations.Entity; + +public class DogFur extends Fur { + + public boolean isShaggy() { + return true; + } + + public String getLong() { + return "very"; + } +} diff --git a/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/Fur.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/Fur.java new file mode 100644 index 00000000..fcdb070f --- /dev/null +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/encapsulation/Fur.java @@ -0,0 +1,21 @@ +/* + * 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 limitations under + * the License. + */ +package com.phocassoftware.graphql.builder.generics.encapsulation; + +import com.phocassoftware.graphql.builder.annotations.Entity; + +public abstract class Fur { + + public int getLength() { + return 4; + } +} diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/Animal.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/Animal.java similarity index 86% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/Animal.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/Animal.java index 8969d943..4ba21657 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/Animal.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/Animal.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.generics; +package com.phocassoftware.graphql.builder.generics.inheritance; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Mutation; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Mutation; +import com.phocassoftware.graphql.builder.annotations.Query; import java.util.Arrays; import java.util.List; import java.util.Optional; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/Cat.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/Cat.java similarity index 78% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/Cat.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/Cat.java index 1a67ebd9..6a1b6cbd 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/Cat.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/Cat.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.generics; +package com.phocassoftware.graphql.builder.generics.inheritance; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Mutation; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Mutation; @Entity public class Cat extends CatFamily { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/CatFamily.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/CatFamily.java similarity index 84% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/CatFamily.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/CatFamily.java index 73a1d49b..431b3607 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/CatFamily.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/CatFamily.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.generics; +package com.phocassoftware.graphql.builder.generics.inheritance; -import com.fleetpin.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Entity; @Entity public abstract class CatFamily extends Animal { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/CatFamilyFur.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/CatFamilyFur.java similarity index 83% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/CatFamilyFur.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/CatFamilyFur.java index 07a9ea47..4b00ceb6 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/CatFamilyFur.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/CatFamilyFur.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.generics; +package com.phocassoftware.graphql.builder.generics.inheritance; -import com.fleetpin.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Entity; @Entity public abstract class CatFamilyFur extends Fur { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/CatFur.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/CatFur.java similarity index 83% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/CatFur.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/CatFur.java index 7a0730cc..2973a5ad 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/CatFur.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/CatFur.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.generics; +package com.phocassoftware.graphql.builder.generics.inheritance; -import com.fleetpin.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Entity; @Entity public class CatFur extends CatFamilyFur { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/Dog.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/Dog.java similarity index 79% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/Dog.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/Dog.java index 3e00a5c8..81962708 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/Dog.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/Dog.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.generics; +package com.phocassoftware.graphql.builder.generics.inheritance; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Mutation; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Mutation; @Entity public class Dog extends Animal { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/DogFur.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/DogFur.java similarity index 84% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/DogFur.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/DogFur.java index c91fb961..26311a4e 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/DogFur.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/DogFur.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.generics; +package com.phocassoftware.graphql.builder.generics.inheritance; -import com.fleetpin.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Entity; @Entity public class DogFur extends Fur { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/Fur.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/Fur.java similarity index 83% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/Fur.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/Fur.java index 590e14dc..3a06ec46 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/generics/Fur.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/generics/inheritance/Fur.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.generics; +package com.phocassoftware.graphql.builder.generics.inheritance; -import com.fleetpin.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Entity; @Entity public abstract class Fur { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/Animal.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/Animal.java similarity index 79% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/Animal.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/Animal.java index e0e29ee6..d6d7d791 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/Animal.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/Animal.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.inputgenerics; +package com.phocassoftware.graphql.builder.inputgenerics; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.SchemaOption; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.SchemaOption; @Entity public abstract class Animal { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/AnimalInput.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/AnimalInput.java similarity index 81% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/AnimalInput.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/AnimalInput.java index 6f736b9b..1cddb58f 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/AnimalInput.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/AnimalInput.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.inputgenerics; +package com.phocassoftware.graphql.builder.inputgenerics; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.SchemaOption; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.SchemaOption; @Entity(SchemaOption.INPUT) public class AnimalInput { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/AnimalOuterWrapper.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/AnimalOuterWrapper.java similarity index 82% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/AnimalOuterWrapper.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/AnimalOuterWrapper.java index 5dfa8aa5..e7ce674f 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/AnimalOuterWrapper.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/AnimalOuterWrapper.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.inputgenerics; +package com.phocassoftware.graphql.builder.inputgenerics; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.SchemaOption; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.SchemaOption; @Entity(SchemaOption.BOTH) public class AnimalOuterWrapper { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/AnimalWrapper.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/AnimalWrapper.java similarity index 87% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/AnimalWrapper.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/AnimalWrapper.java index 19674dca..09600760 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/AnimalWrapper.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/AnimalWrapper.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.inputgenerics; +package com.phocassoftware.graphql.builder.inputgenerics; -import com.fleetpin.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Entity; @Entity public class AnimalWrapper { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/Cat.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/Cat.java similarity index 80% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/Cat.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/Cat.java index e0d45fe7..4eec2906 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/Cat.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/Cat.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.inputgenerics; +package com.phocassoftware.graphql.builder.inputgenerics; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Mutation; -import com.fleetpin.graphql.builder.annotations.Query; -import com.fleetpin.graphql.builder.annotations.SchemaOption; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Mutation; +import com.phocassoftware.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.SchemaOption; @Entity(SchemaOption.BOTH) public class Cat extends Animal { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/CatAnimalInput.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/CatAnimalInput.java similarity index 77% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/CatAnimalInput.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/CatAnimalInput.java index 560ef233..6d5ac91c 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenerics/CatAnimalInput.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenerics/CatAnimalInput.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.inputgenerics; +package com.phocassoftware.graphql.builder.inputgenerics; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.SchemaOption; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.SchemaOption; @Entity(SchemaOption.INPUT) public class CatAnimalInput extends AnimalInput {} diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenericsRecords/Change.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenericsRecords/Change.java similarity index 88% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenericsRecords/Change.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenericsRecords/Change.java index f2f75338..e8451502 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenericsRecords/Change.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenericsRecords/Change.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.inputgenericsRecords; +package com.phocassoftware.graphql.builder.inputgenericsRecords; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Query; import jakarta.annotation.Nullable; import java.util.List; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenericsRecords/Wrapper.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenericsRecords/Wrapper.java similarity index 90% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenericsRecords/Wrapper.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenericsRecords/Wrapper.java index 74365b8c..19dd6181 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/inputgenericsRecords/Wrapper.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/inputgenericsRecords/Wrapper.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.inputgenericsRecords; +package com.phocassoftware.graphql.builder.inputgenericsRecords; import jakarta.annotation.Nullable; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/methodArgs/Queries.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/methodArgs/Queries.java similarity index 89% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/methodArgs/Queries.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/methodArgs/Queries.java index 0d3acc5c..0e552920 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/methodArgs/Queries.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/methodArgs/Queries.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.methodArgs; +package com.phocassoftware.graphql.builder.methodArgs; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Query; public class Queries { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/methodArgsTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/methodArgsTest.java similarity index 93% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/methodArgsTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/methodArgsTest.java index 69ba7368..7c080317 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/methodArgsTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/methodArgsTest.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 static org.junit.jupiter.api.Assertions.assertEquals; @@ -38,7 +38,7 @@ public void testEntireContext() { private ExecutionResult execute(String query, Map variables) { GraphQL schema = GraphQL - .newGraphQL(new IntrospectionWithDirectivesSupport().apply(SchemaBuilder.build("com.fleetpin.graphql.builder.methodArgs"))) + .newGraphQL(new IntrospectionWithDirectivesSupport().apply(SchemaBuilder.build("com.phocassoftware.graphql.builder.methodArgs"))) .build(); var input = ExecutionInput.newExecutionInput(); input.query(query); diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/parameter/Parameter.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/parameter/Parameter.java similarity index 91% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/parameter/Parameter.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/parameter/Parameter.java index 1480fad5..dc21d10d 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/parameter/Parameter.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/parameter/Parameter.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.parameter; +package com.phocassoftware.graphql.builder.parameter; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Id; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Id; +import com.phocassoftware.graphql.builder.annotations.Query; import java.util.List; import java.util.Optional; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/parameter/TypeInputParameter.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/parameter/TypeInputParameter.java similarity index 86% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/parameter/TypeInputParameter.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/parameter/TypeInputParameter.java index 81f6af8f..d798f561 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/parameter/TypeInputParameter.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/parameter/TypeInputParameter.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.parameter; +package com.phocassoftware.graphql.builder.parameter; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.GraphQLDescription; -import com.fleetpin.graphql.builder.annotations.Query; -import com.fleetpin.graphql.builder.annotations.SchemaOption; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.GraphQLDescription; +import com.phocassoftware.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.SchemaOption; import java.util.List; import java.util.Optional; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/publishRestrictions/Test.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/publishRestrictions/Test.java similarity index 80% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/publishRestrictions/Test.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/publishRestrictions/Test.java index ff0927a6..69c7c135 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/publishRestrictions/Test.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/publishRestrictions/Test.java @@ -9,14 +9,14 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package com.fleetpin.graphql.builder.publishRestrictions; +package com.phocassoftware.graphql.builder.publishRestrictions; -import com.fleetpin.graphql.builder.RestrictType; -import com.fleetpin.graphql.builder.RestrictTypeFactory; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Query; -import com.fleetpin.graphql.builder.annotations.Restrict; -import com.fleetpin.graphql.builder.annotations.Subscription; +import com.phocassoftware.graphql.builder.RestrictType; +import com.phocassoftware.graphql.builder.RestrictTypeFactory; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Restrict; +import com.phocassoftware.graphql.builder.annotations.Subscription; import graphql.schema.DataFetchingEnvironment; import io.reactivex.rxjava3.core.Flowable; import java.util.concurrent.CompletableFuture; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/record/Queries.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/record/Queries.java similarity index 84% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/record/Queries.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/record/Queries.java index 8c09be2e..51ba846c 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/record/Queries.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/record/Queries.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.record; +package com.phocassoftware.graphql.builder.record; -import com.fleetpin.graphql.builder.annotations.GraphQLDescription; -import com.fleetpin.graphql.builder.annotations.InnerNullable; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.GraphQLDescription; +import com.phocassoftware.graphql.builder.annotations.InnerNullable; +import com.phocassoftware.graphql.builder.annotations.Query; import java.util.List; import java.util.Optional; import javax.annotation.Nullable; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/rename/Queries.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/rename/Queries.java similarity index 87% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/rename/Queries.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/rename/Queries.java index 84be3fde..7ddce9d3 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/rename/Queries.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/rename/Queries.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.rename; +package com.phocassoftware.graphql.builder.rename; -import com.fleetpin.graphql.builder.annotations.GraphQLName; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.GraphQLName; +import com.phocassoftware.graphql.builder.annotations.Query; public class Queries { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/EntityRestrictions.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/EntityRestrictions.java similarity index 81% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/EntityRestrictions.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/EntityRestrictions.java index 09a95a16..1a853d9e 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/EntityRestrictions.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/EntityRestrictions.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.restrictions; +package com.phocassoftware.graphql.builder.restrictions; -import com.fleetpin.graphql.builder.RestrictType; -import com.fleetpin.graphql.builder.RestrictTypeFactory; -import com.fleetpin.graphql.builder.restrictions.parameter.RestrictedEntity; +import com.phocassoftware.graphql.builder.RestrictType; +import com.phocassoftware.graphql.builder.RestrictTypeFactory; +import com.phocassoftware.graphql.builder.restrictions.parameter.RestrictedEntity; import graphql.schema.DataFetchingEnvironment; import java.util.concurrent.CompletableFuture; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/RestrictionTypesTest.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/RestrictionTypesTest.java similarity index 96% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/RestrictionTypesTest.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/RestrictionTypesTest.java index 62c766b4..0ea0f675 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/RestrictionTypesTest.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/RestrictionTypesTest.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.restrictions; +package com.phocassoftware.graphql.builder.restrictions; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; -import com.fleetpin.graphql.builder.SchemaBuilder; +import com.phocassoftware.graphql.builder.SchemaBuilder; import graphql.ExecutionInput; import graphql.ExecutionResult; import graphql.GraphQL; @@ -35,7 +35,7 @@ public class RestrictionTypesTest { @BeforeAll public static void init() throws ReflectiveOperationException { - schema = GraphQL.newGraphQL(SchemaBuilder.build("com.fleetpin.graphql.builder.restrictions.parameter")).build(); + schema = GraphQL.newGraphQL(SchemaBuilder.build("com.phocassoftware.graphql.builder.restrictions.parameter")).build(); } private static String singleQueryGql = "query entityQuery( $allowed: Boolean! ) { single(allowed: $allowed) { __typename } }"; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/parameter/RestrictedEntity.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/parameter/RestrictedEntity.java similarity index 85% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/parameter/RestrictedEntity.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/parameter/RestrictedEntity.java index 3d148750..665acee3 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/parameter/RestrictedEntity.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/parameter/RestrictedEntity.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.restrictions.parameter; +package com.phocassoftware.graphql.builder.restrictions.parameter; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Query; -import com.fleetpin.graphql.builder.annotations.Restrict; -import com.fleetpin.graphql.builder.restrictions.EntityRestrictions; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Restrict; +import com.phocassoftware.graphql.builder.restrictions.EntityRestrictions; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/parameter/RestrictedEntityInheritance.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/parameter/RestrictedEntityInheritance.java similarity index 88% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/parameter/RestrictedEntityInheritance.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/parameter/RestrictedEntityInheritance.java index fa5b2181..f815ca67 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/parameter/RestrictedEntityInheritance.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/parameter/RestrictedEntityInheritance.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.restrictions.parameter; +package com.phocassoftware.graphql.builder.restrictions.parameter; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Query; import java.util.List; import java.util.stream.Collectors; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/parameter/RestrictedEntityParent.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/parameter/RestrictedEntityParent.java similarity index 85% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/parameter/RestrictedEntityParent.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/parameter/RestrictedEntityParent.java index e7389276..17eddd11 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/restrictions/parameter/RestrictedEntityParent.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/restrictions/parameter/RestrictedEntityParent.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.restrictions.parameter; +package com.phocassoftware.graphql.builder.restrictions.parameter; -import com.fleetpin.graphql.builder.RestrictType; -import com.fleetpin.graphql.builder.RestrictTypeFactory; -import com.fleetpin.graphql.builder.annotations.Restrict; +import com.phocassoftware.graphql.builder.RestrictType; +import com.phocassoftware.graphql.builder.RestrictTypeFactory; +import com.phocassoftware.graphql.builder.annotations.Restrict; import graphql.schema.DataFetchingEnvironment; import java.util.concurrent.CompletableFuture; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/Capture.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/Capture.java similarity index 88% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/Capture.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/Capture.java index 94a1f681..d30392c0 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/Capture.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/Capture.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.scalar; +package com.phocassoftware.graphql.builder.scalar; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.fleetpin.graphql.builder.annotations.Directive; +import com.phocassoftware.graphql.builder.annotations.Directive; import graphql.introspection.Introspection.DirectiveLocation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/CaptureType.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/CaptureType.java similarity index 77% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/CaptureType.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/CaptureType.java index 413d7b43..b4ed04ac 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/CaptureType.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/CaptureType.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.scalar; +package com.phocassoftware.graphql.builder.scalar; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.SchemaOption; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.SchemaOption; @Entity(SchemaOption.INPUT) public class CaptureType {} diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/Cat.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/Cat.java similarity index 84% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/Cat.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/Cat.java index fcbdc9dd..b8aab383 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/Cat.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/Cat.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.scalar; +package com.phocassoftware.graphql.builder.scalar; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Query; @Entity public class Cat { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/Fur.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/Fur.java similarity index 89% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/Fur.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/Fur.java index 0c2f2a6b..31dd5ba1 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/Fur.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/Fur.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.scalar; +package com.phocassoftware.graphql.builder.scalar; -import com.fleetpin.graphql.builder.annotations.GraphQLDescription; -import com.fleetpin.graphql.builder.annotations.Scalar; +import com.phocassoftware.graphql.builder.annotations.GraphQLDescription; +import com.phocassoftware.graphql.builder.annotations.Scalar; import graphql.schema.Coercing; import graphql.schema.CoercingParseLiteralException; import graphql.schema.CoercingParseValueException; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/Shape.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/Shape.java similarity index 93% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/Shape.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/Shape.java index fb73e844..1a16b670 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/scalar/Shape.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/scalar/Shape.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.scalar; +package com.phocassoftware.graphql.builder.scalar; -import com.fleetpin.graphql.builder.annotations.Scalar; +import com.phocassoftware.graphql.builder.annotations.Scalar; import graphql.schema.Coercing; import graphql.schema.CoercingParseLiteralException; import graphql.schema.CoercingParseValueException; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/Circular.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/Circular.java similarity index 80% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/Circular.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/Circular.java index 1f0bd46b..c6068ebb 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/Circular.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/Circular.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.type; +package com.phocassoftware.graphql.builder.type; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Mutation; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Mutation; @Entity public class Circular { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/DeprecatedObject.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/DeprecatedObject.java similarity index 76% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/DeprecatedObject.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/DeprecatedObject.java index c8e3800d..8eeb03e9 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/DeprecatedObject.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/DeprecatedObject.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.type; +package com.phocassoftware.graphql.builder.type; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.GraphQLDeprecated; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.GraphQLDeprecated; +import com.phocassoftware.graphql.builder.annotations.Query; @Entity public class DeprecatedObject { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/DescriptionObject.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/DescriptionObject.java similarity index 78% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/DescriptionObject.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/DescriptionObject.java index d3d58ba6..7014011a 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/DescriptionObject.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/DescriptionObject.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.type; +package com.phocassoftware.graphql.builder.type; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.GraphQLDescription; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.GraphQLDescription; +import com.phocassoftware.graphql.builder.annotations.Query; @Entity @GraphQLDescription("test description comes through") diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/SimpleType.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/SimpleType.java similarity index 92% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/SimpleType.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/SimpleType.java index 9b21a5fa..8187c5f2 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/SimpleType.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/SimpleType.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.type; +package com.phocassoftware.graphql.builder.type; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Query; import java.util.Arrays; import java.util.List; import java.util.Optional; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/UnionType.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/UnionType.java similarity index 82% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/UnionType.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/UnionType.java index f754ba15..5c756f12 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/UnionType.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/UnionType.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.type; +package com.phocassoftware.graphql.builder.type; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Query; -import com.fleetpin.graphql.builder.annotations.Union; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Union; import java.util.List; @Entity diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Admin.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Admin.java similarity index 83% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Admin.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Admin.java index a1e1cfa4..be7620d9 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Admin.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Admin.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.type.directive; +package com.phocassoftware.graphql.builder.type.directive; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.fleetpin.graphql.builder.DirectiveCaller; -import com.fleetpin.graphql.builder.annotations.DataFetcherWrapper; -import com.fleetpin.graphql.builder.annotations.Directive; +import com.phocassoftware.graphql.builder.DirectiveCaller; +import com.phocassoftware.graphql.builder.annotations.DataFetcherWrapper; +import com.phocassoftware.graphql.builder.annotations.Directive; import graphql.introspection.Introspection; import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Cat.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/BasicCat.java similarity index 74% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Cat.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/BasicCat.java index 99354009..c2c315f2 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Cat.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/BasicCat.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.type.directive; +package com.phocassoftware.graphql.builder.type.directive; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Query; @Entity -public class Cat { +public class BasicCat { public boolean isCalico() { return true; @@ -31,14 +31,14 @@ public boolean getFur() { @Query @Capture(color = "meow") - public static Cat getCat() { - return new Cat(); + public static BasicCat getCat() { + return new BasicCat(); } @Query @Uppercase - public static Cat getUpper() { - return new Cat(); + public static BasicCat getUpper() { + return new BasicCat(); } @Query diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Capture.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Capture.java similarity index 89% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Capture.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Capture.java index daa0d34b..f96a515f 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Capture.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Capture.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.type.directive; +package com.phocassoftware.graphql.builder.type.directive; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.fleetpin.graphql.builder.annotations.Directive; +import com.phocassoftware.graphql.builder.annotations.Directive; import graphql.introspection.Introspection; import graphql.introspection.Introspection.DirectiveLocation; import java.lang.annotation.ElementType; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/CaptureType.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/CaptureType.java similarity index 80% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/CaptureType.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/CaptureType.java index 3d7c9238..59448e7b 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/CaptureType.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/CaptureType.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.type.directive; +package com.phocassoftware.graphql.builder.type.directive; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.SchemaOption; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.SchemaOption; @Entity(SchemaOption.INPUT) public class CaptureType { diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/CatSchema.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/CatSchema.java similarity index 83% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/CatSchema.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/CatSchema.java index bc463f09..031fccc3 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/CatSchema.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/CatSchema.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.type.directive; +package com.phocassoftware.graphql.builder.type.directive; -import com.fleetpin.graphql.builder.SchemaConfiguration; +import com.phocassoftware.graphql.builder.SchemaConfiguration; @Capture(color = "top") public class CatSchema implements SchemaConfiguration {} diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Input.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Input.java similarity index 75% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Input.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Input.java index c83a3606..0de7d5c7 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Input.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Input.java @@ -1,8 +1,8 @@ -package com.fleetpin.graphql.builder.type.directive; +package com.phocassoftware.graphql.builder.type.directive; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.fleetpin.graphql.builder.annotations.Directive; +import com.phocassoftware.graphql.builder.annotations.Directive; import graphql.introspection.Introspection; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Uppercase.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Uppercase.java similarity index 88% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Uppercase.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Uppercase.java index 9886ba33..8e370efa 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/directive/Uppercase.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/directive/Uppercase.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.type.directive; +package com.phocassoftware.graphql.builder.type.directive; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.fleetpin.graphql.builder.annotations.Directive; +import com.phocassoftware.graphql.builder.annotations.Directive; import graphql.introspection.Introspection; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/inheritance/Animal.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/inheritance/Animal.java similarity index 72% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/inheritance/Animal.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/inheritance/Animal.java index 99b24ea0..d489b278 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/inheritance/Animal.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/inheritance/Animal.java @@ -9,14 +9,14 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package com.fleetpin.graphql.builder.type.inheritance; +package com.phocassoftware.graphql.builder.type.inheritance; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.GraphQLDescription; -import com.fleetpin.graphql.builder.annotations.Mutation; -import com.fleetpin.graphql.builder.annotations.OneOf; -import com.fleetpin.graphql.builder.annotations.Query; -import com.fleetpin.graphql.builder.annotations.SchemaOption; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.GraphQLDescription; +import com.phocassoftware.graphql.builder.annotations.Mutation; +import com.phocassoftware.graphql.builder.annotations.OneOf; +import com.phocassoftware.graphql.builder.annotations.Query; +import com.phocassoftware.graphql.builder.annotations.SchemaOption; import java.util.Arrays; import java.util.List; diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/inheritance/Cat.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/inheritance/Cat.java similarity index 84% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/inheritance/Cat.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/inheritance/Cat.java index e1211879..188131db 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/inheritance/Cat.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/inheritance/Cat.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.type.inheritance; +package com.phocassoftware.graphql.builder.type.inheritance; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.GraphQLDescription; -import com.fleetpin.graphql.builder.annotations.Mutation; -import com.fleetpin.graphql.builder.annotations.SchemaOption; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.GraphQLDescription; +import com.phocassoftware.graphql.builder.annotations.Mutation; +import com.phocassoftware.graphql.builder.annotations.SchemaOption; import java.util.Optional; @Entity(SchemaOption.BOTH) diff --git a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/inheritance/Dog.java b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/inheritance/Dog.java similarity index 78% rename from graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/inheritance/Dog.java rename to graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/inheritance/Dog.java index 6c7bbf4c..141e0609 100644 --- a/graphql-builder/src/test/java/com/fleetpin/graphql/builder/type/inheritance/Dog.java +++ b/graphql-builder/src/test/java/com/phocassoftware/graphql/builder/type/inheritance/Dog.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.type.inheritance; +package com.phocassoftware.graphql.builder.type.inheritance; -import com.fleetpin.graphql.builder.annotations.Entity; -import com.fleetpin.graphql.builder.annotations.Mutation; -import com.fleetpin.graphql.builder.annotations.SchemaOption; +import com.phocassoftware.graphql.builder.annotations.Entity; +import com.phocassoftware.graphql.builder.annotations.Mutation; +import com.phocassoftware.graphql.builder.annotations.SchemaOption; @Entity(SchemaOption.BOTH) public class Dog extends Animal { diff --git a/graphql-database-dynmodb-history-lambda/pom.xml b/graphql-database-dynmodb-history-lambda/pom.xml index d3b4a691..8814af4a 100644 --- a/graphql-database-dynmodb-history-lambda/pom.xml +++ b/graphql-database-dynmodb-history-lambda/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - com.fleetpin + com.phocas graphql-database-manager 3.0.4-SNAPSHOT @@ -51,24 +51,9 @@ - - - Ashley Taylor - ashley.taylor@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - - Alexander Johnston - alexander.johnston@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - - - com.fleetpin + com.phocas graphql-database-manager-dynamo ${project.parent.version} diff --git a/graphql-database-dynmodb-history-lambda/src/main/java/com/fleetpin/graphql/database/dynamo/history/lambda/HistoryLambda.java b/graphql-database-dynmodb-history-lambda/src/main/java/com/phocassoftware/graphql/database/dynamo/history/lambda/HistoryLambda.java similarity index 94% rename from graphql-database-dynmodb-history-lambda/src/main/java/com/fleetpin/graphql/database/dynamo/history/lambda/HistoryLambda.java rename to graphql-database-dynmodb-history-lambda/src/main/java/com/phocassoftware/graphql/database/dynamo/history/lambda/HistoryLambda.java index 654ca24f..10e30496 100644 --- a/graphql-database-dynmodb-history-lambda/src/main/java/com/fleetpin/graphql/database/dynamo/history/lambda/HistoryLambda.java +++ b/graphql-database-dynmodb-history-lambda/src/main/java/com/phocassoftware/graphql/database/dynamo/history/lambda/HistoryLambda.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.dynamo.history.lambda; +package com.phocassoftware.graphql.database.dynamo.history.lambda; import static java.util.stream.Collectors.groupingBy; @@ -18,7 +18,7 @@ import com.amazonaws.services.lambda.runtime.RequestHandler; import com.amazonaws.services.lambda.runtime.events.DynamodbEvent; import com.amazonaws.services.lambda.runtime.events.transformers.v2.DynamodbEventTransformer; -import com.fleetpin.graphql.database.manager.dynamo.HistoryUtil; +import com.phocassoftware.graphql.database.manager.dynamo.HistoryUtil; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/graphql-database-manager-core/pom.xml b/graphql-database-manager-core/pom.xml index 454a8a79..f05d7af0 100644 --- a/graphql-database-manager-core/pom.xml +++ b/graphql-database-manager-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - com.fleetpin + com.phocas graphql-database-manager 3.0.4-SNAPSHOT @@ -43,26 +43,11 @@ - - - Ashley Taylor - ashley.taylor@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - - Alexander Johnston - alexander.johnston@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - - - com.fleetpin + com.phocas graphql-builder - 3.0.2 + ${project.parent.version} provided diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DataWriter.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DataWriter.java similarity index 96% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DataWriter.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DataWriter.java index 98517f8d..c73e0665 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DataWriter.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DataWriter.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; import java.util.ArrayList; import java.util.List; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/Database.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/Database.java similarity index 97% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/Database.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/Database.java index eac2f4fa..93ab799f 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/Database.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/Database.java @@ -10,13 +10,13 @@ * the License. */ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; -import com.fleetpin.graphql.database.manager.access.ForbiddenWriteException; -import com.fleetpin.graphql.database.manager.access.ModificationPermission; -import com.fleetpin.graphql.database.manager.util.BackupItem; -import com.fleetpin.graphql.database.manager.util.HistoryBackupItem; -import com.fleetpin.graphql.database.manager.util.TableCoreUtil; +import com.phocassoftware.graphql.database.manager.access.ForbiddenWriteException; +import com.phocassoftware.graphql.database.manager.access.ModificationPermission; +import com.phocassoftware.graphql.database.manager.util.BackupItem; +import com.phocassoftware.graphql.database.manager.util.HistoryBackupItem; +import com.phocassoftware.graphql.database.manager.util.TableCoreUtil; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseDriver.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseDriver.java similarity index 95% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseDriver.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseDriver.java index b8bb75aa..600854d8 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseDriver.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseDriver.java @@ -10,10 +10,10 @@ * the License. */ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; -import com.fleetpin.graphql.database.manager.util.BackupItem; -import com.fleetpin.graphql.database.manager.util.HistoryBackupItem; +import com.phocassoftware.graphql.database.manager.util.BackupItem; +import com.phocassoftware.graphql.database.manager.util.HistoryBackupItem; import java.time.Instant; import java.util.Collection; import java.util.List; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseKey.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseKey.java similarity index 92% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseKey.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseKey.java index 98d2e3fe..0dfc1ed3 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseKey.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseKey.java @@ -10,9 +10,9 @@ * the License. */ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; -import com.fleetpin.graphql.database.manager.util.TableCoreUtil; +import com.phocassoftware.graphql.database.manager.util.TableCoreUtil; import java.util.Objects; public class DatabaseKey { diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseManager.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseManager.java similarity index 88% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseManager.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseManager.java index e814f90a..5acbb3e5 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseManager.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseManager.java @@ -1,6 +1,6 @@ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; -import com.fleetpin.graphql.database.manager.access.ModificationPermission; +import com.phocassoftware.graphql.database.manager.access.ModificationPermission; import java.util.concurrent.CompletableFuture; import java.util.function.Function; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseQueryHistoryKey.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseQueryHistoryKey.java similarity index 96% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseQueryHistoryKey.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseQueryHistoryKey.java index bf04b9e6..d2237e04 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseQueryHistoryKey.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseQueryHistoryKey.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; import java.util.Objects; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseQueryKey.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseQueryKey.java similarity index 96% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseQueryKey.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseQueryKey.java index b2f88049..c20b75d6 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/DatabaseQueryKey.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/DatabaseQueryKey.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; import java.util.Objects; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/KeyFactory.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/KeyFactory.java similarity index 92% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/KeyFactory.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/KeyFactory.java index d89af5c6..03a8ecfc 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/KeyFactory.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/KeyFactory.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; public interface KeyFactory { static DatabaseKey createDatabaseKey(final String organisationId, final Class type, final String id) { diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/PutValue.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/PutValue.java similarity index 96% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/PutValue.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/PutValue.java index fd6eef2e..d64a5ab8 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/PutValue.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/PutValue.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; import java.util.Objects; import java.util.concurrent.CompletableFuture; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/Query.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/Query.java similarity index 97% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/Query.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/Query.java index fff053c4..3ac952ce 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/Query.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/Query.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; import java.util.Objects; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/QueryBuilder.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/QueryBuilder.java similarity index 95% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/QueryBuilder.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/QueryBuilder.java index 5828e441..28dc7bf8 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/QueryBuilder.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/QueryBuilder.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; import java.util.function.Consumer; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/QueryHistory.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/QueryHistory.java similarity index 97% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/QueryHistory.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/QueryHistory.java index 3ce81113..268f282f 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/QueryHistory.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/QueryHistory.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; import java.time.Instant; import java.util.Objects; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/QueryHistoryBuilder.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/QueryHistoryBuilder.java similarity index 94% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/QueryHistoryBuilder.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/QueryHistoryBuilder.java index f8f221f5..8e2369a9 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/QueryHistoryBuilder.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/QueryHistoryBuilder.java @@ -1,6 +1,6 @@ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; -import com.fleetpin.graphql.database.manager.util.HistoryCoreUtil; +import com.phocassoftware.graphql.database.manager.util.HistoryCoreUtil; import java.time.Instant; import java.util.function.Consumer; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/RevisionMismatchException.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/RevisionMismatchException.java similarity index 72% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/RevisionMismatchException.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/RevisionMismatchException.java index 3af784af..5e60076a 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/RevisionMismatchException.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/RevisionMismatchException.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; public class RevisionMismatchException extends RuntimeException { diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/ScanResult.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/ScanResult.java similarity index 93% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/ScanResult.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/ScanResult.java index 6b679292..6fd95da1 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/ScanResult.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/ScanResult.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.database.manager; +package com.phocassoftware.graphql.database.manager; import java.util.ArrayList; import java.util.function.Consumer; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/ScanUpdater.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/ScanUpdater.java similarity index 90% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/ScanUpdater.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/ScanUpdater.java index 5064843e..06b69248 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/ScanUpdater.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/ScanUpdater.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.database.manager; +package com.phocassoftware.graphql.database.manager; -import com.fleetpin.graphql.database.manager.ScanResult.Item; +import com.phocassoftware.graphql.database.manager.ScanResult.Item; import java.util.function.BiConsumer; public record ScanUpdater(Class type, BiConsumer, T> updater) { diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/Table.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/Table.java similarity index 93% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/Table.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/Table.java index 35e48514..0b2c9283 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/Table.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/Table.java @@ -10,11 +10,11 @@ * the License. */ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fleetpin.graphql.builder.annotations.GraphQLIgnore; -import com.fleetpin.graphql.builder.annotations.Id; +import com.phocassoftware.graphql.builder.annotations.GraphQLIgnore; +import com.phocassoftware.graphql.builder.annotations.Id; import java.time.Instant; import java.util.Collection; import java.util.HashMap; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableAccess.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableAccess.java similarity index 91% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableAccess.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableAccess.java index 5f2c6adf..54e5a537 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableAccess.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableAccess.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; import java.util.Map; import java.util.Set; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableDataLoader.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableDataLoader.java similarity index 95% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableDataLoader.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableDataLoader.java index 29e39ff3..23dce1ce 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableDataLoader.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableDataLoader.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableScanQuery.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableScanQuery.java similarity index 94% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableScanQuery.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableScanQuery.java index 5078ee76..92b85312 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableScanQuery.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableScanQuery.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.database.manager; +package com.phocassoftware.graphql.database.manager; import java.util.List; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableScanQueryBuilder.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableScanQueryBuilder.java similarity index 86% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableScanQueryBuilder.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableScanQueryBuilder.java index 9b8aac56..67c14e9a 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableScanQueryBuilder.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableScanQueryBuilder.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.database.manager; +package com.phocassoftware.graphql.database.manager; -import com.fleetpin.graphql.database.manager.ScanUpdater.ScanContext; -import com.fleetpin.graphql.database.manager.TableScanQuery.TableScanMonitor; +import com.phocassoftware.graphql.database.manager.ScanUpdater.ScanContext; +import com.phocassoftware.graphql.database.manager.TableScanQuery.TableScanMonitor; import java.util.ArrayList; import java.util.List; import java.util.function.BiConsumer; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableScanner.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableScanner.java similarity index 93% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableScanner.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableScanner.java index 441d1365..ec174d0d 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/TableScanner.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/TableScanner.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.database.manager; +package com.phocassoftware.graphql.database.manager; -import com.fleetpin.graphql.database.manager.ScanResult.Item; -import com.fleetpin.graphql.database.manager.ScanUpdater.ScanContext; +import com.phocassoftware.graphql.database.manager.ScanResult.Item; +import com.phocassoftware.graphql.database.manager.ScanUpdater.ScanContext; import java.util.ArrayList; import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/VirtualDatabase.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/VirtualDatabase.java similarity index 95% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/VirtualDatabase.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/VirtualDatabase.java index 8071adef..a73f4d62 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/VirtualDatabase.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/VirtualDatabase.java @@ -10,10 +10,10 @@ * the License. */ -package com.fleetpin.graphql.database.manager; +package com.phocassoftware.graphql.database.manager; -import com.fleetpin.graphql.database.manager.util.BackupItem; -import com.fleetpin.graphql.database.manager.util.HistoryBackupItem; +import com.phocassoftware.graphql.database.manager.util.BackupItem; +import com.phocassoftware.graphql.database.manager.util.HistoryBackupItem; import java.util.List; import java.util.Optional; import java.util.Set; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/access/ForbiddenWriteException.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/access/ForbiddenWriteException.java similarity index 91% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/access/ForbiddenWriteException.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/access/ForbiddenWriteException.java index e121a132..d1fa6dbb 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/access/ForbiddenWriteException.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/access/ForbiddenWriteException.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager.access; +package com.phocassoftware.graphql.database.manager.access; public class ForbiddenWriteException extends RuntimeException { diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/access/ModificationPermission.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/access/ModificationPermission.java similarity index 86% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/access/ModificationPermission.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/access/ModificationPermission.java index a51079a2..6d24c177 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/access/ModificationPermission.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/access/ModificationPermission.java @@ -10,9 +10,9 @@ * the License. */ -package com.fleetpin.graphql.database.manager.access; +package com.phocassoftware.graphql.database.manager.access; -import com.fleetpin.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.Table; import java.util.concurrent.CompletableFuture; import java.util.function.Function; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/GlobalIndex.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/GlobalIndex.java similarity index 92% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/GlobalIndex.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/GlobalIndex.java index 7b638461..75e41752 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/GlobalIndex.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/GlobalIndex.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager.annotations; +package com.phocassoftware.graphql.database.manager.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/Hash.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/Hash.java similarity index 93% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/Hash.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/Hash.java index 7b6a1271..ec1a725f 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/Hash.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/Hash.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager.annotations; +package com.phocassoftware.graphql.database.manager.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/HashLocator.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/HashLocator.java similarity index 92% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/HashLocator.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/HashLocator.java index dd95647a..7655ca3b 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/HashLocator.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/HashLocator.java @@ -10,11 +10,11 @@ * the License. */ -package com.fleetpin.graphql.database.manager.annotations; +package com.phocassoftware.graphql.database.manager.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.fleetpin.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.Table; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/History.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/History.java similarity index 92% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/History.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/History.java index cd66cdef..d253c7ff 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/History.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/History.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager.annotations; +package com.phocassoftware.graphql.database.manager.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/SecondaryIndex.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/SecondaryIndex.java similarity index 92% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/SecondaryIndex.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/SecondaryIndex.java index 986bd3ef..01269f00 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/SecondaryIndex.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/SecondaryIndex.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager.annotations; +package com.phocassoftware.graphql.database.manager.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/TableName.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/TableName.java similarity index 92% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/TableName.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/TableName.java index 2e46ed72..8efcb166 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/annotations/TableName.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/annotations/TableName.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager.annotations; +package com.phocassoftware.graphql.database.manager.annotations; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/BackupItem.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/BackupItem.java similarity index 93% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/BackupItem.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/BackupItem.java index 8f4d33dd..6aa5c82d 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/BackupItem.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/BackupItem.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager.util; +package com.phocassoftware.graphql.database.manager.util; import java.util.Map; import java.util.Set; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/CompletableFutureCollector.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/CompletableFutureCollector.java similarity index 95% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/CompletableFutureCollector.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/CompletableFutureCollector.java index e5ceb16a..4ceb148a 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/CompletableFutureCollector.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/CompletableFutureCollector.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager.util; +package com.phocassoftware.graphql.database.manager.util; import java.util.ArrayList; import java.util.Collections; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/CompletableFutureUtil.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/CompletableFutureUtil.java similarity index 91% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/CompletableFutureUtil.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/CompletableFutureUtil.java index bb16ac78..4f9fa65a 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/CompletableFutureUtil.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/CompletableFutureUtil.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager.util; +package com.phocassoftware.graphql.database.manager.util; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/HistoryBackupItem.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/HistoryBackupItem.java similarity index 79% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/HistoryBackupItem.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/HistoryBackupItem.java index c61401ec..ea4e757f 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/HistoryBackupItem.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/HistoryBackupItem.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager.util; +package com.phocassoftware.graphql.database.manager.util; import java.nio.ByteBuffer; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/HistoryCoreUtil.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/HistoryCoreUtil.java similarity index 60% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/HistoryCoreUtil.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/HistoryCoreUtil.java index ac757fe5..7a2ca657 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/HistoryCoreUtil.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/HistoryCoreUtil.java @@ -1,7 +1,7 @@ -package com.fleetpin.graphql.database.manager.util; +package com.phocassoftware.graphql.database.manager.util; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.History; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.History; public final class HistoryCoreUtil { diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/TableCoreUtil.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/TableCoreUtil.java similarity index 86% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/TableCoreUtil.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/TableCoreUtil.java index cde76597..02942a15 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/util/TableCoreUtil.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/util/TableCoreUtil.java @@ -1,7 +1,7 @@ -package com.fleetpin.graphql.database.manager.util; +package com.phocassoftware.graphql.database.manager.util; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.TableName; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.TableName; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/virtual/VirtualDataRunner.java b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/virtual/VirtualDataRunner.java similarity index 86% rename from graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/virtual/VirtualDataRunner.java rename to graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/virtual/VirtualDataRunner.java index 29cdc20e..199eda40 100644 --- a/graphql-database-manager-core/src/main/java/com/fleetpin/graphql/database/manager/virtual/VirtualDataRunner.java +++ b/graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/virtual/VirtualDataRunner.java @@ -10,12 +10,12 @@ * the License. */ -package com.fleetpin.graphql.database.manager.virtual; +package com.phocassoftware.graphql.database.manager.virtual; -import com.fleetpin.graphql.builder.DataFetcherRunner; -import com.fleetpin.graphql.builder.annotations.Context; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.VirtualDatabase; +import com.phocassoftware.graphql.builder.DataFetcherRunner; +import com.phocassoftware.graphql.builder.annotations.Context; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.VirtualDatabase; import graphql.schema.DataFetcher; import java.lang.reflect.Method; import java.util.concurrent.CompletableFuture; diff --git a/graphql-database-manager-core/src/test/java/com/fleetpin/graphql/database/manager/virtual/VirtualDataRunnerTest.java b/graphql-database-manager-core/src/test/java/com/phocassoftware/graphql/database/manager/virtual/VirtualDataRunnerTest.java similarity index 93% rename from graphql-database-manager-core/src/test/java/com/fleetpin/graphql/database/manager/virtual/VirtualDataRunnerTest.java rename to graphql-database-manager-core/src/test/java/com/phocassoftware/graphql/database/manager/virtual/VirtualDataRunnerTest.java index 6f1f6293..932df725 100644 --- a/graphql-database-manager-core/src/test/java/com/fleetpin/graphql/database/manager/virtual/VirtualDataRunnerTest.java +++ b/graphql-database-manager-core/src/test/java/com/phocassoftware/graphql/database/manager/virtual/VirtualDataRunnerTest.java @@ -10,14 +10,14 @@ * the License. */ -package com.fleetpin.graphql.database.manager.virtual; +package com.phocassoftware.graphql.database.manager.virtual; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.fleetpin.graphql.builder.annotations.Context; -import com.fleetpin.graphql.database.manager.VirtualDatabase; +import com.phocassoftware.graphql.builder.annotations.Context; +import com.phocassoftware.graphql.database.manager.VirtualDatabase; import graphql.schema.DataFetcher; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; diff --git a/graphql-database-manager-dynamo/pom.xml b/graphql-database-manager-dynamo/pom.xml index aca71a3b..69f589ac 100644 --- a/graphql-database-manager-dynamo/pom.xml +++ b/graphql-database-manager-dynamo/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - com.fleetpin + com.phocas graphql-database-manager 3.0.4-SNAPSHOT @@ -44,21 +44,6 @@ - - - Ashley Taylor - ashley.taylor@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - - Alexander Johnston - alexander.johnston@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - - com.fasterxml.jackson.core @@ -76,13 +61,13 @@ - com.fleetpin + com.phocas graphql-builder - 3.0.2 + ${project.parent.version} provided - com.fleetpin + com.phocas graphql-database-manager-core ${project.parent.version} diff --git a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoBackupItem.java b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoBackupItem.java similarity index 95% rename from graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoBackupItem.java rename to graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoBackupItem.java index 787cdc7d..55cc9ab4 100644 --- a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoBackupItem.java +++ b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoBackupItem.java @@ -10,12 +10,12 @@ * the License. */ -package com.fleetpin.graphql.database.manager.dynamo; +package com.phocassoftware.graphql.database.manager.dynamo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.util.BackupItem; +import com.phocassoftware.graphql.database.manager.util.BackupItem; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoDb.java b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoDb.java similarity index 97% rename from graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoDb.java rename to graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoDb.java index 80fe937d..0de76be3 100644 --- a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoDb.java +++ b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoDb.java @@ -10,34 +10,34 @@ * the License. */ -package com.fleetpin.graphql.database.manager.dynamo; +package com.phocassoftware.graphql.database.manager.dynamo; -import static com.fleetpin.graphql.database.manager.util.TableCoreUtil.table; +import static com.phocassoftware.graphql.database.manager.util.TableCoreUtil.table; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.DatabaseDriver; -import com.fleetpin.graphql.database.manager.DatabaseKey; -import com.fleetpin.graphql.database.manager.DatabaseQueryHistoryKey; -import com.fleetpin.graphql.database.manager.DatabaseQueryKey; -import com.fleetpin.graphql.database.manager.KeyFactory; -import com.fleetpin.graphql.database.manager.PutValue; -import com.fleetpin.graphql.database.manager.Query; -import com.fleetpin.graphql.database.manager.QueryBuilder; -import com.fleetpin.graphql.database.manager.RevisionMismatchException; -import com.fleetpin.graphql.database.manager.ScanResult; -import com.fleetpin.graphql.database.manager.ScanResult.Item; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.TableDataLoader; -import com.fleetpin.graphql.database.manager.TableScanQuery; -import com.fleetpin.graphql.database.manager.annotations.Hash; -import com.fleetpin.graphql.database.manager.annotations.Hash.HashExtractor; -import com.fleetpin.graphql.database.manager.annotations.HashLocator; -import com.fleetpin.graphql.database.manager.annotations.HashLocator.HashQueryBuilder; -import com.fleetpin.graphql.database.manager.util.BackupItem; -import com.fleetpin.graphql.database.manager.util.CompletableFutureUtil; -import com.fleetpin.graphql.database.manager.util.HistoryBackupItem; -import com.fleetpin.graphql.database.manager.util.HistoryCoreUtil; -import com.fleetpin.graphql.database.manager.util.TableCoreUtil; +import com.phocassoftware.graphql.database.manager.DatabaseDriver; +import com.phocassoftware.graphql.database.manager.DatabaseKey; +import com.phocassoftware.graphql.database.manager.DatabaseQueryHistoryKey; +import com.phocassoftware.graphql.database.manager.DatabaseQueryKey; +import com.phocassoftware.graphql.database.manager.KeyFactory; +import com.phocassoftware.graphql.database.manager.PutValue; +import com.phocassoftware.graphql.database.manager.Query; +import com.phocassoftware.graphql.database.manager.QueryBuilder; +import com.phocassoftware.graphql.database.manager.RevisionMismatchException; +import com.phocassoftware.graphql.database.manager.ScanResult; +import com.phocassoftware.graphql.database.manager.ScanResult.Item; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.TableDataLoader; +import com.phocassoftware.graphql.database.manager.TableScanQuery; +import com.phocassoftware.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.annotations.Hash.HashExtractor; +import com.phocassoftware.graphql.database.manager.annotations.HashLocator; +import com.phocassoftware.graphql.database.manager.annotations.HashLocator.HashQueryBuilder; +import com.phocassoftware.graphql.database.manager.util.BackupItem; +import com.phocassoftware.graphql.database.manager.util.CompletableFutureUtil; +import com.phocassoftware.graphql.database.manager.util.HistoryBackupItem; +import com.phocassoftware.graphql.database.manager.util.HistoryCoreUtil; +import com.phocassoftware.graphql.database.manager.util.TableCoreUtil; import com.google.common.base.Throwables; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; diff --git a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoDbManager.java b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoDbManager.java similarity index 96% rename from graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoDbManager.java rename to graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoDbManager.java index a2fef8bd..13d004a2 100644 --- a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoDbManager.java +++ b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoDbManager.java @@ -10,11 +10,11 @@ * the License. */ -package com.fleetpin.graphql.database.manager.dynamo; +package com.phocassoftware.graphql.database.manager.dynamo; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.DatabaseDriver; -import com.fleetpin.graphql.database.manager.DatabaseManager; +import com.phocassoftware.graphql.database.manager.DatabaseDriver; +import com.phocassoftware.graphql.database.manager.DatabaseManager; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import java.util.Arrays; diff --git a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoHistoryBackupItem.java b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoHistoryBackupItem.java similarity index 90% rename from graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoHistoryBackupItem.java rename to graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoHistoryBackupItem.java index 9c86189d..48078f2f 100644 --- a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoHistoryBackupItem.java +++ b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoHistoryBackupItem.java @@ -1,7 +1,7 @@ -package com.fleetpin.graphql.database.manager.dynamo; +package com.phocassoftware.graphql.database.manager.dynamo; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.util.HistoryBackupItem; +import com.phocassoftware.graphql.database.manager.util.HistoryBackupItem; import java.util.Map; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; diff --git a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoItem.java b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoItem.java similarity index 94% rename from graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoItem.java rename to graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoItem.java index 3e365dab..24bc4983 100644 --- a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoItem.java +++ b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoItem.java @@ -10,11 +10,11 @@ * the License. */ -package com.fleetpin.graphql.database.manager.dynamo; +package com.phocassoftware.graphql.database.manager.dynamo; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.TableAccess; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.TableAccess; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoQuerySubscriber.java b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoQuerySubscriber.java similarity index 96% rename from graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoQuerySubscriber.java rename to graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoQuerySubscriber.java index 8f9768ba..f96fd42a 100644 --- a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/DynamoQuerySubscriber.java +++ b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoQuerySubscriber.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager.dynamo; +package com.phocassoftware.graphql.database.manager.dynamo; import java.util.ArrayList; import java.util.List; diff --git a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/Flattener.java b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/Flattener.java similarity index 86% rename from graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/Flattener.java rename to graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/Flattener.java index 565fc4c8..bc609b57 100644 --- a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/Flattener.java +++ b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/Flattener.java @@ -10,12 +10,12 @@ * the License. */ -package com.fleetpin.graphql.database.manager.dynamo; +package com.phocassoftware.graphql.database.manager.dynamo; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.Hash; -import com.fleetpin.graphql.database.manager.util.TableCoreUtil; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.util.TableCoreUtil; import java.util.*; import java.util.stream.Collectors; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; diff --git a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/FlattenerMulti.java b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/FlattenerMulti.java similarity index 91% rename from graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/FlattenerMulti.java rename to graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/FlattenerMulti.java index f43ec4f8..1790eb1d 100644 --- a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/FlattenerMulti.java +++ b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/FlattenerMulti.java @@ -10,12 +10,12 @@ * the License. */ -package com.fleetpin.graphql.database.manager.dynamo; +package com.phocassoftware.graphql.database.manager.dynamo; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.Hash; -import com.fleetpin.graphql.database.manager.util.TableCoreUtil; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.util.TableCoreUtil; import java.util.*; import java.util.stream.Collectors; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; diff --git a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/FlattenerSingle.java b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/FlattenerSingle.java similarity index 88% rename from graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/FlattenerSingle.java rename to graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/FlattenerSingle.java index 0a0f0e94..bca9c236 100644 --- a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/FlattenerSingle.java +++ b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/FlattenerSingle.java @@ -10,12 +10,12 @@ * the License. */ -package com.fleetpin.graphql.database.manager.dynamo; +package com.phocassoftware.graphql.database.manager.dynamo; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.Hash; -import com.fleetpin.graphql.database.manager.util.TableCoreUtil; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.util.TableCoreUtil; import java.util.*; import java.util.stream.Collectors; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; diff --git a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/HistoryUtil.java b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/HistoryUtil.java similarity index 97% rename from graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/HistoryUtil.java rename to graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/HistoryUtil.java index 505330cb..bea4a5ce 100644 --- a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/HistoryUtil.java +++ b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/HistoryUtil.java @@ -1,7 +1,7 @@ -package com.fleetpin.graphql.database.manager.dynamo; +package com.phocassoftware.graphql.database.manager.dynamo; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.util.HistoryBackupItem; +import com.phocassoftware.graphql.database.manager.util.HistoryBackupItem; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.time.Instant; diff --git a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/TableUtil.java b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/TableUtil.java similarity index 96% rename from graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/TableUtil.java rename to graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/TableUtil.java index 33d6c177..e7e8a059 100644 --- a/graphql-database-manager-dynamo/src/main/java/com/fleetpin/graphql/database/manager/dynamo/TableUtil.java +++ b/graphql-database-manager-dynamo/src/main/java/com/phocassoftware/graphql/database/manager/dynamo/TableUtil.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager.dynamo; +package com.phocassoftware.graphql.database.manager.dynamo; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -24,10 +24,10 @@ import com.fasterxml.jackson.databind.node.NullNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.GlobalIndex; -import com.fleetpin.graphql.database.manager.annotations.SecondaryIndex; -import com.fleetpin.graphql.database.manager.util.BackupItem; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.GlobalIndex; +import com.phocassoftware.graphql.database.manager.annotations.SecondaryIndex; +import com.phocassoftware.graphql.database.manager.util.BackupItem; import java.io.IOException; import java.io.UncheckedIOException; import java.util.HashMap; diff --git a/graphql-database-manager-dynamo/src/test/java/com/fleetpin/graphql/database/manager/dynamo/DynamoDbTest.java b/graphql-database-manager-dynamo/src/test/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoDbTest.java similarity index 94% rename from graphql-database-manager-dynamo/src/test/java/com/fleetpin/graphql/database/manager/dynamo/DynamoDbTest.java rename to graphql-database-manager-dynamo/src/test/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoDbTest.java index ce1d009b..d13b138c 100644 --- a/graphql-database-manager-dynamo/src/test/java/com/fleetpin/graphql/database/manager/dynamo/DynamoDbTest.java +++ b/graphql-database-manager-dynamo/src/test/java/com/phocassoftware/graphql/database/manager/dynamo/DynamoDbTest.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager.dynamo; +package com.phocassoftware.graphql.database.manager.dynamo; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/graphql-database-manager-memory/pom.xml b/graphql-database-manager-memory/pom.xml index 487dfd5e..d482c735 100644 --- a/graphql-database-manager-memory/pom.xml +++ b/graphql-database-manager-memory/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.fleetpin + com.phocas graphql-database-manager 3.0.0 @@ -44,30 +44,15 @@ - - - Ashley Taylor - ashley.taylor@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - - Alexander Johnston - alexander.johnston@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - - - com.fleetpin + com.phocas graphql-builder 3.0.2 provided - com.fleetpin + com.phocas graphql-database-manager-core ${project.parent.version} diff --git a/graphql-database-manager-memory/src/main/java/com/fleetpin/graphql/database/manager/memory/InMemoryDynamoDb.java b/graphql-database-manager-memory/src/main/java/com/phocassoftware/graphql/database/manager/memory/InMemoryDynamoDb.java similarity index 96% rename from graphql-database-manager-memory/src/main/java/com/fleetpin/graphql/database/manager/memory/InMemoryDynamoDb.java rename to graphql-database-manager-memory/src/main/java/com/phocassoftware/graphql/database/manager/memory/InMemoryDynamoDb.java index abd6e8b5..b363842f 100644 --- a/graphql-database-manager-memory/src/main/java/com/fleetpin/graphql/database/manager/memory/InMemoryDynamoDb.java +++ b/graphql-database-manager-memory/src/main/java/com/phocassoftware/graphql/database/manager/memory/InMemoryDynamoDb.java @@ -10,12 +10,12 @@ // * the License. // */ // -//package com.fleetpin.graphql.database.manager.memory; +//package com.phocassoftware.graphql.database.manager.memory; // //import com.fasterxml.jackson.databind.ObjectMapper; //import com.fasterxml.jackson.databind.node.*; -//import com.fleetpin.graphql.database.manager.*; -//import com.fleetpin.graphql.database.manager.dynamo.Flatterner; +//import com.phocassoftware.graphql.database.manager.*; +//import com.phocassoftware.graphql.database.manager.dynamo.Flatterner; //import com.google.common.collect.Multimap; // //import software.amazon.awssdk.services.dynamodb.model.AttributeValue; @@ -35,8 +35,8 @@ //import java.util.function.Supplier; //import java.util.stream.Collectors; // -//import static com.fleetpin.graphql.database.manager.util.DynamoDbUtil.table; -//import static com.fleetpin.graphql.database.manager.util.TableCoreUtil.table; +//import static com.phocassoftware.graphql.database.manager.util.DynamoDbUtil.table; +//import static com.phocassoftware.graphql.database.manager.util.TableCoreUtil.table; // //public final class InMemoryDynamoDb extends DatabaseDriver { // private static final String SECONDARY_GLOBAL = "secondaryGlobal"; diff --git a/graphql-database-manager-memory/src/main/java/com/fleetpin/graphql/database/manager/memory/MemoryItem.java b/graphql-database-manager-memory/src/main/java/com/phocassoftware/graphql/database/manager/memory/MemoryItem.java similarity index 79% rename from graphql-database-manager-memory/src/main/java/com/fleetpin/graphql/database/manager/memory/MemoryItem.java rename to graphql-database-manager-memory/src/main/java/com/phocassoftware/graphql/database/manager/memory/MemoryItem.java index 8fceb39a..76bb5ea9 100644 --- a/graphql-database-manager-memory/src/main/java/com/fleetpin/graphql/database/manager/memory/MemoryItem.java +++ b/graphql-database-manager-memory/src/main/java/com/phocassoftware/graphql/database/manager/memory/MemoryItem.java @@ -1,7 +1,7 @@ -package com.fleetpin.graphql.database.manager.memory; +package com.phocassoftware.graphql.database.manager.memory; import com.fasterxml.jackson.databind.JsonNode; -import com.fleetpin.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.Table; import com.google.common.collect.HashMultimap; public class MemoryItem { diff --git a/graphql-database-manager-memory/src/test/java/com/fleetpin/graphql/database/manager/memory/InMemoryDynamoDbTest.java b/graphql-database-manager-memory/src/test/java/com/phocassoftware/graphql/database/manager/memory/InMemoryDynamoDbTest.java similarity index 96% rename from graphql-database-manager-memory/src/test/java/com/fleetpin/graphql/database/manager/memory/InMemoryDynamoDbTest.java rename to graphql-database-manager-memory/src/test/java/com/phocassoftware/graphql/database/manager/memory/InMemoryDynamoDbTest.java index ef56859f..63fe9e2c 100644 --- a/graphql-database-manager-memory/src/test/java/com/fleetpin/graphql/database/manager/memory/InMemoryDynamoDbTest.java +++ b/graphql-database-manager-memory/src/test/java/com/phocassoftware/graphql/database/manager/memory/InMemoryDynamoDbTest.java @@ -10,7 +10,7 @@ // * the License. // */ // -//package com.fleetpin.graphql.database.manager.memory; +//package com.phocassoftware.graphql.database.manager.memory; // //import com.fasterxml.jackson.annotation.JsonAutoDetect; //import com.fasterxml.jackson.annotation.PropertyAccessor; @@ -20,10 +20,10 @@ //import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; //import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; //import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; -//import com.fleetpin.graphql.builder.annotations.Id; -//import com.fleetpin.graphql.database.manager.Table; -//import com.fleetpin.graphql.database.manager.annotations.GlobalIndex; -//import com.fleetpin.graphql.database.manager.annotations.SecondaryIndex; +//import com.phocassoftware.graphql.builder.annotations.Id; +//import com.phocassoftware.graphql.database.manager.Table; +//import com.phocassoftware.graphql.database.manager.annotations.GlobalIndex; +//import com.phocassoftware.graphql.database.manager.annotations.SecondaryIndex; //import com.google.common.collect.HashMultimap; //import org.junit.jupiter.api.Assertions; //import org.junit.jupiter.api.BeforeEach; diff --git a/graphql-database-manager-test/pom.xml b/graphql-database-manager-test/pom.xml index 5003fb22..83a014d7 100644 --- a/graphql-database-manager-test/pom.xml +++ b/graphql-database-manager-test/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - com.fleetpin + com.phocas graphql-database-manager 3.0.4-SNAPSHOT @@ -42,41 +42,26 @@ repo - - - - Ashley Taylor - ashley.taylor@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - - Alexander Johnston - alexander.johnston@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - - + - com.fleetpin + com.phocas graphql-builder - 3.0.2 + ${project.parent.version} provided - com.fleetpin + com.phocas graphql-database-manager-core ${project.parent.version} - com.fleetpin + com.phocas graphql-database-manager-dynamo ${project.parent.version} - com.fleetpin + com.phocas graphql-database-dynmodb-history-lambda ${project.parent.version} diff --git a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/DynamoDbInitializer.java b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/DynamoDbInitializer.java similarity index 97% rename from graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/DynamoDbInitializer.java rename to graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/DynamoDbInitializer.java index c3da1aa1..e6b688cf 100644 --- a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/DynamoDbInitializer.java +++ b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/DynamoDbInitializer.java @@ -10,13 +10,13 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; import com.amazonaws.services.dynamodbv2.local.main.ServerRunner; import com.amazonaws.services.dynamodbv2.local.server.DynamoDBProxyServer; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.dynamo.DynamoDbManager; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.dynamo.DynamoDbManager; import java.io.IOException; import java.net.ServerSocket; import java.net.URI; diff --git a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/HistoryProcessor.java b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/HistoryProcessor.java similarity index 90% rename from graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/HistoryProcessor.java rename to graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/HistoryProcessor.java index 51fcee47..f85a1f40 100644 --- a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/HistoryProcessor.java +++ b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/HistoryProcessor.java @@ -1,7 +1,7 @@ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; -import com.fleetpin.graphql.database.dynamo.history.lambda.HistoryLambda; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.dynamo.history.lambda.HistoryLambda; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; import java.lang.reflect.Parameter; import software.amazon.awssdk.services.dynamodb.DynamoDbClient; import software.amazon.awssdk.services.dynamodb.model.ShardIteratorType; diff --git a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/TestDatabaseProvider.java b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/TestDatabaseProvider.java similarity index 84% rename from graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/TestDatabaseProvider.java rename to graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/TestDatabaseProvider.java index 75acaef8..fd97eb81 100644 --- a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/TestDatabaseProvider.java +++ b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/TestDatabaseProvider.java @@ -10,27 +10,27 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; - -import static com.fleetpin.graphql.database.manager.test.DynamoDbInitializer.createHistoryTable; -import static com.fleetpin.graphql.database.manager.test.DynamoDbInitializer.createTable; -import static com.fleetpin.graphql.database.manager.test.DynamoDbInitializer.findFreePort; -import static com.fleetpin.graphql.database.manager.test.DynamoDbInitializer.getDatabaseManager; -import static com.fleetpin.graphql.database.manager.test.DynamoDbInitializer.getEmbeddedDatabase; -import static com.fleetpin.graphql.database.manager.test.DynamoDbInitializer.startDynamoAsyncClient; -import static com.fleetpin.graphql.database.manager.test.DynamoDbInitializer.startDynamoClient; -import static com.fleetpin.graphql.database.manager.test.DynamoDbInitializer.startDynamoServer; -import static com.fleetpin.graphql.database.manager.test.DynamoDbInitializer.startDynamoStreamClient; +package com.phocassoftware.graphql.database.manager.test; + +import static com.phocassoftware.graphql.database.manager.test.DynamoDbInitializer.createHistoryTable; +import static com.phocassoftware.graphql.database.manager.test.DynamoDbInitializer.createTable; +import static com.phocassoftware.graphql.database.manager.test.DynamoDbInitializer.findFreePort; +import static com.phocassoftware.graphql.database.manager.test.DynamoDbInitializer.getDatabaseManager; +import static com.phocassoftware.graphql.database.manager.test.DynamoDbInitializer.getEmbeddedDatabase; +import static com.phocassoftware.graphql.database.manager.test.DynamoDbInitializer.startDynamoAsyncClient; +import static com.phocassoftware.graphql.database.manager.test.DynamoDbInitializer.startDynamoClient; +import static com.phocassoftware.graphql.database.manager.test.DynamoDbInitializer.startDynamoServer; +import static com.phocassoftware.graphql.database.manager.test.DynamoDbInitializer.startDynamoStreamClient; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.VirtualDatabase; -import com.fleetpin.graphql.database.manager.dynamo.DynamoDbManager; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseOrganisation; -import com.fleetpin.graphql.database.manager.test.annotations.GlobalEnabled; -import com.fleetpin.graphql.database.manager.test.annotations.TestDatabase; -import com.fleetpin.graphql.database.manager.util.CompletableFutureUtil; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.VirtualDatabase; +import com.phocassoftware.graphql.database.manager.dynamo.DynamoDbManager; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseOrganisation; +import com.phocassoftware.graphql.database.manager.test.annotations.GlobalEnabled; +import com.phocassoftware.graphql.database.manager.test.annotations.TestDatabase; +import com.phocassoftware.graphql.database.manager.util.CompletableFutureUtil; import java.lang.reflect.AnnotatedElement; import java.util.Arrays; import java.util.List; diff --git a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/annotations/DatabaseNames.java b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/annotations/DatabaseNames.java similarity index 92% rename from graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/annotations/DatabaseNames.java rename to graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/annotations/DatabaseNames.java index 58e61599..bdde44d0 100644 --- a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/annotations/DatabaseNames.java +++ b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/annotations/DatabaseNames.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.annotations; +package com.phocassoftware.graphql.database.manager.test.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/annotations/DatabaseOrganisation.java b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/annotations/DatabaseOrganisation.java similarity index 80% rename from graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/annotations/DatabaseOrganisation.java rename to graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/annotations/DatabaseOrganisation.java index 199f0eda..f135be99 100644 --- a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/annotations/DatabaseOrganisation.java +++ b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/annotations/DatabaseOrganisation.java @@ -1,4 +1,4 @@ -package com.fleetpin.graphql.database.manager.test.annotations; +package com.phocassoftware.graphql.database.manager.test.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/annotations/GlobalEnabled.java b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/annotations/GlobalEnabled.java similarity index 92% rename from graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/annotations/GlobalEnabled.java rename to graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/annotations/GlobalEnabled.java index a489fe79..78f361ec 100644 --- a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/annotations/GlobalEnabled.java +++ b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/annotations/GlobalEnabled.java @@ -10,7 +10,7 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.annotations; +package com.phocassoftware.graphql.database.manager.test.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/annotations/TestDatabase.java b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/annotations/TestDatabase.java similarity index 89% rename from graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/annotations/TestDatabase.java rename to graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/annotations/TestDatabase.java index a66282e9..d2cfcb5b 100644 --- a/graphql-database-manager-test/src/main/java/com/fleetpin/graphql/database/manager/test/annotations/TestDatabase.java +++ b/graphql-database-manager-test/src/main/java/com/phocassoftware/graphql/database/manager/test/annotations/TestDatabase.java @@ -10,10 +10,10 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.annotations; +package com.phocassoftware.graphql.database.manager.test.annotations; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.test.TestDatabaseProvider; +import com.phocassoftware.graphql.database.manager.test.TestDatabaseProvider; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbBackupTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbBackupTest.java similarity index 94% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbBackupTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbBackupTest.java index 681ede03..1a113c09 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbBackupTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbBackupTest.java @@ -10,20 +10,20 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.QueryHistoryBuilder; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.GlobalIndex; -import com.fleetpin.graphql.database.manager.annotations.History; -import com.fleetpin.graphql.database.manager.annotations.SecondaryIndex; -import com.fleetpin.graphql.database.manager.dynamo.DynamoBackupItem; -import com.fleetpin.graphql.database.manager.dynamo.DynamoDbManager; -import com.fleetpin.graphql.database.manager.dynamo.DynamoHistoryBackupItem; -import com.fleetpin.graphql.database.manager.util.BackupItem; -import com.fleetpin.graphql.database.manager.util.HistoryBackupItem; +import com.phocassoftware.graphql.database.manager.QueryHistoryBuilder; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.GlobalIndex; +import com.phocassoftware.graphql.database.manager.annotations.History; +import com.phocassoftware.graphql.database.manager.annotations.SecondaryIndex; +import com.phocassoftware.graphql.database.manager.dynamo.DynamoBackupItem; +import com.phocassoftware.graphql.database.manager.dynamo.DynamoDbManager; +import com.phocassoftware.graphql.database.manager.dynamo.DynamoHistoryBackupItem; +import com.phocassoftware.graphql.database.manager.util.BackupItem; +import com.phocassoftware.graphql.database.manager.util.HistoryBackupItem; import java.sql.Timestamp; import java.util.HashMap; import java.util.List; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbDataWriterTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbDataWriterTest.java similarity index 83% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbDataWriterTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbDataWriterTest.java index b818fbfe..d4fa65a0 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbDataWriterTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbDataWriterTest.java @@ -1,10 +1,10 @@ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import com.fleetpin.graphql.database.manager.DataWriter; -import com.fleetpin.graphql.database.manager.DatabaseDriver; +import com.phocassoftware.graphql.database.manager.DataWriter; +import com.phocassoftware.graphql.database.manager.DatabaseDriver; import org.junit.jupiter.api.Assertions; import org.mockito.Mockito; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbHistoryTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbHistoryTest.java similarity index 98% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbHistoryTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbHistoryTest.java index 5e28514f..308e8152 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbHistoryTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbHistoryTest.java @@ -10,13 +10,13 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.QueryHistoryBuilder; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.History; -import com.fleetpin.graphql.database.manager.annotations.TableName; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.QueryHistoryBuilder; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.History; +import com.phocassoftware.graphql.database.manager.annotations.TableName; import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbIndexesTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbIndexesTest.java similarity index 92% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbIndexesTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbIndexesTest.java index b384ca54..16beed04 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbIndexesTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbIndexesTest.java @@ -10,18 +10,18 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.GlobalIndex; -import com.fleetpin.graphql.database.manager.annotations.SecondaryIndex; -import com.fleetpin.graphql.database.manager.dynamo.DynamoDbManager; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseOrganisation; -import com.fleetpin.graphql.database.manager.util.BackupItem; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.GlobalIndex; +import com.phocassoftware.graphql.database.manager.annotations.SecondaryIndex; +import com.phocassoftware.graphql.database.manager.dynamo.DynamoDbManager; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseOrganisation; +import com.phocassoftware.graphql.database.manager.util.BackupItem; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbInheritanceTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbInheritanceTest.java similarity index 89% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbInheritanceTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbInheritanceTest.java index 17c477e7..3aa97338 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbInheritanceTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbInheritanceTest.java @@ -10,14 +10,14 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.TableName; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.TableName; import java.util.Comparator; import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbLinkTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbLinkTest.java similarity index 95% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbLinkTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbLinkTest.java index 1ac240bd..26085d3c 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbLinkTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbLinkTest.java @@ -10,12 +10,12 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseOrganisation; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseOrganisation; import java.util.Comparator; import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbPermission.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbPermission.java similarity index 80% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbPermission.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbPermission.java index be26a515..5744bcae 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbPermission.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbPermission.java @@ -10,10 +10,10 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; import java.util.Comparator; import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbPutGetDeleteTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbPutGetDeleteTest.java similarity index 94% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbPutGetDeleteTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbPutGetDeleteTest.java index fc8dedb5..43300de2 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbPutGetDeleteTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbPutGetDeleteTest.java @@ -10,14 +10,14 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; - -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.dynamo.DynamoDbManager; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseOrganisation; -import com.fleetpin.graphql.database.manager.test.annotations.GlobalEnabled; +package com.phocassoftware.graphql.database.manager.test; + +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.dynamo.DynamoDbManager; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseOrganisation; +import com.phocassoftware.graphql.database.manager.test.annotations.GlobalEnabled; import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbPutValueTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbPutValueTest.java similarity index 88% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbPutValueTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbPutValueTest.java index 925435a5..f69b010d 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbPutValueTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbPutValueTest.java @@ -1,7 +1,7 @@ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test; -import com.fleetpin.graphql.database.manager.PutValue; -import com.fleetpin.graphql.database.manager.RevisionMismatchException; +import com.phocassoftware.graphql.database.manager.PutValue; +import com.phocassoftware.graphql.database.manager.RevisionMismatchException; import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbQueryBuilderTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbQueryBuilderTest.java similarity index 96% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbQueryBuilderTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbQueryBuilderTest.java index 5152668f..4151aa83 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbQueryBuilderTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbQueryBuilderTest.java @@ -10,10 +10,10 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; import java.util.List; import java.util.Random; import java.util.concurrent.CompletableFuture; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbQueryTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbQueryTest.java similarity index 95% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbQueryTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbQueryTest.java index 04609b35..a4298c8b 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbQueryTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbQueryTest.java @@ -10,12 +10,12 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; -import com.fleetpin.graphql.database.manager.test.annotations.GlobalEnabled; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.test.annotations.GlobalEnabled; import java.util.Comparator; import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbRevisionDeleteTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbRevisionDeleteTest.java similarity index 92% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbRevisionDeleteTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbRevisionDeleteTest.java index 3dde428f..208358dc 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbRevisionDeleteTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbRevisionDeleteTest.java @@ -10,12 +10,12 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.RevisionMismatchException; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.RevisionMismatchException; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; import java.util.Arrays; import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbRevisionLinkTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbRevisionLinkTest.java similarity index 95% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbRevisionLinkTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbRevisionLinkTest.java index e711d9a9..1ce97f0e 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbRevisionLinkTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbRevisionLinkTest.java @@ -10,12 +10,12 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.RevisionMismatchException; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.RevisionMismatchException; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; import java.util.Arrays; import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbRevisionPutTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbRevisionPutTest.java similarity index 95% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbRevisionPutTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbRevisionPutTest.java index 12cb1d66..8b37d0ee 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbRevisionPutTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/DynamoDbRevisionPutTest.java @@ -10,12 +10,12 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.RevisionMismatchException; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.RevisionMismatchException; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/ObjectMapperCreator.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/ObjectMapperCreator.java similarity index 96% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/ObjectMapperCreator.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/ObjectMapperCreator.java index 50715d57..bd2001d1 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/ObjectMapperCreator.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/ObjectMapperCreator.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.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.PropertyAccessor; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/TestDatabase.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/TestDatabase.java similarity index 79% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/TestDatabase.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/TestDatabase.java index 4e032693..9e6c899b 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/TestDatabase.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/TestDatabase.java @@ -9,15 +9,15 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @Retention(RetentionPolicy.RUNTIME) -@com.fleetpin.graphql.database.manager.test.annotations.TestDatabase( +@com.phocassoftware.graphql.database.manager.test.annotations.TestDatabase( objectMapper = ObjectMapperCreator.class, - classPath = "com.fleetpin.graphql.database.manager.test" + classPath = "com.phocassoftware.graphql.database.manager.test" ) public @interface TestDatabase { } diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/VirtualDatabaseTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/VirtualDatabaseTest.java similarity index 87% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/VirtualDatabaseTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/VirtualDatabaseTest.java index c1569a3a..e1d6e0e7 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/VirtualDatabaseTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/VirtualDatabaseTest.java @@ -10,11 +10,11 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.VirtualDatabase; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.VirtualDatabase; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbBackupTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbBackupTest.java similarity index 90% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbBackupTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbBackupTest.java index f886e460..62be7f58 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbBackupTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbBackupTest.java @@ -10,22 +10,22 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test.hashed; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.GlobalIndex; -import com.fleetpin.graphql.database.manager.annotations.Hash; -import com.fleetpin.graphql.database.manager.annotations.HashLocator; -import com.fleetpin.graphql.database.manager.annotations.HashLocator.HashQuery; -import com.fleetpin.graphql.database.manager.annotations.HashLocator.HashQueryBuilder; -import com.fleetpin.graphql.database.manager.annotations.SecondaryIndex; -import com.fleetpin.graphql.database.manager.dynamo.DynamoDbManager; -import com.fleetpin.graphql.database.manager.util.BackupItem; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.GlobalIndex; +import com.phocassoftware.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.annotations.HashLocator; +import com.phocassoftware.graphql.database.manager.annotations.HashLocator.HashQuery; +import com.phocassoftware.graphql.database.manager.annotations.HashLocator.HashQueryBuilder; +import com.phocassoftware.graphql.database.manager.annotations.SecondaryIndex; +import com.phocassoftware.graphql.database.manager.dynamo.DynamoDbManager; +import com.phocassoftware.graphql.database.manager.util.BackupItem; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbDataWriterTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbDataWriterTest.java similarity index 83% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbDataWriterTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbDataWriterTest.java index 69a1b3c6..c0a5f77f 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbDataWriterTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbDataWriterTest.java @@ -1,10 +1,10 @@ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test.hashed; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import com.fleetpin.graphql.database.manager.DataWriter; -import com.fleetpin.graphql.database.manager.DatabaseDriver; +import com.phocassoftware.graphql.database.manager.DataWriter; +import com.phocassoftware.graphql.database.manager.DatabaseDriver; import org.junit.jupiter.api.Assertions; import org.mockito.Mockito; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbHistoryTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbHistoryTest.java similarity index 79% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbHistoryTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbHistoryTest.java index b77cc938..139609f3 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbHistoryTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbHistoryTest.java @@ -10,14 +10,14 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test.hashed; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.QueryHistoryBuilder; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.Hash; -import com.fleetpin.graphql.database.manager.annotations.History; -import com.fleetpin.graphql.database.manager.test.HistoryProcessor; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.QueryHistoryBuilder; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.annotations.History; +import com.phocassoftware.graphql.database.manager.test.HistoryProcessor; import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbIndexesTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbIndexesTest.java similarity index 88% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbIndexesTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbIndexesTest.java index f1a230b7..e7d695b2 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbIndexesTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbIndexesTest.java @@ -10,21 +10,21 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test.hashed; import static org.junit.jupiter.api.Assertions.assertThrows; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.GlobalIndex; -import com.fleetpin.graphql.database.manager.annotations.Hash; -import com.fleetpin.graphql.database.manager.annotations.SecondaryIndex; -import com.fleetpin.graphql.database.manager.dynamo.DynamoDbManager; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseOrganisation; -import com.fleetpin.graphql.database.manager.util.BackupItem; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.GlobalIndex; +import com.phocassoftware.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.annotations.SecondaryIndex; +import com.phocassoftware.graphql.database.manager.dynamo.DynamoDbManager; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseOrganisation; +import com.phocassoftware.graphql.database.manager.util.BackupItem; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbLinkTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbLinkTest.java similarity index 84% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbLinkTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbLinkTest.java index d6a13b44..103009f2 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbLinkTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbLinkTest.java @@ -10,15 +10,15 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test.hashed; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.Hash; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; import java.util.concurrent.CompletionException; import java.util.concurrent.ExecutionException; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbPutGetDeleteTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbPutGetDeleteTest.java similarity index 94% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbPutGetDeleteTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbPutGetDeleteTest.java index 92c3a852..dfd2f124 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbPutGetDeleteTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbPutGetDeleteTest.java @@ -10,15 +10,15 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.hashed; - -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.Hash; -import com.fleetpin.graphql.database.manager.dynamo.DynamoDbManager; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseOrganisation; -import com.fleetpin.graphql.database.manager.test.annotations.GlobalEnabled; +package com.phocassoftware.graphql.database.manager.test.hashed; + +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.dynamo.DynamoDbManager; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseOrganisation; +import com.phocassoftware.graphql.database.manager.test.annotations.GlobalEnabled; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbPutValueTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbPutValueTest.java similarity index 87% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbPutValueTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbPutValueTest.java index 00637123..82166b24 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/DynamoDbPutValueTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbPutValueTest.java @@ -1,7 +1,7 @@ -package com.fleetpin.graphql.database.manager.test; +package com.phocassoftware.graphql.database.manager.test.hashed; -import com.fleetpin.graphql.database.manager.PutValue; -import com.fleetpin.graphql.database.manager.RevisionMismatchException; +import com.phocassoftware.graphql.database.manager.PutValue; +import com.phocassoftware.graphql.database.manager.RevisionMismatchException; import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbQueryBuilderTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbQueryBuilderTest.java similarity index 96% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbQueryBuilderTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbQueryBuilderTest.java index 27666d03..898becc9 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbQueryBuilderTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbQueryBuilderTest.java @@ -10,11 +10,11 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test.hashed; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.Hash; import java.util.List; import java.util.Random; import java.util.concurrent.CompletableFuture; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbQueryTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbQueryTest.java similarity index 83% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbQueryTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbQueryTest.java index 8fedc50d..96ab6070 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbQueryTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbQueryTest.java @@ -10,13 +10,13 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test.hashed; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.Hash; import java.util.concurrent.ExecutionException; final class DynamoDbQueryTest { diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbRevisionDeleteTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbRevisionDeleteTest.java similarity index 90% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbRevisionDeleteTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbRevisionDeleteTest.java index 61df04ec..c9e5045e 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbRevisionDeleteTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbRevisionDeleteTest.java @@ -10,13 +10,13 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test.hashed; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.RevisionMismatchException; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.Hash; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.RevisionMismatchException; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; import java.util.Arrays; import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbRevisionPutTest.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbRevisionPutTest.java similarity index 94% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbRevisionPutTest.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbRevisionPutTest.java index c79429d2..2fbaa28a 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/DynamoDbRevisionPutTest.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/DynamoDbRevisionPutTest.java @@ -10,13 +10,13 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test.hashed; -import com.fleetpin.graphql.database.manager.Database; -import com.fleetpin.graphql.database.manager.RevisionMismatchException; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.Hash; -import com.fleetpin.graphql.database.manager.test.annotations.DatabaseNames; +import com.phocassoftware.graphql.database.manager.Database; +import com.phocassoftware.graphql.database.manager.RevisionMismatchException; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.test.annotations.DatabaseNames; import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Assertions; diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/SimplerHasher.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/SimplerHasher.java similarity index 59% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/SimplerHasher.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/SimplerHasher.java index 31b9dcbd..eff3f5dd 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/SimplerHasher.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/SimplerHasher.java @@ -1,6 +1,6 @@ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test.hashed; -import com.fleetpin.graphql.database.manager.annotations.Hash.HashExtractor; +import com.phocassoftware.graphql.database.manager.annotations.Hash.HashExtractor; public class SimplerHasher implements HashExtractor { diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/TestDatabase.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/TestDatabase.java similarity index 72% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/TestDatabase.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/TestDatabase.java index 969595ae..a80cab89 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/TestDatabase.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/TestDatabase.java @@ -9,16 +9,16 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test.hashed; -import com.fleetpin.graphql.database.manager.test.ObjectMapperCreator; +import com.phocassoftware.graphql.database.manager.test.ObjectMapperCreator; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @Retention(RetentionPolicy.RUNTIME) -@com.fleetpin.graphql.database.manager.test.annotations.TestDatabase( +@com.phocassoftware.graphql.database.manager.test.annotations.TestDatabase( objectMapper = ObjectMapperCreator.class, - classPath = "com.fleetpin.graphql.database.manager.test.hashed", + classPath = "com.phocassoftware.graphql.database.manager.test.hashed", hashed = true ) public @interface TestDatabase { diff --git a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/TestScanLogic.java b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/TestScanLogic.java similarity index 92% rename from graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/TestScanLogic.java rename to graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/TestScanLogic.java index 7a37d0f3..80b3404a 100644 --- a/graphql-database-manager-test/src/test/java/com/fleetpin/graphql/database/manager/test/hashed/TestScanLogic.java +++ b/graphql-database-manager-test/src/test/java/com/phocassoftware/graphql/database/manager/test/hashed/TestScanLogic.java @@ -10,14 +10,14 @@ * the License. */ -package com.fleetpin.graphql.database.manager.test.hashed; +package com.phocassoftware.graphql.database.manager.test.hashed; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import com.fleetpin.graphql.database.manager.Table; -import com.fleetpin.graphql.database.manager.annotations.Hash; -import com.fleetpin.graphql.database.manager.dynamo.DynamoDbManager; +import com.phocassoftware.graphql.database.manager.Table; +import com.phocassoftware.graphql.database.manager.annotations.Hash; +import com.phocassoftware.graphql.database.manager.dynamo.DynamoDbManager; import java.util.concurrent.ExecutionException; final class TestScanLogic { diff --git a/pom.xml b/pom.xml index fa76cb37..b6a8179a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.fleetpin + com.phocas graphql-database-manager 3.0.4-SNAPSHOT GraphQL Builder @@ -35,21 +35,6 @@ - - - Ashley Taylor - ashley.taylor@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - - Alexander Johnston - alexander.johnston@fleetpin.co.nz - Fleetpin - http://www.fleetpin.co.nz - - -