This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit ba0310342c871b367710d23ba105ed1c75a88c1c Author: Andi Huber <ahu...@apache.org> AuthorDate: Thu Sep 1 15:46:18 2022 +0200 ISIS-3167: revert a tiny refactoring step done too early --- .../org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java | 2 +- .../org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java | 2 +- .../org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java index 4f15234a8c..d0b7c46a3e 100644 --- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java +++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/ObjectTypeFactory.java @@ -414,7 +414,7 @@ public class ObjectTypeFactory { Class<?> domainObjectInstanceClass = domainObjectInstance.getClass(); ObjectSpecification specification = specificationLoader.loadSpecification(domainObjectInstanceClass); - ManagedObject owner = ManagedObject.adaptScalar(specification, domainObjectInstance); + ManagedObject owner = ManagedObject.of(specification, domainObjectInstance); ManagedObject managedObject = otom.get(owner); diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java index d800229253..b5b98ec116 100644 --- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java +++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/isis/viewer/graphql/viewer/source/QueryFieldFactory.java @@ -133,7 +133,7 @@ public class QueryFieldFactory { Object argumentValue = arguments.get(oap.getId()); ObjectSpecification elementType = oap.getElementType(); - return ManagedObject.adaptScalar(elementType, argumentValue); + return ManagedObject.of(elementType, argumentValue); }).collect(Can.toCan()); diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java index 389d0063bc..5edee596fa 100644 --- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java +++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/binding/BindingsVaa.java @@ -361,7 +361,7 @@ public final class BindingsVaa { //SETTER @Override public void accept(@NonNull final Bindable<ManagedObject> target, final V fieldValue) { - target.setValue(ManagedObject.adaptScalar(valueSpec, fieldValue)); + target.setValue(ManagedObject.of(valueSpec, fieldValue)); }