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
The following commit(s) were added to refs/heads/CAUSEWAY-3676 by this push:
new b0cc729094 CAUSEWAY-3676: moves GqlvDomainObject to model module
b0cc729094 is described below
commit b0cc729094389aa7f27d1dbb50a33795f8ba7044
Author: danhaywood <[email protected]>
AuthorDate: Sat Jan 20 10:32:21 2024 +0000
CAUSEWAY-3676: moves GqlvDomainObject to model module
---
core/metamodel/src/main/java/module-info.java | 2 +-
.../viewer/graphql/model/parts}/GqlvDomainObject.java | 18 ++++++------------
.../graphql/viewer/source/ObjectTypeFactory.java | 2 ++
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/core/metamodel/src/main/java/module-info.java
b/core/metamodel/src/main/java/module-info.java
index bc03b1ab71..53e1ee6924 100644
--- a/core/metamodel/src/main/java/module-info.java
+++ b/core/metamodel/src/main/java/module-info.java
@@ -128,7 +128,7 @@ open module org.apache.causeway.core.metamodel {
org.apache.causeway.viewer.restfulobjects.viewer,
org.apache.causeway.viewer.wicket.model,
org.apache.causeway.viewer.wicket.ui,
- org.apache.causeway.incubator.viewer.graphql.viewer;
+ org.apache.causeway.incubator.viewer.graphql.viewer,
org.apache.causeway.incubator.viewer.graphql.model;
exports org.apache.causeway.core.metamodel.specloader.validator;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvDomainObject.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/GqlvDomainObject.java
similarity index 96%
rename from
incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvDomainObject.java
rename to
incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/GqlvDomainObject.java
index b9c310109e..8ce6ca7445 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvDomainObject.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/GqlvDomainObject.java
@@ -1,4 +1,4 @@
-package org.apache.causeway.viewer.graphql.viewer.source;
+package org.apache.causeway.viewer.graphql.model.parts;
import java.util.ArrayList;
import java.util.Collections;
@@ -21,12 +21,6 @@ import
org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
-import org.apache.causeway.viewer.graphql.model.parts.GqlvAction;
-import org.apache.causeway.viewer.graphql.model.parts.GqlvAssociation;
-import org.apache.causeway.viewer.graphql.model.parts.GqlvCollection;
-import org.apache.causeway.viewer.graphql.model.parts.GqlvMeta;
-import org.apache.causeway.viewer.graphql.model.parts.GqlvProperty;
-import org.apache.causeway.viewer.graphql.model.parts._Constants;
import org.apache.causeway.viewer.graphql.model.util._LTN;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
@@ -179,7 +173,7 @@ public class GqlvDomainObject {
}
- void addPropertiesAsFields() {
+ public void addPropertiesAsFields() {
objectSpec.streamProperties(MixedIn.INCLUDED).forEach(this::addPropertyAsField);
}
@@ -223,7 +217,7 @@ public class GqlvDomainObject {
}
- void addCollectionsAsLists() {
+ public void addCollectionsAsLists() {
objectSpec.streamCollections(MixedIn.INCLUDED).forEach(this::addCollection);
}
@@ -322,7 +316,7 @@ public class GqlvDomainObject {
*
* @see #getGqlObjectType()
*/
- GraphQLObjectType buildGqlObjectType() {
+ public GraphQLObjectType buildGqlObjectType() {
if (gqlObjectType != null) {
throw new IllegalArgumentException(String.format("GqlObjectType
has already been built for %s", getLogicalTypeName()));
}
@@ -365,7 +359,7 @@ public class GqlvDomainObject {
: Optional.empty();
}
- void addActionsAsFields() {
+ public void addActionsAsFields() {
objectSpec.streamActions(ActionScope.PRODUCTION, MixedIn.INCLUDED)
.forEach(this::addAction);
@@ -423,7 +417,7 @@ public class GqlvDomainObject {
getProperties().forEach(this::createAndRegisterDataFetcherForAssociation);
}
- void createAndRegisterDataFetchersForCollection() {
+ public void createAndRegisterDataFetchersForCollection() {
getCollections().forEach(
this::createAndRegisterDataFetcherForAssociation);
}
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 804756aea4..f0275e4803 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
@@ -20,6 +20,8 @@ package org.apache.causeway.viewer.graphql.viewer.source;
import javax.inject.Inject;
+import org.apache.causeway.viewer.graphql.model.parts.GqlvDomainObject;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
