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 2020/02/16 12:53:19 UTC
[isis] branch master updated: ISIS-2280: slightly cleaning up
BlobDemo; adds more tests
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
The following commit(s) were added to refs/heads/master by this push:
new 974d49d ISIS-2280: slightly cleaning up BlobDemo; adds more tests
974d49d is described below
commit 974d49d6c8e3b98d9d3dee96adb4baa1a8ad18f7
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Feb 16 13:53:05 2020 +0100
ISIS-2280: slightly cleaning up BlobDemo; adds more tests
---
.../menubars/MenuBarsLoaderServiceDefault.java | 35 ++++----
.../main/java/demoapp/dom/types/blob/BlobDemo.java | 11 +--
.../dom/types/blob/BlobDemo_downloadLogo.java | 10 +--
.../java/demoapp/dom/types/blob/DemoBlobStore.java | 81 -------------------
.../testdomain/model/actnsemantics}/BlobDemo.java | 34 +++-----
.../model/actnsemantics/BlobDemoMenu.java} | 33 ++++----
.../Configuration_usingActionSemantics.java} | 34 ++++----
.../model/actnsemantics/isis-logo-56x64.png | Bin 0 -> 4451 bytes
.../DomainObjectResourceTest.java} | 90 ++++++++++++++++-----
.../MenuBarsResourceTest.java} | 77 +++++++++---------
.../resources/MenuBarsResourceServerside.java | 9 ++-
11 files changed, 185 insertions(+), 229 deletions(-)
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
index 8337459..947c2e5 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
@@ -19,14 +19,10 @@
package org.apache.isis.core.runtimeservices.menubars;
import java.nio.charset.StandardCharsets;
-import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Named;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
@@ -81,25 +77,31 @@ public class MenuBarsLoaderServiceDefault implements MenuBarsLoaderService {
val xmlString = loadMenubarsLayoutResource(menubarsLayoutXmlResource);
if(xmlString == null) {
- warnNotFound();
+ warnNotFound(menubarsLayoutXmlResource);
return null;
}
try {
return jaxbService.fromXml(BS3MenuBars.class, xmlString);
} catch (Exception e) {
- severeCannotLoad(e);
+ severeCannotLoad(menubarsLayoutXmlResource, e);
return null;
}
}
- private String loadMenubarsLayoutResource(AbstractResource menubarsLayoutResource) {
+ private String loadMenubarsLayoutResource(final AbstractResource menubarsLayoutXmlResource) {
try {
+
+ if(!menubarsLayoutXmlResource.exists()) {
+ return null;
+ }
+
+ val source = menubarsLayoutXmlResource.getInputStream(); // throws if not found
final String xml =
- _Strings.read(menubarsLayoutResource.getInputStream(), StandardCharsets.UTF_8);
+ _Strings.read(source, StandardCharsets.UTF_8);
return xml;
} catch (Exception e) {
- severeCannotLoad(e);
+ severeCannotLoad(menubarsLayoutXmlResource, e);
return null;
}
@@ -109,22 +111,23 @@ public class MenuBarsLoaderServiceDefault implements MenuBarsLoaderService {
private boolean warnedOnce = false;
- private void warnNotFound() {
+ private void warnNotFound(AbstractResource menubarsLayoutXmlResource) {
if(warnedOnce) {
return;
}
log.warn(
- String.format("'%s': could not find readable resource for the Menubars-Layout.",
- WebAppContextPath.class.getName()));
+ "{}: could not find readable resource {} for the Menubars-Layout.",
+ WebAppContextPath.class.getName(),
+ menubarsLayoutXmlResource);
warnedOnce = true;
}
- private void severeCannotLoad(Exception cause) {
+ private void severeCannotLoad(AbstractResource menubarsLayoutXmlResource, Exception cause) {
- log.error(
- String.format("'%s': could not find readable resource for the Menubars-Layout.",
- WebAppContextPath.class.getName()),
+ log.error("{}: could not find readable resource {} for the Menubars-Layout.",
+ WebAppContextPath.class.getName(),
+ menubarsLayoutXmlResource,
cause);
}
}
diff --git a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java b/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java
index 5854ff0..ee85902 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java
@@ -30,17 +30,18 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.util.JaxbAdapters;
import org.apache.isis.applib.value.Blob;
+import org.apache.isis.applib.value.NamedWithMimeType.CommonMimeType;
import org.apache.isis.core.commons.internal.base._Bytes;
import org.apache.isis.core.commons.internal.resources._Resources;
+import demoapp.utils.DemoStub;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
-import demoapp.utils.DemoStub;
-
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
@@ -55,9 +56,9 @@ public class BlobDemo extends DemoStub {
try {
val bytes = _Bytes.of(_Resources.load(BlobDemo.class, "isis-logo-568x286.png"));
- logo = new Blob("isis-logo-568x286.png", "image/png", bytes);
+ logo = Blob.of("isis-logo-568x286", CommonMimeType.PNG, bytes);
} catch (Exception e) {
- // TODO: handle exception
+ log.error("failed to create Blob from image resource", e);
}
}
@@ -66,7 +67,7 @@ public class BlobDemo extends DemoStub {
@Property(editing=Editing.ENABLED) //TODO should not be required, https://issues.apache.org/jira/browse/ISIS-1970
@PropertyLayout
- @XmlElement @XmlJavaTypeAdapter(DemoBlobStore.BlobAdapter.class)
+ @XmlElement @XmlJavaTypeAdapter(JaxbAdapters.BlobAdapter.class)
@Getter @Setter private Blob logo;
// -- READONLY
diff --git a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo_downloadLogo.java b/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo_downloadLogo.java
index 18773e0..b2b78b7 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo_downloadLogo.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo_downloadLogo.java
@@ -21,22 +21,18 @@ package demoapp.dom.types.blob;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.ActionLayout.Position;
-import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.value.Blob;
import lombok.RequiredArgsConstructor;
-@Mixin
+@Action(associateWith = "logo")
+@ActionLayout(position = Position.PANEL)
@RequiredArgsConstructor
public class BlobDemo_downloadLogo {
private final BlobDemo holder;
- // -- EDITABLE
-
- @Action(associateWith = "logo")
- @ActionLayout(position = Position.PANEL)
- public Blob $$() {
+ public Blob act() {
return holder.getLogo();
}
diff --git a/examples/demo/src/main/java/demoapp/dom/types/blob/DemoBlobStore.java b/examples/demo/src/main/java/demoapp/dom/types/blob/DemoBlobStore.java
deleted file mode 100644
index 4935f3f..0000000
--- a/examples/demo/src/main/java/demoapp/dom/types/blob/DemoBlobStore.java
+++ /dev/null
@@ -1,81 +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 demoapp.dom.types.blob;
-
-import java.util.UUID;
-
-import javax.servlet.http.HttpSession;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import org.apache.isis.applib.value.Blob;
-
-import lombok.val;
-
-public class DemoBlobStore {
-
- // -- JAXB ADAPTER
-
- public static final class BlobAdapter extends XmlAdapter<String, Blob> {
-
- @Override
- public Blob unmarshal(String data) throws Exception {
- if(data==null) {
- return null;
- }
- val uuid = UUID.fromString(data);
- return get(uuid);
- }
-
- @Override
- public String marshal(Blob blob) throws Exception {
- if(blob==null) {
- return null;
- }
- val uuid = UUID.randomUUID();
- put(uuid, blob);
- return uuid.toString();
- }
-
- private void put(UUID uuid, Blob blob) {
- if(blob==null) {
- return;
- }
- session().setAttribute(uuid.toString(), blob);
- }
-
- private Blob get(UUID uuid) {
- if(uuid==null) {
- return null;
- }
- return (Blob) session().getAttribute(uuid.toString());
- }
-
- public static HttpSession session() {
- ServletRequestAttributes attr =
- (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
- return attr.getRequest().getSession(false); // false == don't allow create
- }
-
- }
-
-
-}
diff --git a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemo.java
similarity index 69%
copy from examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java
copy to examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemo.java
index 5854ff0..260d80d 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.blob;
+package org.apache.isis.testdomain.model.actnsemantics;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -30,7 +30,9 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.util.JaxbAdapters;
import org.apache.isis.applib.value.Blob;
+import org.apache.isis.applib.value.NamedWithMimeType.CommonMimeType;
import org.apache.isis.core.commons.internal.base._Bytes;
import org.apache.isis.core.commons.internal.resources._Resources;
@@ -39,43 +41,29 @@ import lombok.Setter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
-import demoapp.utils.DemoStub;
-
-@XmlRootElement(name = "Demo")
+@XmlRootElement(name = "BlobDemo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
-@DomainObject(nature=Nature.VIEW_MODEL, objectType = "demo.Blob", editing=Editing.ENABLED)
+@DomainObject(nature=Nature.VIEW_MODEL, objectType="smoketests.BlobDemo")
@Log4j2
-public class BlobDemo extends DemoStub {
+public class BlobDemo {
- @Override
public void initDefaults() {
- log.info("BlobDemo::initDefaults");
-
try {
val bytes = _Bytes.of(_Resources.load(BlobDemo.class, "isis-logo-568x286.png"));
- logo = new Blob("isis-logo-568x286.png", "image/png", bytes);
+ logo = Blob.of("isis-logo-56x64", CommonMimeType.PNG, bytes);
} catch (Exception e) {
- // TODO: handle exception
+ log.error("failed to create Blob from image resource", e);
}
}
// -- EDITABLE
- @Property(editing=Editing.ENABLED) //TODO should not be required, https://issues.apache.org/jira/browse/ISIS-1970
+ @Property(editing=Editing.ENABLED)
@PropertyLayout
- @XmlElement @XmlJavaTypeAdapter(DemoBlobStore.BlobAdapter.class)
+ @XmlElement @XmlJavaTypeAdapter(JaxbAdapters.BlobAdapter.class)
@Getter @Setter private Blob logo;
-
- // -- READONLY
-
- // @Property(editing=Editing.DISABLED)
- // @XmlElement @Getter @Setter private Blob blobReadonly;
- //
- // @Property(editing=Editing.DISABLED)
- // @PropertyLayout(multiLine=3)
- // @XmlElement @Getter @Setter private String stringMultilineReadonly;
-
+
}
diff --git a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo_downloadLogo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemoMenu.java
similarity index 55%
copy from examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo_downloadLogo.java
copy to examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemoMenu.java
index 18773e0..2beca65 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo_downloadLogo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/BlobDemoMenu.java
@@ -16,28 +16,31 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.blob;
+package org.apache.isis.testdomain.model.actnsemantics;
+
+import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.ActionLayout.Position;
-import org.apache.isis.applib.annotation.Mixin;
-import org.apache.isis.applib.value.Blob;
-
-import lombok.RequiredArgsConstructor;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.services.factory.FactoryService;
-@Mixin
-@RequiredArgsConstructor
-public class BlobDemo_downloadLogo {
+import lombok.val;
- private final BlobDemo holder;
+@DomainService(nature=NatureOfService.VIEW, objectType = "smoketests.BlobDemoMenu")
+@DomainObjectLayout(named="Blob Demo Menu")
+public class BlobDemoMenu {
- // -- EDITABLE
+ @Inject private FactoryService factoryService;
- @Action(associateWith = "logo")
- @ActionLayout(position = Position.PANEL)
- public Blob $$() {
- return holder.getLogo();
+ @Action
+ @ActionLayout(cssClassFa="fa-cloud")
+ public BlobDemo blobs(){
+ val demo = factoryService.viewModel(BlobDemo.class);
+ demo.initDefaults();
+ return demo;
}
}
diff --git a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo_downloadLogo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/Configuration_usingActionSemantics.java
similarity index 58%
copy from examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo_downloadLogo.java
copy to examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/Configuration_usingActionSemantics.java
index 18773e0..395378b 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/blob/BlobDemo_downloadLogo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/Configuration_usingActionSemantics.java
@@ -16,28 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.blob;
+package org.apache.isis.testdomain.model.actnsemantics;
-import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.ActionLayout.Position;
-import org.apache.isis.applib.annotation.Mixin;
-import org.apache.isis.applib.value.Blob;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
-import lombok.RequiredArgsConstructor;
+import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
-@Mixin
-@RequiredArgsConstructor
-public class BlobDemo_downloadLogo {
-
- private final BlobDemo holder;
-
- // -- EDITABLE
-
- @Action(associateWith = "logo")
- @ActionLayout(position = Position.PANEL)
- public Blob $$() {
- return holder.getLogo();
- }
+@Configuration
+@Import({
+ IsisModuleIncModelMetaModel.class
+})
+@ComponentScan(
+ basePackageClasses= {
+ Configuration_usingActionSemantics.class
+ })
+public class Configuration_usingActionSemantics {
}
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/isis-logo-56x64.png b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/isis-logo-56x64.png
new file mode 100644
index 0000000..42510f6
Binary files /dev/null and b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/isis-logo-56x64.png differ
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/layout/DomainObjectLayoutTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/DomainObjectResourceTest.java
similarity index 69%
copy from examples/smoketests/src/test/java/org/apache/isis/testdomain/layout/DomainObjectLayoutTest.java
copy to examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/DomainObjectResourceTest.java
index cf3cd2b..af81ba4 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/layout/DomainObjectLayoutTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/DomainObjectResourceTest.java
@@ -16,7 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testdomain.layout;
+package org.apache.isis.testdomain.rest;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.stream.Collectors;
@@ -28,9 +32,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.TestPropertySource;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Grid;
import org.apache.isis.applib.services.factory.FactoryService;
@@ -40,6 +41,8 @@ import org.apache.isis.core.metamodel.facets.object.grid.GridFacet;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
+import org.apache.isis.testdomain.model.actnsemantics.BlobDemo;
+import org.apache.isis.testdomain.model.actnsemantics.Configuration_usingActionSemantics;
import org.apache.isis.testdomain.model.layout.Configuration_usingLayout;
import org.apache.isis.testdomain.model.layout.LayoutDemo;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
@@ -55,7 +58,8 @@ import lombok.val;
classes = {
Configuration_usingJdo.class,
Configuration_usingLayout.class,
- DomainObjectLayoutTest.TestSetup.class
+ Configuration_usingActionSemantics.class,
+ DomainObjectResourceTest.TestSetup.class
},
properties = {
"isis.core.meta-model.introspector.mode=FULL",
@@ -67,8 +71,8 @@ import lombok.val;
IsisPresets.SilenceMetaModel,
IsisPresets.SilenceProgrammingModel
})
-class DomainObjectLayoutTest {
-
+class DomainObjectResourceTest {
+
@Inject private FactoryService factoryService;
@Inject private ObjectManager objectManager;
@Inject private DomainObjectResourceServerside domainObjectResourceServerside;
@@ -78,43 +82,85 @@ class DomainObjectLayoutTest {
DomainObjectResourceServerside.class
})
static class TestSetup {
-
+
}
-
+
@Test
void grid_fromDomainObjectResourceServerside_shouldContainMultiline() {
-
+
assertNotNull(domainObjectResourceServerside);
-
+
val layoutDemo = factoryService.viewModel(LayoutDemo.class);
val objectAdapter = objectManager.adapt(layoutDemo);
val spec = objectAdapter.getSpecification();
val domainType = spec.getSpecId().asString();
val instanceId = objectManager.identifyObject(objectAdapter).getIdentifier(); //TODO also needs URL encoding
-
+
val layoutResourceDescriptor =
ResourceDescriptor
.of(RepresentationType.OBJECT_LAYOUT, Where.ANYWHERE, RepresentationService.Intent.NOT_APPLICABLE);
-
+
val resourceContext = domainObjectResourceServerside.resourceContextForTesting(layoutResourceDescriptor, /*params*/null);
-
+
val grid = (BS3Grid) spec.getFacet(GridFacet.class).getGrid(objectAdapter);
-
+
DomainObjectResourceServerside.addLinks(resourceContext, domainType, instanceId, grid);
-
+
assertNotNull(grid);
-
+
val jaxbEntity = SerializationStrategy.JSON_INDENTED.entity(grid);
-
+
assertNotNull(jaxbEntity);
-
+
val filteredResult = _Strings.grep(jaxbEntity.toString(), "multiLine")
- .map(String::trim)
- .collect(Collectors.joining());
-
+ .map(String::trim)
+ .collect(Collectors.joining());
+
assertTrue(filteredResult.contains(" 3,"),
String.format("multiLine is expected to be populated, got '%s'", filteredResult));
+
+ }
+
+ @Test
+ void blobProperty_fromDomainObjectResourceServerside_shouldHaveActionSemantics_GET() {
+
+ assertNotNull(domainObjectResourceServerside);
+
+ val blobDemo = factoryService.viewModel(BlobDemo.class);
+ val objectAdapter = objectManager.adapt(blobDemo);
+ val spec = objectAdapter.getSpecification();
+ val domainType = spec.getSpecId().asString();
+ val instanceId = objectManager.identifyObject(objectAdapter).getIdentifier(); //TODO also needs URL encoding
+
+ val layoutResourceDescriptor =
+ ResourceDescriptor
+ .of(RepresentationType.OBJECT_LAYOUT, Where.ANYWHERE, RepresentationService.Intent.NOT_APPLICABLE);
+
+ val resourceContext = domainObjectResourceServerside.resourceContextForTesting(layoutResourceDescriptor, /*params*/null);
+
+ val grid = (BS3Grid) spec.getFacet(GridFacet.class).getGrid(objectAdapter);
+
+ DomainObjectResourceServerside.addLinks(resourceContext, domainType, instanceId, grid);
+
+ assertNotNull(grid);
+
+ val logoProperty = grid.getAllPropertiesById().get("logo");
+
+ assertNotNull(logoProperty);
+
+ val jaxbEntity = SerializationStrategy.JSON_INDENTED.entity(logoProperty);
+ //System.out.println(jaxbEntity);
+
+ assertNotNull(jaxbEntity);
+
+ val linkCountHavingGET = _Strings.grep(jaxbEntity.toString(), "\"method\"")
+ .map(String::trim)
+ .filter(s->s.contains("GET"))
+ .count();
+
+ assertEquals(1L, linkCountHavingGET);
}
+
}
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/layout/DomainObjectLayoutTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/MenuBarsResourceTest.java
similarity index 55%
rename from examples/smoketests/src/test/java/org/apache/isis/testdomain/layout/DomainObjectLayoutTest.java
rename to examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/MenuBarsResourceTest.java
index cf3cd2b..f26cd3f 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/layout/DomainObjectLayoutTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/MenuBarsResourceTest.java
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testdomain.layout;
+package org.apache.isis.testdomain.rest;
-import java.util.stream.Collectors;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import javax.inject.Inject;
@@ -28,23 +29,17 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.TestPropertySource;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.layout.grid.bootstrap3.BS3Grid;
-import org.apache.isis.applib.services.factory.FactoryService;
+import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
+import org.apache.isis.applib.services.menu.MenuBarsService;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.metamodel.facets.object.grid.GridFacet;
-import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
-import org.apache.isis.testdomain.model.layout.Configuration_usingLayout;
-import org.apache.isis.testdomain.model.layout.LayoutDemo;
+import org.apache.isis.testdomain.model.actnsemantics.Configuration_usingActionSemantics;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
-import org.apache.isis.viewer.restfulobjects.viewer.resources.DomainObjectResourceServerside;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.MenuBarsResourceServerside;
import org.apache.isis.viewer.restfulobjects.viewer.resources.ResourceDescriptor;
import org.apache.isis.viewer.restfulobjects.viewer.resources.serialization.SerializationStrategy;
@@ -54,8 +49,8 @@ import lombok.val;
@SpringBootTest(
classes = {
Configuration_usingJdo.class,
- Configuration_usingLayout.class,
- DomainObjectLayoutTest.TestSetup.class
+ Configuration_usingActionSemantics.class,
+ MenuBarsResourceTest.TestSetup.class
},
properties = {
"isis.core.meta-model.introspector.mode=FULL",
@@ -67,53 +62,59 @@ import lombok.val;
IsisPresets.SilenceMetaModel,
IsisPresets.SilenceProgrammingModel
})
-class DomainObjectLayoutTest {
+class MenuBarsResourceTest {
- @Inject private FactoryService factoryService;
- @Inject private ObjectManager objectManager;
- @Inject private DomainObjectResourceServerside domainObjectResourceServerside;
+ @Inject private MenuBarsResourceServerside menuBarsResourceServerside;
+ @Inject private MenuBarsService menuBarsService;
@Configuration
@Import({
- DomainObjectResourceServerside.class
+ MenuBarsResourceServerside.class
})
static class TestSetup {
}
@Test
- void grid_fromDomainObjectResourceServerside_shouldContainMultiline() {
-
- assertNotNull(domainObjectResourceServerside);
+ void blobDemoMenu_fromMenuBarsResourceServerside_shouldBe_GET() {
- val layoutDemo = factoryService.viewModel(LayoutDemo.class);
- val objectAdapter = objectManager.adapt(layoutDemo);
- val spec = objectAdapter.getSpecification();
- val domainType = spec.getSpecId().asString();
- val instanceId = objectManager.identifyObject(objectAdapter).getIdentifier(); //TODO also needs URL encoding
+ assertNotNull(menuBarsResourceServerside);
val layoutResourceDescriptor =
ResourceDescriptor
- .of(RepresentationType.OBJECT_LAYOUT, Where.ANYWHERE, RepresentationService.Intent.NOT_APPLICABLE);
+ .of(RepresentationType.MENUBARS, Where.ANYWHERE, RepresentationService.Intent.NOT_APPLICABLE);
+
+ val resourceContext = menuBarsResourceServerside.resourceContextForTesting(layoutResourceDescriptor, /*params*/null);
+ val linksForServiceActionsAddingVisitor = MenuBarsResourceServerside.linksForServiceActionsAddingVisitor(resourceContext);
+
+ val menuBars = menuBarsService.menuBars();
+
+ menuBars.visit(linksForServiceActionsAddingVisitor);
+
+ assertNotNull(menuBars);
- val resourceContext = domainObjectResourceServerside.resourceContextForTesting(layoutResourceDescriptor, /*params*/null);
+ final ServiceActionLayoutData[] blobDemoMenuRef = {null};
- val grid = (BS3Grid) spec.getFacet(GridFacet.class).getGrid(objectAdapter);
+ // find service action by object-type
+ menuBars.visit(actionLayoutData->{
+ if("smoketests.BlobDemoMenu".equals(actionLayoutData.getObjectType())) {
+ blobDemoMenuRef[0] = actionLayoutData;
+ }
+ });
- DomainObjectResourceServerside.addLinks(resourceContext, domainType, instanceId, grid);
+ val blobDemoMenu = blobDemoMenuRef[0];
- assertNotNull(grid);
+ assertNotNull(blobDemoMenu);
- val jaxbEntity = SerializationStrategy.JSON_INDENTED.entity(grid);
+ val jaxbEntity = SerializationStrategy.JSON_INDENTED.entity(blobDemoMenu);
assertNotNull(jaxbEntity);
- val filteredResult = _Strings.grep(jaxbEntity.toString(), "multiLine")
- .map(String::trim)
- .collect(Collectors.joining());
+ final long methodCount = _Strings.grep(jaxbEntity.toString(), "\"method\"")
+ .filter(line->line.contains("GET"))
+ .count();
- assertTrue(filteredResult.contains(" 3,"),
- String.format("multiLine is expected to be populated, got '%s'", filteredResult));
+ assertEquals(1L, methodCount);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
index 2716250..5f5f1a0 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
@@ -81,7 +81,12 @@ public class MenuBarsResourceServerside extends ResourceAbstract implements Menu
}
void addLinksForServiceActions(final ResourceContext resourceContext, final MenuBars menuBars) {
- menuBars.visit(new MenuBars.Visitor() {
+ menuBars.visit(linksForServiceActionsAddingVisitor(resourceContext));
+ }
+
+ // public ... for testing
+ public static MenuBars.Visitor linksForServiceActionsAddingVisitor(final ResourceContext resourceContext) {
+ return new MenuBars.Visitor() {
@Override
public void visit(final ServiceActionLayoutData actionLayoutData) {
final String objectType = actionLayoutData.getObjectType();
@@ -95,7 +100,7 @@ public class MenuBarsResourceServerside extends ResourceAbstract implements Menu
RepresentationType.OBJECT_ACTION.getJsonMediaType().toString());
actionLayoutData.setLink(link);
}
- });
+ };
}
@Override