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/07/14 07:07:52 UTC
[2/2] syncope git commit: [SYNCOPE-1163] Handling propagationPriority
as nullable field
[SYNCOPE-1163] Handling propagationPriority as nullable field
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/020a35c6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/020a35c6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/020a35c6
Branch: refs/heads/master
Commit: 020a35c64aecb0afcda336bae815c4d3605aed22
Parents: d0284e0
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jul 14 09:07:32 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jul 14 09:07:43 2017 +0200
----------------------------------------------------------------------
.../jpa/entity/resource/JPAExternalResource.java | 9 +++------
.../java/org/apache/syncope/fit/core/ResourceITCase.java | 5 +++++
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/020a35c6/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java
index 03e21a9..30462ce 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java
@@ -171,9 +171,8 @@ public class JPAExternalResource extends AbstractProvidedKeyEntity implements Ex
super();
enforceMandatoryCondition = getBooleanAsInteger(false);
- propagationPriority = 0;
- randomPwdIfNotProvided = 0;
- overrideCapabilities = 0;
+ randomPwdIfNotProvided = getBooleanAsInteger(false);
+ overrideCapabilities = getBooleanAsInteger(false);
createTraceLevel = TraceLevel.FAILURES;
updateTraceLevel = TraceLevel.FAILURES;
@@ -253,9 +252,7 @@ public class JPAExternalResource extends AbstractProvidedKeyEntity implements Ex
@Override
public void setPropagationPriority(final Integer propagationPriority) {
- if (propagationPriority != null) {
- this.propagationPriority = propagationPriority;
- }
+ this.propagationPriority = propagationPriority;
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/020a35c6/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ResourceITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ResourceITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ResourceITCase.java
index 95109f4..e91b393 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ResourceITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ResourceITCase.java
@@ -175,6 +175,7 @@ public class ResourceITCase extends AbstractITCase {
// check the existence
actual = resourceService.read(resourceKey);
assertNotNull(actual);
+ assertNull(actual.getPropagationPriority());
}
@Test
@@ -455,6 +456,7 @@ public class ResourceITCase extends AbstractITCase {
String resourceKey = "ws-orgunit";
ResourceTO resourceTO = buildResourceTO(resourceKey);
assertNull(resourceTO.getOrgUnit());
+ assertNull(resourceTO.getPropagationPriority());
Response response = resourceService.create(resourceTO);
resourceTO = getObject(response.getLocation(), ResourceService.class, ResourceTO.class);
@@ -468,15 +470,18 @@ public class ResourceITCase extends AbstractITCase {
resourceTO.setOrgUnit(orgUnit);
resourceService.update(resourceTO);
+ assertNull(resourceTO.getPropagationPriority());
resourceTO = resourceService.read(resourceKey);
assertNotNull(resourceTO.getOrgUnit());
resourceTO.setOrgUnit(null);
+ resourceTO.setPropagationPriority(11);
resourceService.update(resourceTO);
resourceTO = resourceService.read(resourceKey);
assertNull(resourceTO.getOrgUnit());
+ assertEquals(Integer.valueOf(11), resourceTO.getPropagationPriority());
}
@Test