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 44efffe285 CAUSEWAY-3676: removes holder.holder.holder chains
44efffe285 is described below
commit 44efffe2853f0f4a34d70aa06c6281a663a038e7
Author: danhaywood <[email protected]>
AuthorDate: Thu Jan 25 17:55:19 2024 +0000
CAUSEWAY-3676: removes holder.holder.holder chains
---
.../apache/causeway/viewer/graphql/model/domain/GqlvAction.java | 9 +++++----
.../causeway/viewer/graphql/model/domain/GqlvActionParam.java | 2 +-
.../viewer/graphql/model/domain/GqlvActionParamDisabled.java | 4 ++--
.../viewer/graphql/model/domain/GqlvActionParamHidden.java | 4 ++--
.../causeway/viewer/graphql/model/domain/GqlvActionParams.java | 2 +-
.../causeway/viewer/graphql/model/domain/GqlvPropertySet.java | 2 +-
6 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
index d482c3e1c7..f6c1c293c1 100644
---
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
@@ -45,13 +45,14 @@ import static graphql.schema.GraphQLObjectType.newObject;
public class GqlvAction
extends GqlvMember<ObjectAction, GqlvAction.Holder>
implements GqlvMemberHidden.Holder,
- GqlvMemberDisabled.Holder,
- GqlvActionInvoke.Holder,
- GqlvActionValidate.Holder,
- GqlvActionParams.Holder {
+ GqlvMemberDisabled.Holder,
+ GqlvActionInvoke.Holder,
+ GqlvActionValidate.Holder,
+ GqlvActionParams.Holder {
private final GraphQLObjectType.Builder gqlObjectTypeBuilder;
private final GraphQLObjectType gqlObjectType;
+
private final GqlvMemberHidden hidden;
private final GqlvMemberDisabled disabled;
private final GqlvActionValidate validate;
diff --git
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java
index 4d7efa3c31..058fc19f4c 100644
---
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java
@@ -60,7 +60,7 @@ public class GqlvActionParam implements
GqlvActionParamDisabled.Holder, GqlvActi
this.holder = holder;
this.objectActionParameter = objectActionParameter;
this.codeRegistryBuilder = codeRegistryBuilder;
- this.gqlObjectTypeBuilder =
newObject().name(TypeNames.actionParamTypeNameFor(holder.getHolder().getHolder().getObjectSpecification(),
objectActionParameter));
+ this.gqlObjectTypeBuilder =
newObject().name(TypeNames.actionParamTypeNameFor(holder.getObjectSpecification(),
objectActionParameter));
this.bookmarkService = bookmarkService;
this.hidden = new GqlvActionParamHidden(this, codeRegistryBuilder,
bookmarkService);
diff --git
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDisabled.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDisabled.java
index 0a95d08ab7..5d490b4d99 100644
---
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDisabled.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDisabled.java
@@ -58,7 +58,7 @@ public class GqlvActionParamDisabled {
GraphQLFieldDefinition.Builder fieldBuilder = newFieldDefinition()
.name("disabled")
.type(TypeMapper.scalarTypeFor(String.class));
- addGqlArguments(holder.getHolder().getHolder().getObjectAction(),
fieldBuilder, TypeMapper.InputContext.DISABLE);
+ addGqlArguments(holder.getObjectAction(), fieldBuilder,
TypeMapper.InputContext.DISABLE);
this.field = holder.addField(fieldBuilder.build());
this.bookmarkService = bookmarkService;
}
@@ -74,7 +74,7 @@ public class GqlvActionParamDisabled {
private String disabled(
final DataFetchingEnvironment dataFetchingEnvironment) {
- final ObjectAction objectAction =
holder.getHolder().getHolder().getObjectAction();
+ final ObjectAction objectAction = holder.getObjectAction();
val sourcePojo = BookmarkedPojo.sourceFrom(dataFetchingEnvironment);
diff --git
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamHidden.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamHidden.java
index 768f699600..e47205a2c1 100644
---
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamHidden.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamHidden.java
@@ -56,7 +56,7 @@ public class GqlvActionParamHidden {
GraphQLFieldDefinition.Builder fieldBuilder = newFieldDefinition()
.name("hidden")
.type(TypeMapper.scalarTypeFor(boolean.class));
- addGqlArguments(holder.getHolder().getHolder().getObjectAction(),
fieldBuilder, TypeMapper.InputContext.DISABLE);
+ addGqlArguments(holder.getObjectAction(), fieldBuilder,
TypeMapper.InputContext.DISABLE);
this.field = holder.addField(fieldBuilder.build());
this.bookmarkService = bookmarkService;
}
@@ -71,7 +71,7 @@ public class GqlvActionParamHidden {
private boolean hidden(final DataFetchingEnvironment
dataFetchingEnvironment) {
- final ObjectAction objectAction =
holder.getHolder().getHolder().getObjectAction();
+ final ObjectAction objectAction = holder.getObjectAction();
val sourcePojo = BookmarkedPojo.sourceFrom(dataFetchingEnvironment);
diff --git
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java
index c494061d53..f19069e292 100644
---
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java
@@ -62,7 +62,7 @@ public class GqlvActionParams implements
GqlvActionParam.Holder {
) {
this.holder = holder;
this.codeRegistryBuilder = codeRegistryBuilder;
- this.gqlObjectTypeBuilder =
newObject().name(TypeNames.actionParamsTypeNameFor(holder.getHolder().getObjectSpecification(),
holder.getObjectAction()));
+ this.gqlObjectTypeBuilder =
newObject().name(TypeNames.actionParamsTypeNameFor(holder.getObjectSpecification(),
holder.getObjectAction()));
this.bookmarkService = bookmarkService;
holder.getObjectAction().getParameters().forEach(this::addParam);
diff --git
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertySet.java
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertySet.java
index 55805643c4..15468a2806 100644
---
a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertySet.java
+++
b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertySet.java
@@ -71,7 +71,7 @@ public class GqlvPropertySet {
}
GraphQLOutputType outputTypeFor(Holder holder) {
- return
TypeMapper.outputTypeFor(holder.getHolder().getObjectSpecification()); //
setters return void, so we return the domain object instead
+ return TypeMapper.outputTypeFor(holder.getObjectSpecification()); //
setters return void, so we return the domain object instead
}
