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/06/25 04:33:20 UTC
[isis] branch master updated: ISIS-2340: mitigate some issues from
code analysis (sonar)
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 79349a6 ISIS-2340: mitigate some issues from code analysis (sonar)
79349a6 is described below
commit 79349a6f037b96a0a6acd63d1782d355fc3cf0fe
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jun 25 06:33:02 2020 +0200
ISIS-2340: mitigate some issues from code analysis (sonar)
---
.../java/org/apache/isis/testdomain/rest/RestServiceTest.java | 5 -----
.../shiro/UnstableShiroSecmanLdap_restfulStressTest.java | 2 +-
.../isis/incubator/viewer/vaadin/ui/pages/main/MainView.java | 10 ----------
3 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
index 97ae32a..5b96bfd 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
@@ -56,7 +56,6 @@ class RestServiceTest {
@Test
void bookOfTheWeek_viaRestEndpoint() {
- assertNotNull(restService.getPort());
assertTrue(restService.getPort()>0);
val useRequestDebugLogging = false;
@@ -78,7 +77,6 @@ class RestServiceTest {
@Test
void addNewBook_viaRestEndpoint() throws JAXBException {
- assertNotNull(restService.getPort());
assertTrue(restService.getPort()>0);
val useRequestDebugLogging = false;
@@ -103,7 +101,6 @@ class RestServiceTest {
@Test
void multipleBooks_viaRestEndpoint() throws JAXBException {
- assertNotNull(restService.getPort());
assertTrue(restService.getPort()>0);
val useRequestDebugLogging = false;
@@ -128,7 +125,6 @@ class RestServiceTest {
@Test
void bookOfTheWeek_asDto_viaRestEndpoint() {
- assertNotNull(restService.getPort());
assertTrue(restService.getPort()>0);
val useRequestDebugLogging = false;
@@ -150,7 +146,6 @@ class RestServiceTest {
@Test
void multipleBooks_asDto_viaRestEndpoint() throws JAXBException {
- assertNotNull(restService.getPort());
assertTrue(restService.getPort()>0);
val useRequestDebugLogging = false;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/UnstableShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/UnstableShiroSecmanLdap_restfulStressTest.java
index 06c82db..8b8a0d3 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/UnstableShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/UnstableShiroSecmanLdap_restfulStressTest.java
@@ -130,7 +130,7 @@ class UnstableShiroSecmanLdap_restfulStressTest extends AbstractShiroTest {
val httpSessionInfo = digest.getEntities();
assertNotNull(httpSessionInfo);
- assertEquals("no http-session", httpSessionInfo);
+ assertEquals("no http-session", httpSessionInfo.getSingletonOrFail());
}
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java
index 1076100..58d47d7 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java
@@ -102,16 +102,6 @@ implements BeforeEnterObserver {
val resultOrVeto = managedAction.invoke(Can.empty());
val result = resultOrVeto.leftIfAny();
-
-// val objectAction = menuActionModel.getObjectAction();
-// val actionOwner = menuActionModel.getActionHolder().getManagedObject();
-//
-// val result = objectAction
-// .execute(
-// InteractionHead.simple(actionOwner),
-// Can.empty(),
-// InteractionInitiatedBy.USER
-// );
if (result.getSpecification().isParentedOrFreeCollection()) {
pageContent.add(TableView.fromCollection(result));