You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by an...@apache.org on 2022/03/22 08:10:20 UTC
[syncope] branch master updated: Fix for classpath scan (#329)
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 8d9a862 Fix for classpath scan (#329)
8d9a862 is described below
commit 8d9a8624cb5c62d37eb11572d1bc167c6af6c6b2
Author: Andrea Patricelli <an...@apache.org>
AuthorDate: Tue Mar 22 09:10:15 2022 +0100
Fix for classpath scan (#329)
* fixes search for implementation classes in console
* moved to CorrelationRule class from CorrelationRuleConf in IdMImplementationType
---
.../console/init/IdMClassPathScanImplementationContributor.java | 9 +++++----
.../apache/syncope/common/lib/types/IdMImplementationType.java | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/init/IdMClassPathScanImplementationContributor.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/init/IdMClassPathScanImplementationContributor.java
index f141331..45c9209 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/init/IdMClassPathScanImplementationContributor.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/init/IdMClassPathScanImplementationContributor.java
@@ -34,10 +34,11 @@ public class IdMClassPathScanImplementationContributor implements ClassPathScanI
@Override
public Optional<String> getLabel(final Class<?> clazz) {
- if (PullCorrelationRuleConf.class.isAssignableFrom(clazz)
- || PushCorrelationRuleConf.class.isAssignableFrom(clazz)) {
-
- return Optional.of(clazz.getName());
+ if (PullCorrelationRuleConf.class.isAssignableFrom(clazz)) {
+ return Optional.of(PullCorrelationRuleConf.class.getName());
+ }
+ if (PushCorrelationRuleConf.class.isAssignableFrom(clazz)) {
+ return Optional.of(PushCorrelationRuleConf.class.getName());
}
return Optional.empty();
}
diff --git a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/types/IdMImplementationType.java b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/types/IdMImplementationType.java
index 37765b2..c39ee36 100644
--- a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/types/IdMImplementationType.java
+++ b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/types/IdMImplementationType.java
@@ -42,8 +42,8 @@ public final class IdMImplementationType {
Pair.of(PROPAGATION_ACTIONS, "org.apache.syncope.core.provisioning.api.propagation.PropagationActions"),
Pair.of(PULL_ACTIONS, "org.apache.syncope.core.provisioning.api.pushpull.PullActions"),
Pair.of(PUSH_ACTIONS, "org.apache.syncope.core.provisioning.api.pushpull.PushActions"),
- Pair.of(PULL_CORRELATION_RULE, "org.apache.syncope.common.lib.policy.PullCorrelationRuleConf"),
- Pair.of(PUSH_CORRELATION_RULE, "org.apache.syncope.common.lib.policy.PushCorrelationRuleConf"),
+ Pair.of(PULL_CORRELATION_RULE, "org.apache.syncope.core.persistence.api.dao.PullCorrelationRule"),
+ Pair.of(PUSH_CORRELATION_RULE, "org.apache.syncope.core.persistence.api.dao.PushCorrelationRule"),
Pair.of(PROVISION_SORTER, "org.apache.syncope.core.provisioning.api.ProvisionSorter"));
public static Map<String, String> values() {