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 2022/03/21 10:10:43 UTC
[syncope] branch 2_1_X updated (e019562 -> c308598)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from e019562 prepare for next development iteration
new 8f75b96 Upgrading OpenJPA and Swagger UI
new c308598 Workaround for CXF-8680
The 2 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:
.../org/apache/syncope/common/rest/api/beans/AbstractCSVSpec.java | 8 +++++---
.../org/apache/syncope/common/rest/api/beans/CSVPullSpec.java | 8 +++++---
.../java/org/apache/syncope/core/logic/ReconciliationLogic.java | 4 ++--
.../syncope/core/provisioning/java/pushpull/InboundMatcher.java | 2 +-
pom.xml | 4 ++--
5 files changed, 15 insertions(+), 11 deletions(-)
[syncope] 02/02: Workaround for CXF-8680
Posted by il...@apache.org.
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
commit c3085986d56bbf034d12f76f666b4c241eddaafb
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Mar 21 10:59:58 2022 +0100
Workaround for CXF-8680
---
.../org/apache/syncope/common/rest/api/beans/AbstractCSVSpec.java | 8 +++++---
.../org/apache/syncope/common/rest/api/beans/CSVPullSpec.java | 8 +++++---
.../java/org/apache/syncope/core/logic/ReconciliationLogic.java | 4 ++--
.../syncope/core/provisioning/java/pushpull/InboundMatcher.java | 2 +-
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/AbstractCSVSpec.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/AbstractCSVSpec.java
index 098bbfc..5088e70 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/AbstractCSVSpec.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/AbstractCSVSpec.java
@@ -24,6 +24,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.validation.constraints.NotNull;
+import javax.ws.rs.DefaultValue;
import javax.ws.rs.QueryParam;
import org.apache.syncope.common.lib.types.MatchingRule;
import org.apache.syncope.common.lib.types.UnmatchingRule;
@@ -143,7 +144,7 @@ public abstract class AbstractCSVSpec implements Serializable {
protected String nullValue = "";
- protected boolean allowComments;
+ protected Boolean allowComments;
protected UnmatchingRule unmatchingRule = UnmatchingRule.PROVISION;
@@ -236,11 +237,12 @@ public abstract class AbstractCSVSpec implements Serializable {
@Parameter(name = PARAM_ALLOWCOMMENTS, description = "are hash comments, e.g. lines where the first non-whitespace "
+ "character is '#' allowed? if so, they will be skipped without processing", schema =
@Schema(implementation = boolean.class, defaultValue = "false"))
- public boolean isAllowComments() {
- return allowComments;
+ public Boolean getAllowComments() {
+ return allowComments == null ? Boolean.FALSE : allowComments;
}
@QueryParam(PARAM_ALLOWCOMMENTS)
+ @DefaultValue("false")
public void setAllowComments(final boolean allowComments) {
this.allowComments = allowComments;
}
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/CSVPullSpec.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/CSVPullSpec.java
index ac6d309..06d9a49 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/CSVPullSpec.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/CSVPullSpec.java
@@ -23,6 +23,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.validation.constraints.NotNull;
+import javax.ws.rs.DefaultValue;
import javax.ws.rs.QueryParam;
import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.types.ConflictResolutionAction;
@@ -75,7 +76,7 @@ public class CSVPullSpec extends AbstractCSVSpec {
private Set<String> ignoreColumns = new HashSet<>();
- private boolean remediation;
+ private Boolean remediation;
private ConflictResolutionAction conflictResolutionAction = ConflictResolutionAction.IGNORE;
@@ -109,11 +110,12 @@ public class CSVPullSpec extends AbstractCSVSpec {
this.ignoreColumns = ignoreColumns;
}
- public boolean isRemediation() {
- return remediation;
+ public Boolean getRemediation() {
+ return remediation == null ? Boolean.FALSE : remediation;
}
@QueryParam("remediation")
+ @DefaultValue("false")
public void setRemediation(final boolean remediation) {
this.remediation = remediation;
}
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java
index 99a0bbd..c4abead 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java
@@ -510,7 +510,7 @@ public class ReconciliationLogic extends AbstractTransactionalLogic<EntityTO> {
setQuoteChar(spec.getQuoteChar()).
setLineSeparator(spec.getLineSeparator()).
setNullValue(spec.getNullValue()).
- setAllowComments(spec.isAllowComments());
+ setAllowComments(spec.getAllowComments());
if (spec.getEscapeChar() != null) {
schemaBuilder.setEscapeChar(spec.getEscapeChar());
}
@@ -642,7 +642,7 @@ public class ReconciliationLogic extends AbstractTransactionalLogic<EntityTO> {
PullTaskTO pullTask = new PullTaskTO();
pullTask.setDestinationRealm(spec.getDestinationRealm());
- pullTask.setRemediation(spec.isRemediation());
+ pullTask.setRemediation(spec.getRemediation());
pullTask.setMatchingRule(spec.getMatchingRule());
pullTask.setUnmatchingRule(spec.getUnmatchingRule());
pullTask.getActions().addAll(spec.getProvisioningActions());
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
index de1a654..055cf36 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/InboundMatcher.java
@@ -382,7 +382,7 @@ public class InboundMatcher {
}
}
} catch (RuntimeException e) {
- LOG.error("Could not match {} with any existing {}", syncDelta, provision.getAnyType(), e);
+ LOG.error("Could not match {} with any existing {}", syncDelta, provision.getAnyType().getKey(), e);
}
if (result.size() == 1 && result.get(0).getMatchTarget() == MatchType.ANY) {
[syncope] 01/02: Upgrading OpenJPA and Swagger UI
Posted by il...@apache.org.
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
commit 8f75b9642e582d6758ab9176af747ccb55d468a6
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Mar 21 08:11:45 2022 +0100
Upgrading OpenJPA and Swagger UI
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index a9a21ac..1700bba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -412,7 +412,7 @@ under the License.
<spring.version>5.2.19.RELEASE</spring.version>
<spring-security.version>5.2.13.RELEASE</spring-security.version>
- <openjpa.version>3.2.1</openjpa.version>
+ <openjpa.version>3.2.2</openjpa.version>
<hikaricp.version>4.0.3</hikaricp.version>
<bval.version>2.0.5</bval.version>
@@ -459,7 +459,7 @@ under the License.
<log.directory>${project.build.directory}/log</log.directory>
<swagger-core.version>2.0.10</swagger-core.version>
- <swagger-ui.version>4.5.2</swagger-ui.version>
+ <swagger-ui.version>4.6.2</swagger-ui.version>
<guava.version>29.0-jre</guava.version>
<jquery.version>3.4.1</jquery.version>