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 2021/02/08 06:36:49 UTC
[isis] branch master updated (5bd8466 -> bef9edb)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 5bd8466 Merge pull request #368 from apache/ISIS-2444
add 83617d4 ISIS-2502: registers the ExceptionRecognizerForOtherDataAccessProblem
add f274379 ISIS-2502: applib test fix
new bef9edb ISIS-2297: remove unnecessary code (sonar)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../exceprecog/ExceptionRecognizerAbstract.java | 34 +++++++++++++---------
.../exceprecog/ExceptionRecognizerForType.java | 17 +++++------
.../exceprecog/ExceptionRecognizerForTypeTest.java | 6 ++--
.../exceprecog/ExceptionRecognizerGeneralTest.java | 2 +-
.../IsisModuleCoreRuntimeServices.java | 2 ++
.../ExceptionRecognizerForDataAccessException.java | 10 +++----
...ceptionRecognizerForOtherDataAccessProblem.java | 28 +++++++++++++++++-
.../metamodel/facets/entity/JdoEntityFacet.java | 9 ++----
.../IsisRestfulObjectsInteractionFilter.java | 3 +-
.../wicket/ui/panels/FormExecutorDefault.java | 30 ++++++++-----------
10 files changed, 83 insertions(+), 58 deletions(-)
[isis] 01/01: ISIS-2297: remove unnecessary code (sonar)
Posted by ah...@apache.org.
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 bef9edb43b80c75fc17d0fdb950e1fa99da6f3ca
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Feb 8 07:36:34 2021 +0100
ISIS-2297: remove unnecessary code (sonar)
---
.../jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java | 9 +++------
.../viewer/webmodule/IsisRestfulObjectsInteractionFilter.java | 3 +--
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
index 2897b64..b1e0656 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
@@ -248,8 +248,7 @@ implements EntityFacet {
getTransactionalProcessor()
.runWithinCurrentTransactionElseCreateNew(()->pm.makePersistent(pojo))
- .optionalElseFail()
- .orElse(null);
+ .optionalElseFail();
//TODO integrate with entity change tracking
}
@@ -271,8 +270,7 @@ implements EntityFacet {
getTransactionalProcessor()
.runWithinCurrentTransactionElseCreateNew(()->pm.deletePersistent(pojo))
- .optionalElseFail()
- .orElse(null);
+ .optionalElseFail();
//TODO integrate with entity change tracking
}
@@ -292,8 +290,7 @@ implements EntityFacet {
getTransactionalProcessor()
.runWithinCurrentTransactionElseCreateNew(()->pm.refresh(pojo))
- .optionalElseFail()
- .orElse(null);
+ .optionalElseFail();
//TODO integrate with entity change tracking
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsInteractionFilter.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsInteractionFilter.java
index 1907ddc..bbb8372 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsInteractionFilter.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsInteractionFilter.java
@@ -385,8 +385,7 @@ public class IsisRestfulObjectsInteractionFilter implements Filter {
transactionService.runWithinCurrentTransactionElseCreateNew(()->
chain.doFilter(request, response))
.mapFailure(e->new TransactionalException("", e))
- .optionalElseFail()
- .orElse(null);
+ .optionalElseFail();
});