You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/02/17 07:08:43 UTC
[syncope] branch 2_1_X updated: Upgrading maven-checkstyle-plugin
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 0be73eb Upgrading maven-checkstyle-plugin
0be73eb is described below
commit 0be73ebca959d7948a05db86979734578117730f
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Feb 17 07:58:18 2020 +0100
Upgrading maven-checkstyle-plugin
---
.../apache/syncope/core/persistence/jpa/dao/JPARealmDAO.java | 10 +++++-----
pom.xml | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARealmDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARealmDAO.java
index 34e1fe4..97f0679 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARealmDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPARealmDAO.java
@@ -224,13 +224,13 @@ public class JPARealmDAO extends AbstractDAO<Realm> implements RealmDAO {
@Override
public void delete(final Realm realm) {
- findDescendants(realm).stream().map(toBeDeleted -> {
+ findDescendants(realm).forEach(toBeDeleted -> {
roleDAO.findByRealm(toBeDeleted).forEach(role -> role.getRealms().remove(toBeDeleted));
- return toBeDeleted;
- }).map(toBeDeleted -> {
+
toBeDeleted.setParent(null);
- return toBeDeleted;
- }).forEachOrdered(toBeDeleted -> entityManager().remove(toBeDeleted));
+
+ entityManager().remove(toBeDeleted);
+ });
}
@Override
diff --git a/pom.xml b/pom.xml
index 93f3bff..634242e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2086,7 +2086,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>