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 2017/09/15 10:36:24 UTC
[1/5] syncope git commit: Ensuring to select membership resources for
DELETE only when the given membership is requested for removal
Repository: syncope
Updated Branches:
refs/heads/2_0_X 3fe352238 -> 86fc76eb9
refs/heads/master 88b30869d -> c4ba54c96
Ensuring to select membership resources for DELETE only when the given membership is requested for removal
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7bb15ac4
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7bb15ac4
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7bb15ac4
Branch: refs/heads/2_0_X
Commit: 7bb15ac435d5bf0ec78fbc96d23eb99ab471ce3b
Parents: 3fe3522
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Sep 15 12:02:02 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 15 12:02:02 2017 +0200
----------------------------------------------------------------------
.../core/provisioning/java/data/AnyObjectDataBinderImpl.java | 4 +++-
.../syncope/core/provisioning/java/data/UserDataBinderImpl.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/7bb15ac4/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
index c2983e4..d77d578 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
@@ -355,7 +355,9 @@ public class AnyObjectDataBinderImpl extends AbstractAnyDataBinder implements An
attr.setOwner(null);
}
- toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.getRightEnd().getKey()));
+ if (membPatch.getOperation() == PatchOperation.DELETE) {
+ toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.getRightEnd().getKey()));
+ }
}
if (membPatch.getOperation() == PatchOperation.ADD_REPLACE) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/7bb15ac4/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
index ff53e1b..3213da0 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
@@ -441,7 +441,9 @@ public class UserDataBinderImpl extends AbstractAnyDataBinder implements UserDat
attr.setMembership(null);
}
- toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.getRightEnd().getKey()));
+ if (membPatch.getOperation() == PatchOperation.DELETE) {
+ toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.getRightEnd().getKey()));
+ }
}
if (membPatch.getOperation() == PatchOperation.ADD_REPLACE) {
[3/5] syncope git commit: Moving the default toString() style to
ToStringStyle.JSON_STYLE
Posted by il...@apache.org.
Moving the default toString() style to ToStringStyle.JSON_STYLE
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/86fc76eb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/86fc76eb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/86fc76eb
Branch: refs/heads/2_0_X
Commit: 86fc76eb9a390608954abc6e35953b3d2b978bfa
Parents: 7bb15ac
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Sep 15 12:31:13 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 15 12:31:13 2017 +0200
----------------------------------------------------------------------
.../console/commons/status/StatusBean.java | 2 +-
.../console/panels/search/SearchClause.java | 2 +-
.../syncope/common/lib/AbstractBaseBean.java | 2 +-
.../apache/syncope/common/lib/to/UserTO.java | 16 ++--------------
.../rest/api/beans/ConnObjectTOListQuery.java | 2 +-
.../api/dao/search/AbstractSearchCond.java | 2 +-
.../api/dao/search/OrderByClause.java | 2 +-
.../jpa/entity/AbstractPlainAttrValue.java | 20 ++++++++++----------
.../core/provisioning/api/IntAttrName.java | 2 +-
.../core/provisioning/api/WorkflowResult.java | 2 +-
.../provisioning/api/cache/VirAttrCacheKey.java | 2 +-
.../java/job/report/AuditReportlet.java | 6 +++---
.../security/SyncopeAuthenticationDetails.java | 2 +-
.../security/SyncopeGrantedAuthority.java | 2 +-
14 files changed, 26 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java
index c8bba79..fe7ce9f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java
@@ -96,7 +96,7 @@ public class StatusBean implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClause.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClause.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClause.java
index 9007485..415abba 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClause.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClause.java
@@ -126,6 +126,6 @@ public final class SearchClause implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java b/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
index bd8b06e..0187d70 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
@@ -49,6 +49,6 @@ public abstract class AbstractBaseBean implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java
index 6deab32..8acca6f 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java
@@ -20,7 +20,6 @@ package org.apache.syncope.common.lib.to;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -30,8 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.ToStringExclude;
import org.apache.syncope.common.lib.types.AnyTypeKind;
@XmlRootElement(name = "user")
@@ -40,6 +38,7 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
private static final long serialVersionUID = 7791304495192615740L;
+ @ToStringExclude
private String password;
private final List<String> roles = new ArrayList<>();
@@ -242,15 +241,4 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
public List<MembershipTO> getDynMemberships() {
return dynMemberships;
}
-
- @Override
- public String toString() {
- return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) {
-
- @Override
- protected boolean accept(final Field f) {
- return super.accept(f) && !f.getName().equals("password");
- }
- }.toString();
- }
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ConnObjectTOListQuery.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ConnObjectTOListQuery.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ConnObjectTOListQuery.java
index 7ab27b0..8d354f5 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ConnObjectTOListQuery.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ConnObjectTOListQuery.java
@@ -112,6 +112,6 @@ public class ConnObjectTOListQuery implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AbstractSearchCond.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AbstractSearchCond.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AbstractSearchCond.java
index 2087bc7..d84083c 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AbstractSearchCond.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AbstractSearchCond.java
@@ -40,7 +40,7 @@ public abstract class AbstractSearchCond implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
public abstract boolean isValid();
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
index 8d4b978..5fa9e79 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
@@ -67,6 +67,6 @@ public class OrderByClause implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java
index bac48c6..5a6df87 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java
@@ -223,8 +223,8 @@ public abstract class AbstractPlainAttrValue extends AbstractGeneratedKeyEntity
public String getValueAsString() {
final AttrSchemaType type = getAttr() == null || getAttr().getSchema() == null
|| getAttr().getSchema().getType() == null
- ? AttrSchemaType.String
- : getAttr().getSchema().getType();
+ ? AttrSchemaType.String
+ : getAttr().getSchema().getType();
return getValueAsString(type);
}
@@ -241,23 +241,23 @@ public abstract class AbstractPlainAttrValue extends AbstractGeneratedKeyEntity
case Long:
result = getAttr() == null || getAttr().getSchema() == null
|| getAttr().getSchema().getConversionPattern() == null
- ? getLongValue().toString()
- : FormatUtils.format(getLongValue(), getAttr().getSchema().getConversionPattern());
+ ? getLongValue().toString()
+ : FormatUtils.format(getLongValue(), getAttr().getSchema().getConversionPattern());
break;
case Double:
result = getAttr() == null || getAttr().getSchema() == null
|| getAttr().getSchema().getConversionPattern() == null
- ? getDoubleValue().toString()
- : FormatUtils.format(getDoubleValue(), getAttr().getSchema().getConversionPattern());
+ ? getDoubleValue().toString()
+ : FormatUtils.format(getDoubleValue(), getAttr().getSchema().getConversionPattern());
break;
case Date:
result = getAttr() == null || getAttr().getSchema() == null
|| getAttr().getSchema().getConversionPattern() == null
- ? FormatUtils.format(getDateValue())
- : FormatUtils.format(
- getDateValue(), false, getAttr().getSchema().getConversionPattern());
+ ? FormatUtils.format(getDateValue())
+ : FormatUtils.format(
+ getDateValue(), false, getAttr().getSchema().getConversionPattern());
break;
case Binary:
@@ -277,6 +277,6 @@ public abstract class AbstractPlainAttrValue extends AbstractGeneratedKeyEntity
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/IntAttrName.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/IntAttrName.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/IntAttrName.java
index 1dfa654..f46384e 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/IntAttrName.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/IntAttrName.java
@@ -97,7 +97,7 @@ public class IntAttrName {
@Override
public String toString() {
- return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java
index c1902eb..472a108 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java
@@ -77,6 +77,6 @@ public class WorkflowResult<T> {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/cache/VirAttrCacheKey.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/cache/VirAttrCacheKey.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/cache/VirAttrCacheKey.java
index 10e76a5..41d5224 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/cache/VirAttrCacheKey.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/cache/VirAttrCacheKey.java
@@ -73,6 +73,6 @@ public class VirAttrCacheKey {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE, true);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE, true);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java
index 96039f0..d6f0ec5 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java
@@ -86,7 +86,7 @@ public class AuditReportlet extends AbstractReportlet {
if (auditEntry.getBefore() != null) {
char[] before = ToStringBuilder.reflectionToString(
- auditEntry.getBefore(), ToStringStyle.MULTI_LINE_STYLE).toCharArray();
+ auditEntry.getBefore(), ToStringStyle.JSON_STYLE).toCharArray();
handler.startElement("", "", "before", null);
handler.characters(before, 0, before.length);
handler.endElement("", "", "before");
@@ -96,7 +96,7 @@ public class AuditReportlet extends AbstractReportlet {
handler.startElement("", "", "inputs", null);
for (Object inputObj : auditEntry.getInput()) {
char[] input = ToStringBuilder.reflectionToString(
- inputObj, ToStringStyle.MULTI_LINE_STYLE).toCharArray();
+ inputObj, ToStringStyle.JSON_STYLE).toCharArray();
handler.startElement("", "", "input", null);
handler.characters(input, 0, input.length);
handler.endElement("", "", "input");
@@ -106,7 +106,7 @@ public class AuditReportlet extends AbstractReportlet {
if (auditEntry.getOutput() != null) {
char[] output = ToStringBuilder.reflectionToString(
- auditEntry.getOutput(), ToStringStyle.MULTI_LINE_STYLE).toCharArray();
+ auditEntry.getOutput(), ToStringStyle.JSON_STYLE).toCharArray();
handler.startElement("", "", "output", null);
handler.characters(output, 0, output.length);
handler.endElement("", "", "output");
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeAuthenticationDetails.java
----------------------------------------------------------------------
diff --git a/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeAuthenticationDetails.java b/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeAuthenticationDetails.java
index e5a6726..cfd1eec 100644
--- a/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeAuthenticationDetails.java
+++ b/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeAuthenticationDetails.java
@@ -60,7 +60,7 @@ public class SyncopeAuthenticationDetails implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86fc76eb/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeGrantedAuthority.java
----------------------------------------------------------------------
diff --git a/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeGrantedAuthority.java b/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeGrantedAuthority.java
index 578dd35..79667f1 100644
--- a/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeGrantedAuthority.java
+++ b/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeGrantedAuthority.java
@@ -90,7 +90,7 @@ public class SyncopeGrantedAuthority implements GrantedAuthority {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
[2/5] syncope git commit: Ensuring to select membership resources for
DELETE only when the given membership is requested for removal
Posted by il...@apache.org.
Ensuring to select membership resources for DELETE only when the given membership is requested for removal
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/fcb0d833
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/fcb0d833
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/fcb0d833
Branch: refs/heads/master
Commit: fcb0d833e78b5f733787a9d30c5415817ba4afcc
Parents: 88b3086
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Sep 15 12:03:19 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 15 12:03:19 2017 +0200
----------------------------------------------------------------------
.../core/provisioning/java/data/AnyObjectDataBinderImpl.java | 4 +++-
.../syncope/core/provisioning/java/data/UserDataBinderImpl.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/fcb0d833/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
index eafba37..1bdfa36 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
@@ -333,7 +333,9 @@ public class AnyObjectDataBinderImpl extends AbstractAnyDataBinder implements An
attr.setOwner(null);
});
- toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.get().getRightEnd().getKey()));
+ if (membPatch.getOperation() == PatchOperation.DELETE) {
+ toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.get().getRightEnd().getKey()));
+ }
}
if (membPatch.getOperation() == PatchOperation.ADD_REPLACE) {
Group group = groupDAO.find(membPatch.getGroup());
http://git-wip-us.apache.org/repos/asf/syncope/blob/fcb0d833/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
index ce3a127..6badbef 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
@@ -426,7 +426,9 @@ public class UserDataBinderImpl extends AbstractAnyDataBinder implements UserDat
attr.setMembership(null);
});
- toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.get().getRightEnd().getKey()));
+ if (membPatch.getOperation() == PatchOperation.DELETE) {
+ toBeDeprovisioned.addAll(groupDAO.findAllResourceKeys(membership.get().getRightEnd().getKey()));
+ }
}
if (membPatch.getOperation() == PatchOperation.ADD_REPLACE) {
Group group = groupDAO.find(membPatch.getGroup());
[4/5] syncope git commit: Moving the default toString() style to
ToStringStyle.JSON_STYLE
Posted by il...@apache.org.
Moving the default toString() style to ToStringStyle.JSON_STYLE
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ad6c103c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ad6c103c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ad6c103c
Branch: refs/heads/master
Commit: ad6c103c95cc58a62fee3b68b18059b59589ebc5
Parents: fcb0d83
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Sep 15 12:31:13 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 15 12:33:41 2017 +0200
----------------------------------------------------------------------
.../client/console/commons/status/StatusBean.java | 2 +-
.../client/console/panels/search/SearchClause.java | 2 +-
.../apache/syncope/common/lib/AbstractBaseBean.java | 2 +-
.../org/apache/syncope/common/lib/to/UserTO.java | 16 ++--------------
.../rest/api/beans/ConnObjectTOListQuery.java | 2 +-
.../api/dao/search/AbstractSearchCond.java | 2 +-
.../persistence/api/dao/search/OrderByClause.java | 2 +-
.../jpa/entity/AbstractPlainAttrValue.java | 2 +-
.../syncope/core/provisioning/api/IntAttrName.java | 2 +-
.../core/provisioning/api/WorkflowResult.java | 2 +-
.../provisioning/api/cache/VirAttrCacheKey.java | 2 +-
.../java/job/report/AuditReportlet.java | 6 +++---
.../security/SyncopeAuthenticationDetails.java | 2 +-
.../spring/security/SyncopeGrantedAuthority.java | 2 +-
14 files changed, 17 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java
index c8bba79..fe7ce9f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java
@@ -96,7 +96,7 @@ public class StatusBean implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClause.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClause.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClause.java
index 9007485..415abba 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClause.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClause.java
@@ -126,6 +126,6 @@ public final class SearchClause implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java b/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
index bd8b06e..0187d70 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/AbstractBaseBean.java
@@ -49,6 +49,6 @@ public abstract class AbstractBaseBean implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java
index 3e9cd4d..877b866 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/UserTO.java
@@ -20,7 +20,6 @@ package org.apache.syncope.common.lib.to;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -29,8 +28,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.ToStringExclude;
import org.apache.syncope.common.lib.types.AnyTypeKind;
@XmlRootElement(name = "user")
@@ -39,6 +37,7 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
private static final long serialVersionUID = 7791304495192615740L;
+ @ToStringExclude
private String password;
private final List<String> roles = new ArrayList<>();
@@ -231,15 +230,4 @@ public class UserTO extends AnyTO implements GroupableRelatableTO {
public List<MembershipTO> getDynMemberships() {
return dynMemberships;
}
-
- @Override
- public String toString() {
- return new ReflectionToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) {
-
- @Override
- protected boolean accept(final Field f) {
- return super.accept(f) && !f.getName().equals("password");
- }
- }.toString();
- }
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ConnObjectTOListQuery.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ConnObjectTOListQuery.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ConnObjectTOListQuery.java
index 16d0e66..951c29d 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ConnObjectTOListQuery.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/ConnObjectTOListQuery.java
@@ -112,6 +112,6 @@ public class ConnObjectTOListQuery implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AbstractSearchCond.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AbstractSearchCond.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AbstractSearchCond.java
index 2087bc7..d84083c 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AbstractSearchCond.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AbstractSearchCond.java
@@ -40,7 +40,7 @@ public abstract class AbstractSearchCond implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
public abstract boolean isValid();
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
index 8d4b978..5fa9e79 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
@@ -67,6 +67,6 @@ public class OrderByClause implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java
index b471690..bd19107 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java
@@ -277,6 +277,6 @@ public abstract class AbstractPlainAttrValue extends AbstractGeneratedKeyEntity
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/IntAttrName.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/IntAttrName.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/IntAttrName.java
index 1dfa654..f46384e 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/IntAttrName.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/IntAttrName.java
@@ -97,7 +97,7 @@ public class IntAttrName {
@Override
public String toString() {
- return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java
index c1902eb..472a108 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/WorkflowResult.java
@@ -77,6 +77,6 @@ public class WorkflowResult<T> {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/cache/VirAttrCacheKey.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/cache/VirAttrCacheKey.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/cache/VirAttrCacheKey.java
index 10e76a5..41d5224 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/cache/VirAttrCacheKey.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/cache/VirAttrCacheKey.java
@@ -73,6 +73,6 @@ public class VirAttrCacheKey {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE, true);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE, true);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java
index 96039f0..d6f0ec5 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java
@@ -86,7 +86,7 @@ public class AuditReportlet extends AbstractReportlet {
if (auditEntry.getBefore() != null) {
char[] before = ToStringBuilder.reflectionToString(
- auditEntry.getBefore(), ToStringStyle.MULTI_LINE_STYLE).toCharArray();
+ auditEntry.getBefore(), ToStringStyle.JSON_STYLE).toCharArray();
handler.startElement("", "", "before", null);
handler.characters(before, 0, before.length);
handler.endElement("", "", "before");
@@ -96,7 +96,7 @@ public class AuditReportlet extends AbstractReportlet {
handler.startElement("", "", "inputs", null);
for (Object inputObj : auditEntry.getInput()) {
char[] input = ToStringBuilder.reflectionToString(
- inputObj, ToStringStyle.MULTI_LINE_STYLE).toCharArray();
+ inputObj, ToStringStyle.JSON_STYLE).toCharArray();
handler.startElement("", "", "input", null);
handler.characters(input, 0, input.length);
handler.endElement("", "", "input");
@@ -106,7 +106,7 @@ public class AuditReportlet extends AbstractReportlet {
if (auditEntry.getOutput() != null) {
char[] output = ToStringBuilder.reflectionToString(
- auditEntry.getOutput(), ToStringStyle.MULTI_LINE_STYLE).toCharArray();
+ auditEntry.getOutput(), ToStringStyle.JSON_STYLE).toCharArray();
handler.startElement("", "", "output", null);
handler.characters(output, 0, output.length);
handler.endElement("", "", "output");
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeAuthenticationDetails.java
----------------------------------------------------------------------
diff --git a/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeAuthenticationDetails.java b/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeAuthenticationDetails.java
index e5a6726..cfd1eec 100644
--- a/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeAuthenticationDetails.java
+++ b/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeAuthenticationDetails.java
@@ -60,7 +60,7 @@ public class SyncopeAuthenticationDetails implements Serializable {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ad6c103c/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeGrantedAuthority.java
----------------------------------------------------------------------
diff --git a/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeGrantedAuthority.java b/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeGrantedAuthority.java
index bca6990..c9ba8d3 100644
--- a/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeGrantedAuthority.java
+++ b/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeGrantedAuthority.java
@@ -81,7 +81,7 @@ public class SyncopeGrantedAuthority implements GrantedAuthority {
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.JSON_STYLE);
}
}
[5/5] syncope git commit: Fix javadocs
Posted by il...@apache.org.
Fix javadocs
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c4ba54c9
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c4ba54c9
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c4ba54c9
Branch: refs/heads/master
Commit: c4ba54c9658f1a552ca567a873a4da0d4f62bdb7
Parents: ad6c103
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Sep 15 12:36:12 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 15 12:36:12 2017 +0200
----------------------------------------------------------------------
pom.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/c4ba54c9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 87d98de..2fa3f73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1985,7 +1985,7 @@ under the License.
project.properties['site.deploymentBaseUrl'] == null || !project.properties['site.deploymentBaseUrl'].startsWith('file:') ? project.properties['project.build.directory'] + "/generated-docs" : project.properties['site.deploymentBaseUrl'].substring(7)
if (!project.properties.containsKey('buildNumber'))
- project.properties['buildNumber'] = ""
+ project.properties['buildNumber'] = ""
</source>
</configuration>
</execution>
@@ -2159,7 +2159,7 @@ under the License.
<link>http://docs.oracle.com/javaee/7/api/</link>
<link>http://www.slf4j.org/api/</link>
<link>http://connid.tirasa.net/apidocs/1.4/</link>
- <link>http://cxf.apache.org/javadoc/latest-3.1.x/</link>
+ <link>http://cxf.apache.org/javadoc/latest-3.2.x/</link>
<link>http://fasterxml.github.io/jackson-core/javadoc/2.8/</link>
<link>http://fasterxml.github.io/jackson-databind/javadoc/2.8/</link>
<link>http://fasterxml.github.io/jackson-annotations/javadoc/2.8/</link>
@@ -2175,7 +2175,6 @@ under the License.
<link>http://docs.spring.io/spring/docs/4.3.x/javadoc-api/</link>
<link>http://docs.spring.io/spring-security/site/docs/4.2.x/apidocs/</link>
<link>http://www.flowable.org/docs/javadocs/</link>
- <link>http://www.flowable.org/docs/javadocs/</link>
<link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-saml-api/3.3.0/opensaml-saml-api-3.3.0-javadoc.jar/!/index.html</link>
<link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-core/3.3.0/opensaml-core-3.3.0-javadoc.jar/!/index.html</link>
<link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/5.5.1</link>