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/02/23 09:58:55 UTC
(causeway) 09/23: CAUSEWAY-3676: simplifies holders (13)
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 95f4fc3fc898800e000590ffb957c09c6b118e99
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Feb 23 07:07:05 2024 +0000
CAUSEWAY-3676: simplifies holders (13)
---
.../rich/query/GqlvPropertyAutoComplete.java | 4 ++--
.../domain/rich/query/GqlvPropertyChoices.java | 4 ++--
.../model/domain/rich/query/GqlvPropertySet.java | 4 ++--
.../domain/rich/query/GqlvPropertyValidate.java | 4 ++--
.../rich/query/HolderPropertyAutoComplete.java | 5 ++--
.../model/domain/rich/query/HolderPropertySet.java | 4 ++--
.../simple/query/GqlvPropertyAutoComplete.java | 9 ++++----
.../domain/simple/query/GqlvPropertyChoices.java | 8 +++----
.../model/domain/simple/query/GqlvPropertySet.java | 8 +++----
.../domain/simple/query/GqlvPropertyValidate.java | 8 +++----
.../mmproviders/OneToOneAssociationProvider.java | 27 ----------------------
11 files changed, 30 insertions(+), 55 deletions(-)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java
index 8bcf2b19a6..e420687bad 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java
@@ -48,7 +48,7 @@ public class GqlvPropertyAutoComplete extends GqlvAbstract {
super(context);
this.holder = holder;
- val otoa = holder.getOneToOneAssociation();
+ val otoa = holder.getObjectMember();
if (otoa.hasAutoComplete()) {
val elementType = otoa.getElementType();
val fieldBuilder = newFieldDefinition()
@@ -74,7 +74,7 @@ public class GqlvPropertyAutoComplete extends GqlvAbstract {
return null;
}
- val association = holder.getOneToOneAssociation();
+ val association = holder.getObjectMember();
val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo);
val searchArg = dataFetchingEnvironment.<String>getArgument(SEARCH_PARAM_NAME);
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java
index 288f6c7fe8..2148b534b9 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java
@@ -45,7 +45,7 @@ public class GqlvPropertyChoices extends GqlvAbstract {
super(context);
this.holder = holder;
- val otoa = holder.getOneToOneAssociation();
+ val otoa = holder.getObjectMember();
if (otoa.hasChoices()) {
val elementType = otoa.getElementType();
val fieldBuilder = newFieldDefinition()
@@ -68,7 +68,7 @@ public class GqlvPropertyChoices extends GqlvAbstract {
return null;
}
- val association = holder.getOneToOneAssociation();
+ val association = holder.getObjectMember();
val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo);
val choicesManagedObject = association.getChoices(managedObject, InteractionInitiatedBy.USER);
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java
index 0072da69cd..79c8d6328d 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java
@@ -54,7 +54,7 @@ public class GqlvPropertySet extends GqlvAbstract {
val fieldBuilder = newFieldDefinition()
.name("set")
.type(graphQLOutputType);
- holder.addGqlArgument(holder.getOneToOneAssociation(), fieldBuilder, TypeMapper.InputContext.INVOKE);
+ holder.addGqlArgument(holder.getObjectMember(), fieldBuilder, TypeMapper.InputContext.INVOKE);
setField(fieldBuilder.build());
}
@@ -69,7 +69,7 @@ public class GqlvPropertySet extends GqlvAbstract {
return null;
}
- val association = holder.getOneToOneAssociation();
+ val association = holder.getObjectMember();
val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo);
Map<String, Object> arguments = dataFetchingEnvironment.getArguments();
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java
index 8dbf49f8cd..b07f15be9b 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java
@@ -45,7 +45,7 @@ public class GqlvPropertyValidate extends GqlvAbstract {
val fieldBuilder = newFieldDefinition()
.name("validate")
.type((GraphQLOutputType) context.typeMapper.outputTypeFor(String.class));
- holder.addGqlArgument(holder.getOneToOneAssociation(), fieldBuilder, TypeMapper.InputContext.VALIDATE);
+ holder.addGqlArgument(holder.getObjectMember(), fieldBuilder, TypeMapper.InputContext.VALIDATE);
setField(fieldBuilder.build());
}
@@ -60,7 +60,7 @@ public class GqlvPropertyValidate extends GqlvAbstract {
return null;
}
- val association = holder.getOneToOneAssociation();
+ val association = holder.getObjectMember();
val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo);
val arguments = dataFetchingEnvironment.getArguments();
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyAutoComplete.java
index cce609a192..d12996245a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyAutoComplete.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyAutoComplete.java
@@ -1,12 +1,13 @@
package org.apache.causeway.viewer.graphql.model.domain.rich.query;
+import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
-import org.apache.causeway.viewer.graphql.model.mmproviders.OneToOneAssociationProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider;
public interface HolderPropertyAutoComplete
extends ObjectSpecificationProvider,
- OneToOneAssociationProvider,
+ ObjectMemberProvider<OneToOneAssociation>,
SchemaTypeProvider {
}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertySet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertySet.java
index 3ce4452fe7..da7ac0071e 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertySet.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertySet.java
@@ -3,14 +3,14 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.query;
import graphql.schema.GraphQLFieldDefinition;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
-import org.apache.causeway.viewer.graphql.model.mmproviders.OneToOneAssociationProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
public interface HolderPropertySet
extends ObjectSpecificationProvider,
- OneToOneAssociationProvider,
+ ObjectMemberProvider<OneToOneAssociation>,
SchemaTypeProvider {
void addGqlArgument(
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyAutoComplete.java
index d52e462b73..4788c72e2a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyAutoComplete.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyAutoComplete.java
@@ -29,12 +29,13 @@ import static graphql.schema.GraphQLNonNull.nonNull;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.SchemaType;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
-import org.apache.causeway.viewer.graphql.model.mmproviders.OneToOneAssociationProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider;
import lombok.val;
@@ -51,7 +52,7 @@ public class GqlvPropertyAutoComplete extends GqlvAbstract {
super(context);
this.holder = holder;
- val otoa = holder.getOneToOneAssociation();
+ val otoa = holder.getObjectMember();
if (otoa.hasAutoComplete()) {
val elementType = otoa.getElementType();
val fieldBuilder = newFieldDefinition()
@@ -77,7 +78,7 @@ public class GqlvPropertyAutoComplete extends GqlvAbstract {
return null;
}
- val association = holder.getOneToOneAssociation();
+ val association = holder.getObjectMember();
val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo);
val searchArg = dataFetchingEnvironment.<String>getArgument(SEARCH_PARAM_NAME);
@@ -90,7 +91,7 @@ public class GqlvPropertyAutoComplete extends GqlvAbstract {
public interface Holder
extends ObjectSpecificationProvider,
- OneToOneAssociationProvider,
+ ObjectMemberProvider<OneToOneAssociation>,
SchemaTypeProvider {
}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyChoices.java
index 7070a2ce0b..0e5ea9c8c3 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyChoices.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyChoices.java
@@ -33,8 +33,8 @@ import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.domain.SchemaType;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
-import org.apache.causeway.viewer.graphql.model.mmproviders.OneToOneAssociationProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
@@ -50,7 +50,7 @@ public class GqlvPropertyChoices extends GqlvAbstract {
super(context);
this.holder = holder;
- val otoa = holder.getOneToOneAssociation();
+ val otoa = holder.getObjectMember();
if (otoa.hasChoices()) {
val elementType = otoa.getElementType();
val fieldBuilder = newFieldDefinition()
@@ -73,7 +73,7 @@ public class GqlvPropertyChoices extends GqlvAbstract {
return null;
}
- val association = holder.getOneToOneAssociation();
+ val association = holder.getObjectMember();
val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo);
val choicesManagedObject = association.getChoices(managedObject, InteractionInitiatedBy.USER);
@@ -84,7 +84,7 @@ public class GqlvPropertyChoices extends GqlvAbstract {
public interface Holder
extends ObjectSpecificationProvider,
- OneToOneAssociationProvider,
+ ObjectMemberProvider<OneToOneAssociation>,
SchemaTypeProvider {
void addGqlArgument(OneToOneAssociation otoa, GraphQLFieldDefinition.Builder fieldBuilder, TypeMapper.InputContext inputContext);
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertySet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertySet.java
index ce1ef136d1..63afa77952 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertySet.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertySet.java
@@ -36,8 +36,8 @@ import org.apache.causeway.viewer.graphql.model.exceptions.DisabledException;
import org.apache.causeway.viewer.graphql.model.exceptions.HiddenException;
import org.apache.causeway.viewer.graphql.model.exceptions.InvalidException;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
-import org.apache.causeway.viewer.graphql.model.mmproviders.OneToOneAssociationProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
@@ -59,7 +59,7 @@ public class GqlvPropertySet extends GqlvAbstract {
val fieldBuilder = newFieldDefinition()
.name("set")
.type(graphQLOutputType);
- holder.addGqlArgument(holder.getOneToOneAssociation(), fieldBuilder, TypeMapper.InputContext.INVOKE);
+ holder.addGqlArgument(holder.getObjectMember(), fieldBuilder, TypeMapper.InputContext.INVOKE);
setField(fieldBuilder.build());
}
@@ -74,7 +74,7 @@ public class GqlvPropertySet extends GqlvAbstract {
return null;
}
- val association = holder.getOneToOneAssociation();
+ val association = holder.getObjectMember();
val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo);
Map<String, Object> arguments = dataFetchingEnvironment.getArguments();
@@ -103,7 +103,7 @@ public class GqlvPropertySet extends GqlvAbstract {
public interface Holder
extends ObjectSpecificationProvider,
- OneToOneAssociationProvider,
+ ObjectMemberProvider<OneToOneAssociation>,
SchemaTypeProvider {
void addGqlArgument(OneToOneAssociation oneToOneAssociation, GraphQLFieldDefinition.Builder fieldBuilder, TypeMapper.InputContext inputContext);
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyValidate.java
index 849d5d7e3b..89c8e01688 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyValidate.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyValidate.java
@@ -30,8 +30,8 @@ import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
-import org.apache.causeway.viewer.graphql.model.mmproviders.OneToOneAssociationProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
@@ -50,7 +50,7 @@ public class GqlvPropertyValidate extends GqlvAbstract {
val fieldBuilder = newFieldDefinition()
.name("validate")
.type((GraphQLOutputType) context.typeMapper.outputTypeFor(String.class));
- holder.addGqlArgument(holder.getOneToOneAssociation(), fieldBuilder, TypeMapper.InputContext.VALIDATE);
+ holder.addGqlArgument(holder.getObjectMember(), fieldBuilder, TypeMapper.InputContext.VALIDATE);
setField(fieldBuilder.build());
}
@@ -65,7 +65,7 @@ public class GqlvPropertyValidate extends GqlvAbstract {
return null;
}
- val association = holder.getOneToOneAssociation();
+ val association = holder.getObjectMember();
val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo);
val arguments = dataFetchingEnvironment.getArguments();
@@ -78,7 +78,7 @@ public class GqlvPropertyValidate extends GqlvAbstract {
public interface Holder
extends ObjectSpecificationProvider,
- OneToOneAssociationProvider,
+ ObjectMemberProvider<OneToOneAssociation>,
SchemaTypeProvider {
void addGqlArgument(OneToOneAssociation oneToOneAssociation, GraphQLFieldDefinition.Builder fieldBuilder, TypeMapper.InputContext inputContext);
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/OneToOneAssociationProvider.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/OneToOneAssociationProvider.java
deleted file mode 100644
index 5e1f74cf49..0000000000
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/OneToOneAssociationProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.causeway.viewer.graphql.model.mmproviders;
-
-import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
-
-import org.springframework.beans.factory.ObjectProvider;
-
-public interface OneToOneAssociationProvider extends ObjectMemberProvider<OneToOneAssociation> {
- OneToOneAssociation getOneToOneAssociation();
-}