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 340ef5d7de CAUSEWAY-3676: moves further classes to model module
340ef5d7de is described below
commit 340ef5d7deb9726801777db681fe8985734aa326
Author: danhaywood <[email protected]>
AuthorDate: Sat Jan 20 10:23:42 2024 +0000
CAUSEWAY-3676: moves further classes to model module
---
.../apache/causeway/viewer/graphql/model/parts}/GqlvMeta.java | 2 +-
.../causeway/viewer/graphql/model/parts}/GqlvMutations.java | 2 +-
.../apache/causeway/viewer/graphql/model/parts/_Constants.java | 9 +++++++++
.../org/apache/causeway/viewer/graphql/model/parts}/_LTN.java | 6 +++---
.../org/apache/causeway/viewer/graphql/model}/util/_BiMap.java | 2 +-
.../apache/causeway/viewer/graphql/model}/util/_BiMap_Test.java | 3 ++-
incubator/viewers/graphql/viewer/src/main/java/module-info.java | 1 -
.../causeway/viewer/graphql/viewer/source/GqlvDomainObject.java | 5 ++++-
.../viewer/graphql/viewer/source/GqlvServiceStructure.java | 4 ++--
.../apache/causeway/viewer/graphql/viewer/source/TypeMapper.java | 2 ++
.../apache/causeway/viewer/graphql/viewer/source/_Constants.java | 9 ---------
11 files changed, 25 insertions(+), 20 deletions(-)
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvMeta.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/GqlvMeta.java
similarity index 97%
rename from
incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvMeta.java
rename to
incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/GqlvMeta.java
index c51c9df2dd..ad72b0b30b 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvMeta.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/GqlvMeta.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.parts;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvMutations.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/GqlvMutations.java
similarity index 95%
rename from
incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvMutations.java
rename to
incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/GqlvMutations.java
index 49303b7852..c3111ea7d9 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvMutations.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/GqlvMutations.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.parts;
import java.util.List;
diff --git
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/_Constants.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/_Constants.java
new file mode 100644
index 0000000000..772da7cf16
--- /dev/null
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/_Constants.java
@@ -0,0 +1,9 @@
+package org.apache.causeway.viewer.graphql.model.parts;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class _Constants {
+ public final static String GQL_INPUTTYPE_PREFIX = "_gql_input__";
+ public final static String GQL_MUTATIONS_FIELDNAME = "_gql_mutations";
+}
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/_LTN.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/_LTN.java
similarity index 87%
rename from
incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/_LTN.java
rename to
incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/_LTN.java
index e65d1e8298..9c9e9b8d0c 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/_LTN.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/parts/_LTN.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.graphql.viewer.source;
+package org.apache.causeway.viewer.graphql.model.parts;
import lombok.experimental.UtilityClass;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
@UtilityClass
-final class _LTN {
- static String sanitized(ObjectSpecification objectSpecification) {
+public final class _LTN {
+ public static String sanitized(ObjectSpecification objectSpecification) {
return sanitized(objectSpecification.getLogicalTypeName());
}
private static String sanitized(final String name) {
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/util/_BiMap.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/_BiMap.java
similarity index 95%
rename from
incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/util/_BiMap.java
rename to
incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/_BiMap.java
index c3b7bba68c..df70cf63bf 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/util/_BiMap.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/_BiMap.java
@@ -1,4 +1,4 @@
-package org.apache.causeway.viewer.graphql.viewer.util;
+package org.apache.causeway.viewer.graphql.model.util;
import java.util.Collection;
import java.util.Collections;
diff --git
a/incubator/viewers/graphql/viewer/src/test/java/org/apache/causeway/viewer/graphql/viewer/util/_BiMap_Test.java
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/model/util/_BiMap_Test.java
similarity index 95%
rename from
incubator/viewers/graphql/viewer/src/test/java/org/apache/causeway/viewer/graphql/viewer/util/_BiMap_Test.java
rename to
incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/model/util/_BiMap_Test.java
index 71ba72b992..f74023840d 100644
---
a/incubator/viewers/graphql/viewer/src/test/java/org/apache/causeway/viewer/graphql/viewer/util/_BiMap_Test.java
+++
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/model/util/_BiMap_Test.java
@@ -1,9 +1,10 @@
-package org.apache.causeway.viewer.graphql.viewer.util;
+package org.apache.causeway.viewer.graphql.model.util;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
+import org.apache.causeway.viewer.graphql.model.util._BiMap;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.*;
diff --git a/incubator/viewers/graphql/viewer/src/main/java/module-info.java
b/incubator/viewers/graphql/viewer/src/main/java/module-info.java
index c6a090775f..a1bf0e3120 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/module-info.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/module-info.java
@@ -2,7 +2,6 @@ module org.apache.causeway.incubator.viewer.graphql.viewer {
exports org.apache.causeway.viewer.graphql.viewer;
exports org.apache.causeway.viewer.graphql.viewer.source;
exports org.apache.causeway.viewer.graphql.viewer.integration;
- exports org.apache.causeway.viewer.graphql.viewer.util;
requires com.fasterxml.jackson.core;
requires com.fasterxml.jackson.databind;
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 4eb9608e66..57ddd80fc8 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
@@ -24,11 +24,14 @@ 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.parts._LTN;
import static graphql.schema.FieldCoordinates.coordinates;
-import static
org.apache.causeway.viewer.graphql.viewer.source._Constants.GQL_INPUTTYPE_PREFIX;
+import static
org.apache.causeway.viewer.graphql.model.parts._Constants.GQL_INPUTTYPE_PREFIX;
import graphql.schema.DataFetcher;
import graphql.schema.GraphQLCodeRegistry;
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 2b363ce325..1aca95f3cf 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,8 +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.core.metamodel.specloader.SpecificationLoader;
-import org.apache.causeway.viewer.graphql.viewer.util._BiMap;
+import org.apache.causeway.viewer.graphql.model.parts._LTN;
+import org.apache.causeway.viewer.graphql.model.util._BiMap;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static graphql.schema.GraphQLObjectType.newObject;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/TypeMapper.java
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/TypeMapper.java
index 336d0419a3..bb1e920afe 100644
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/TypeMapper.java
+++
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/TypeMapper.java
@@ -27,6 +27,8 @@ import
org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
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 graphql.Scalars;
import graphql.schema.GraphQLInputType;
diff --git
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/_Constants.java
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/_Constants.java
deleted file mode 100644
index 299cffc0ae..0000000000
---
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/_Constants.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.causeway.viewer.graphql.viewer.source;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class _Constants {
- final static String GQL_INPUTTYPE_PREFIX = "_gql_input__";
- final static String GQL_MUTATIONS_FIELDNAME = "_gql_mutations";
-}
