You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/10/28 17:16:21 UTC
[isis] 09/10: ISIS-2158: further remove uses ObjectAdapter
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7d18b77cd30c2b23c9ef4c80c7600c0596a4deec
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Oct 28 17:23:33 2019 +0100
ISIS-2158: further remove uses ObjectAdapter
---
.../java/org/apache/isis/metamodel/spec/ManagedObject.java | 11 ++++++-----
.../isis/metamodel/services/ServiceInjectorLegacyTest.java | 5 ++---
.../rendering/domainobjects/ObjectCollectionReprRenderer.java | 6 +++---
.../rendering/domainobjects/ObjectPropertyReprRenderer.java | 8 ++++----
.../wicket/viewer/IsisWicketApplication_newPageFactory.java | 3 ++-
5 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
index 3a6f308..47dc21f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
@@ -315,11 +315,12 @@ public interface ManagedObject {
@Deprecated
static RootOid _collectionOidIfAny(ManagedObject adapter) {
- val oid = ManagedObject.promote(adapter).getOid();
- if(!(oid instanceof RootOid)) {
- return null;
- }
- return (RootOid) oid;
+ return _rootOidIfAny(adapter);
+// val oid = ManagedObject.promote(adapter).getOid();
+// if(!(oid instanceof RootOid)) {
+// return null;
+// }
+// return (RootOid) oid;
}
@Deprecated
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
index 6f48e79..c609b84 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/ServiceInjectorLegacyTest.java
@@ -22,6 +22,7 @@ package org.apache.isis.metamodel.services;
import javax.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.boot.test.context.SpringBootTest;
@@ -29,8 +30,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ActiveProfiles;
import org.apache.isis.applib.services.inject.ServiceInjector;
@@ -60,7 +59,7 @@ import lombok.val;
properties = {
"isis.services.injector.setPrefix=true"
})
-@DirtiesContext(classMode = ClassMode.BEFORE_CLASS)
+@Disabled("legacy injector is no longer used")
class ServiceInjectorLegacyTest {
// -- SPRING SETUP
diff --git a/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
index c5acd39..7884db6 100644
--- a/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
+++ b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
@@ -105,11 +105,11 @@ public class ObjectCollectionReprRenderer extends AbstractObjectMemberReprRender
elementAdapters.forEach(elementAdapter->{
final LinkBuilder valueLinkBuilder = DomainObjectReprRenderer
- .newLinkToBuilder(resourceContext, Rel.VALUE, ManagedObject.promote(elementAdapter));
+ .newLinkToBuilder(resourceContext, Rel.VALUE, elementAdapter);
if(eagerlyRender) {
final DomainObjectReprRenderer renderer = new DomainObjectReprRenderer(getResourceContext(), followHref, JsonRepresentation.newMap()
);
- renderer.with(ManagedObject.promote(elementAdapter));
+ renderer.with(elementAdapter);
if(mode.isEventSerialization()) {
renderer.asEventSerialization();
}
@@ -124,7 +124,7 @@ public class ObjectCollectionReprRenderer extends AbstractObjectMemberReprRender
}
private boolean renderEagerly(ManagedObject valueAdapter) {
- return renderEagerly() && resourceContext.canEagerlyRender(ManagedObject.promote(valueAdapter));
+ return renderEagerly() && resourceContext.canEagerlyRender(valueAdapter);
}
// ///////////////////////////////////////////////////
diff --git a/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
index 98b59c1..e0caa7a 100644
--- a/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
+++ b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
@@ -115,11 +115,11 @@ extends AbstractObjectMemberReprRenderer<ObjectPropertyReprRenderer, OneToOneAss
format = String.format("big-integer");
}
}
- return jsonValueEncoder.appendValueAndFormat(ManagedObject.promote(valueAdapter), representation, format, resourceContext.suppressMemberExtensions());
+ return jsonValueEncoder.appendValueAndFormat(valueAdapter, representation, format, resourceContext.suppressMemberExtensions());
}
boolean eagerlyRender =
- (renderEagerly() && resourceContext.canEagerlyRender(ManagedObject.promote(valueAdapter)))
+ (renderEagerly() && resourceContext.canEagerlyRender(valueAdapter))
|| (linkFollower != null && !linkFollower.isTerminated());
if(valueAdapter == null) {
@@ -130,11 +130,11 @@ extends AbstractObjectMemberReprRenderer<ObjectPropertyReprRenderer, OneToOneAss
final TitleFacet titleFacet = spec.getFacet(TitleFacet.class);
final String title = titleFacet.title(valueAdapter);
- final LinkBuilder valueLinkBuilder = DomainObjectReprRenderer.newLinkToBuilder(resourceContext, Rel.VALUE, ManagedObject.promote(valueAdapter)).withTitle(title);
+ final LinkBuilder valueLinkBuilder = DomainObjectReprRenderer.newLinkToBuilder(resourceContext, Rel.VALUE, valueAdapter).withTitle(title);
if(eagerlyRender) {
final DomainObjectReprRenderer renderer =
new DomainObjectReprRenderer(resourceContext, linkFollower, JsonRepresentation.newMap());
- renderer.with(ManagedObject.promote(valueAdapter));
+ renderer.with(valueAdapter);
if(mode.isEventSerialization()) {
renderer.asEventSerialization();
}
diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_newPageFactory.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_newPageFactory.java
index 74750e9..569ca63 100644
--- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_newPageFactory.java
+++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_newPageFactory.java
@@ -69,7 +69,8 @@ class IsisWicketApplication_newPageFactory {
public <C extends IRequestablePage> C newPage(Class<C> pageClass) {
if(EntityPage.class.equals(pageClass)) {
- //TODO whenever this happens we should redirect to home
+ //TODO whenever this happens we should redirect to home,
+ // almost certainly the session has timed out
throw _Exceptions.unexpectedCodeReach();
}