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 fe02ee06a5 CAUSEWAY-3676: moves further classes to model module (3)
fe02ee06a5 is described below
commit fe02ee06a54527e16e8fa7192f143167d82e31b5
Author: danhaywood <[email protected]>
AuthorDate: Sat Jan 20 10:28:52 2024 +0000
CAUSEWAY-3676: moves further classes to model module (3)
---
.../viewers/graphql/model/src/main/java/module-info.java | 2 ++
.../model/CausewayModuleIncViewerGraphqlModel.java | 2 ++
.../graphql/model/registry}/GraphQLTypeRegistry.java | 2 +-
.../causeway/viewer/graphql/model/types}/TypeMapper.java | 4 ++--
.../viewer/graphql/model/{parts => util}/_LTN.java | 2 +-
.../viewer/integration/GraphQlSourceForCauseway.java | 2 +-
.../viewer/graphql/viewer/source/GqlvDomainObject.java | 3 ++-
.../graphql/viewer/source/GqlvServiceStructure.java | 3 ++-
.../viewer/graphql/viewer/source/ObjectTypeFactory.java | 16 ++++++----------
9 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/incubator/viewers/graphql/model/src/main/java/module-info.java
b/incubator/viewers/graphql/model/src/main/java/module-info.java
index 30cc1ae5af..d5d9d1afe2 100644
--- a/incubator/viewers/graphql/model/src/main/java/module-info.java
+++ b/incubator/viewers/graphql/model/src/main/java/module-info.java
@@ -2,6 +2,8 @@ module org.apache.causeway.incubator.viewer.graphql.model {
exports org.apache.causeway.viewer.graphql.model;
exports org.apache.causeway.viewer.graphql.model.parts;
exports org.apache.causeway.viewer.graphql.model.util;
+ exports org.apache.causeway.viewer.graphql.model.types;
+ exports org.apache.causeway.viewer.graphql.model.registry;
requires org.apache.causeway.core.config;
requires org.apache.causeway.incubator.viewer.graphql.applib;
diff --git
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/CausewayModuleIncViewerGraphqlModel.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/CausewayModuleIncViewerGraphqlModel.java
index 435db4961f..ef2a2437b3 100644
---
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/CausewayModuleIncViewerGraphqlModel.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/CausewayModuleIncViewerGraphqlModel.java
@@ -18,6 +18,7 @@
*/
package org.apache.causeway.viewer.graphql.model;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -28,6 +29,7 @@ import
org.apache.causeway.viewer.graphql.applib.CausewayModuleIncViewerGraphqlA
// Modules
CausewayModuleIncViewerGraphqlApplib.class
})
+@ComponentScan
public class CausewayModuleIncViewerGraphqlModel {
}
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQLTypeRegistry.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/registry/GraphQLTypeRegistry.java
similarity index 98%
rename from
incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQLTypeRegistry.java
rename to
incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/registry/GraphQLTypeRegistry.java
index cde08dfded..249b14802f 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQLTypeRegistry.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/registry/GraphQLTypeRegistry.java
@@ -1,4 +1,4 @@
-package org.apache.causeway.viewer.graphql.viewer.source;
+package org.apache.causeway.viewer.graphql.model.registry;
import graphql.schema.GraphQLInputObjectType;
import graphql.schema.GraphQLNamedType;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/TypeMapper.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
similarity index 97%
rename from
incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/TypeMapper.java
rename to
incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
index bb1e920afe..fac6abca5a 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/TypeMapper.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.graphql.viewer.source;
+package org.apache.causeway.viewer.graphql.model.types;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -28,7 +28,7 @@ import
org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.causeway.viewer.graphql.model.parts._Constants;
-import org.apache.causeway.viewer.graphql.model.parts._LTN;
+import org.apache.causeway.viewer.graphql.model.util._LTN;
import graphql.Scalars;
import graphql.schema.GraphQLInputType;
diff --git
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/_LTN.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/_LTN.java
similarity index 95%
rename from
incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/_LTN.java
rename to
incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/_LTN.java
index 9c9e9b8d0c..e3206f8651 100644
---
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/_LTN.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/_LTN.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.graphql.model.parts;
+package org.apache.causeway.viewer.graphql.model.util;
import lombok.experimental.UtilityClass;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
index baf0d56f75..1a8d8af08f 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
+++
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
@@ -33,7 +33,7 @@ import
org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import
org.apache.causeway.viewer.graphql.viewer.source.GqlvTopLevelQueryBehaviour;
import
org.apache.causeway.viewer.graphql.viewer.source.GqlvTopLevelQueryStructure;
-import org.apache.causeway.viewer.graphql.viewer.source.GraphQLTypeRegistry;
+import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
import org.apache.causeway.viewer.graphql.viewer.source.ObjectTypeFactory;
import org.apache.causeway.viewer.graphql.viewer.source.QueryFieldFactory;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvDomainObject.java
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvDomainObject.java
index 57ddd80fc8..b9c310109e 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvDomainObject.java
+++
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvDomainObject.java
@@ -27,7 +27,8 @@ 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.parts._LTN;
+import org.apache.causeway.viewer.graphql.model.util._LTN;
+import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
import static graphql.schema.FieldCoordinates.coordinates;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvServiceStructure.java
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvServiceStructure.java
index 1aca95f3cf..7f792cec9a 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvServiceStructure.java
+++
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvServiceStructure.java
@@ -13,7 +13,8 @@ import java.util.stream.Collectors;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
-import org.apache.causeway.viewer.graphql.model.parts._LTN;
+import org.apache.causeway.viewer.graphql.model.util._LTN;
+import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
import org.apache.causeway.viewer.graphql.model.util._BiMap;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
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 c57a00ed15..804756aea4 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
@@ -18,26 +18,22 @@
*/
package org.apache.causeway.viewer.graphql.viewer.source;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLInputObjectType.newInputObject;
-import static graphql.schema.GraphQLObjectType.newObject;
-
import javax.inject.Inject;
-import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
-
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
+import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
-
-import graphql.schema.GraphQLCodeRegistry;
-import graphql.schema.GraphQLObjectType;
+import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
+
+import graphql.schema.GraphQLCodeRegistry;
+import graphql.schema.GraphQLObjectType;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
