You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2024/01/19 12:38:52 UTC
(causeway) branch CAUSEWAY-3676 updated (3a6bf75c01 -> 4ac62e1914)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch CAUSEWAY-3676
in repository https://gitbox.apache.org/repos/asf/causeway.git
discard 3a6bf75c01 CAUSEWAY-3676: more cleanup of ObjectTypeFactory vs GqlvObjectSpec
new d17b5e711e CAUSEWAY-3676: moves creation of InputObjectType into GqlvObjectSpec's constructor
new 4ac62e1914 CAUSEWAY-3676: renames inputType to gqlInputObjectType
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3a6bf75c01)
\
N -- N -- N refs/heads/CAUSEWAY-3676 (4ac62e1914)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../viewer/graphql/viewer/source/GqlvObjectSpec.java | 19 ++++++++-----------
.../graphql/viewer/source/ObjectTypeFactory.java | 12 +-----------
2 files changed, 9 insertions(+), 22 deletions(-)
(causeway) 02/02: CAUSEWAY-3676: renames inputType to gqlInputObjectType
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3676
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 4ac62e1914c2b49bcdaca547d626df22b6feb828
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 19 12:37:23 2024 +0000
CAUSEWAY-3676: renames inputType to gqlInputObjectType
---
.../viewer/graphql/viewer/source/GqlvObjectSpec.java | 4 ++--
.../viewer/graphql/viewer/source/ObjectTypeFactory.java | 12 +-----------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvObjectSpec.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvObjectSpec.java
index 9d20456c8b..c6f4e1df78 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvObjectSpec.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvObjectSpec.java
@@ -38,7 +38,7 @@ public class GqlvObjectSpec {
@Getter private final GraphQLObjectType.Builder gqlObjectTypeBuilder;
- @Getter private final GraphQLInputType inputType;
+ @Getter private final GraphQLInputObjectType gqlInputObjectType;
public String getLogicalTypeNameSanitized() {
val logicalTypeName = objectSpec.getLogicalTypeName();
@@ -79,7 +79,7 @@ public class GqlvObjectSpec {
.name("id")
.type(nonNull(Scalars.GraphQLID))
.build());
- inputType = inputTypeBuilder.build();
+ gqlInputObjectType = inputTypeBuilder.build();
}
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
index eb96b31325..8043b7a4fb 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
@@ -51,8 +51,6 @@ import graphql.schema.FieldCoordinates;
import graphql.schema.GraphQLArgument;
import graphql.schema.GraphQLCodeRegistry;
import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLInputObjectField;
-import graphql.schema.GraphQLInputObjectType;
import graphql.schema.GraphQLInputType;
import graphql.schema.GraphQLObjectType;
import graphql.schema.GraphQLOutputType;
@@ -110,15 +108,7 @@ public class ObjectTypeFactory {
// create input type
-// String inputTypeName = GQL_INPUTTYPE_PREFIX + gqlvObjectSpec.getLogicalTypeNameSanitized();
-// GraphQLInputObjectType.Builder inputTypeBuilder = newInputObject().name(inputTypeName);
-// inputTypeBuilder
-// .field(GraphQLInputObjectField.newInputObjectField()
-// .name("id")
-// .type(nonNull(Scalars.GraphQLID))
-// .build());
-// GraphQLInputType inputType = inputTypeBuilder.build();
- GraphQLInputType inputType = gqlvObjectSpec.getInputType();
+ GraphQLInputType inputType = gqlvObjectSpec.getGqlInputObjectType();
graphQLTypeRegistry.addTypeIfNotAlreadyPresent(inputType);
// add fields
(causeway) 01/02: CAUSEWAY-3676: moves creation of InputObjectType into GqlvObjectSpec's constructor
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3676
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit d17b5e711e48b1fa96a2b115400fe30f4e3fa1e8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 19 12:36:31 2024 +0000
CAUSEWAY-3676: moves creation of InputObjectType into GqlvObjectSpec's constructor
---
.../viewer/graphql/viewer/source/GqlvObjectSpec.java | 19 +++++++++++++++++++
.../graphql/viewer/source/ObjectTypeFactory.java | 18 +++++++++---------
2 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvObjectSpec.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvObjectSpec.java
index e5198504a5..9d20456c8b 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvObjectSpec.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvObjectSpec.java
@@ -2,6 +2,9 @@ package org.apache.causeway.viewer.graphql.viewer.source;
import graphql.Scalars;
import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLInputObjectField;
+import graphql.schema.GraphQLInputObjectType;
+import graphql.schema.GraphQLInputType;
import graphql.schema.GraphQLList;
import graphql.schema.GraphQLObjectType;
@@ -17,9 +20,12 @@ import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLInputObjectType.newInputObject;
import static graphql.schema.GraphQLNonNull.nonNull;
import static graphql.schema.GraphQLObjectType.newObject;
+import static org.apache.causeway.viewer.graphql.viewer.source.ObjectTypeFactory.GQL_INPUTTYPE_PREFIX;
+
/**
* A wrapper around {@link ObjectSpecification}
*/
@@ -32,6 +38,8 @@ public class GqlvObjectSpec {
@Getter private final GraphQLObjectType.Builder gqlObjectTypeBuilder;
+ @Getter private final GraphQLInputType inputType;
+
public String getLogicalTypeNameSanitized() {
val logicalTypeName = objectSpec.getLogicalTypeName();
return _LogicalTypeName.sanitized(logicalTypeName);
@@ -63,6 +71,17 @@ public class GqlvObjectSpec {
metaField = newFieldDefinition().name("_gql_meta").type(metaType).build();
gqlObjectTypeBuilder.field(metaField);
+
+ String inputTypeName = GQL_INPUTTYPE_PREFIX + getLogicalTypeNameSanitized();
+ GraphQLInputObjectType.Builder inputTypeBuilder = newInputObject().name(inputTypeName);
+ inputTypeBuilder
+ .field(GraphQLInputObjectField.newInputObjectField()
+ .name("id")
+ .type(nonNull(Scalars.GraphQLID))
+ .build());
+ inputType = inputTypeBuilder.build();
+
+
}
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
index 5fe9864db5..eb96b31325 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
@@ -110,15 +110,15 @@ public class ObjectTypeFactory {
// create input type
- String inputTypeName = GQL_INPUTTYPE_PREFIX + gqlvObjectSpec.getLogicalTypeNameSanitized();
- GraphQLInputObjectType.Builder inputTypeBuilder = newInputObject().name(inputTypeName);
- inputTypeBuilder
- .field(GraphQLInputObjectField.newInputObjectField()
- .name("id")
- .type(nonNull(Scalars.GraphQLID))
- .build());
- GraphQLInputType inputType = inputTypeBuilder.build();
-
+// String inputTypeName = GQL_INPUTTYPE_PREFIX + gqlvObjectSpec.getLogicalTypeNameSanitized();
+// GraphQLInputObjectType.Builder inputTypeBuilder = newInputObject().name(inputTypeName);
+// inputTypeBuilder
+// .field(GraphQLInputObjectField.newInputObjectField()
+// .name("id")
+// .type(nonNull(Scalars.GraphQLID))
+// .build());
+// GraphQLInputType inputType = inputTypeBuilder.build();
+ GraphQLInputType inputType = gqlvObjectSpec.getInputType();
graphQLTypeRegistry.addTypeIfNotAlreadyPresent(inputType);
// add fields