You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2015/08/27 13:12:32 UTC
[05/33] syncope git commit: Some small cleanings
Some small cleanings
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/56568a43
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/56568a43
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/56568a43
Branch: refs/heads/SYNCOPE-156
Commit: 56568a43c8cd56393bd3a1d58d3e307595c80de4
Parents: a4400ff
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Aug 18 16:54:31 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Aug 18 16:54:31 2015 +0200
----------------------------------------------------------------------
.../common/lib/types/AbstractPolicySpec.java | 2 +-
.../common/lib/types/EntityViolationType.java | 3 ---
.../syncope/common/lib/types/PolicySpec.java | 25 --------------------
.../common/lib/types/PushPolicySpec.java | 2 +-
.../common/lib/types/SyncPolicySpec.java | 2 +-
.../core/logic/report/ReportJobDelegate.java | 2 +-
.../core/misc/policy/PolicyEvaluator.java | 4 ++--
.../core/persistence/api/entity/Report.java | 15 ++++++------
.../persistence/jpa/dao/JPAReportExecDAO.java | 2 +-
.../core/persistence/jpa/entity/JPAReport.java | 8 +++----
.../core/persistence/jpa/inner/ReportTest.java | 4 ++--
.../core/persistence/jpa/outer/ReportTest.java | 2 +-
.../java/data/ReportDataBinderImpl.java | 4 ++--
13 files changed, 24 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/common/lib/src/main/java/org/apache/syncope/common/lib/types/AbstractPolicySpec.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/AbstractPolicySpec.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AbstractPolicySpec.java
index 33a0c62..e951419 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/AbstractPolicySpec.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AbstractPolicySpec.java
@@ -30,7 +30,7 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@XmlType
-public abstract class AbstractPolicySpec implements PolicySpec {
+public abstract class AbstractPolicySpec {
private static final long serialVersionUID = -6210646284287392063L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java
index 6e05a52..a97f510 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlEnum;
public enum EntityViolationType {
Standard(""),
- InvalidAccountPolicy("org.apache.syncope.core.persistence.validation.accountpolicy"),
InvalidAnyType("org.apache.syncope.core.persistence.validation.anytype"),
InvalidConnInstanceLocation("org.apache.syncope.core.persistence.validation.conninstance.location"),
InvalidConnPoolConf("org.apache.syncope.core.persistence.validation.conninstance.poolConf"),
@@ -32,7 +31,6 @@ public enum EntityViolationType {
InvalidName("org.apache.syncope.core.persistence.validation.name"),
InvalidNotification("org.apache.syncope.core.persistence.validation.notification"),
InvalidPassword("org.apache.syncope.core.persistence.validation.user.password"),
- InvalidPasswordPolicy("org.apache.syncope.core.persistence.validation.passwordpolicy"),
InvalidPolicy("org.apache.syncope.core.persistence.validation.policy"),
InvalidPropagationTask("org.apache.syncope.core.persistence.validation.propagationtask"),
InvalidRealm("org.apache.syncope.core.persistence.validation.realm"),
@@ -44,7 +42,6 @@ public enum EntityViolationType {
InvalidSchemaMultivalueUnique("org.apache.syncope.core.persistence.validation.schema.multivalueUnique"),
InvalidSchedTask("org.apache.syncope.core.persistence.validation.schedtask"),
InvalidSyncTask("org.apache.syncope.core.persistence.validation.synctask"),
- InvalidSyncPolicy("org.apache.syncope.core.persistence.validation.syncpolicy"),
InvalidPlainSchema("org.apache.syncope.core.persistence.validation.attrvalue.plainSchema"),
InvalidDerSchema("org.apache.syncope.core.persistence.validation.attrvalue.derSchema"),
InvalidVirSchema("org.apache.syncope.core.persistence.validation.attrvalue.virSchema"),
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/common/lib/src/main/java/org/apache/syncope/common/lib/types/PolicySpec.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PolicySpec.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PolicySpec.java
deleted file mode 100644
index 7de0e48..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PolicySpec.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.lib.types;
-
-import java.io.Serializable;
-
-public interface PolicySpec extends Serializable {
-
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/common/lib/src/main/java/org/apache/syncope/common/lib/types/PushPolicySpec.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PushPolicySpec.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PushPolicySpec.java
index d7a5640..0bbea85 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PushPolicySpec.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PushPolicySpec.java
@@ -21,7 +21,7 @@ package org.apache.syncope.common.lib.types;
import javax.xml.bind.annotation.XmlType;
@XmlType
-public class PushPolicySpec implements PolicySpec {
+public class PushPolicySpec {
private static final long serialVersionUID = 3641030189482617497L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/common/lib/src/main/java/org/apache/syncope/common/lib/types/SyncPolicySpec.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/SyncPolicySpec.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/SyncPolicySpec.java
index 5a3d309..7bdaea0 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/SyncPolicySpec.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/SyncPolicySpec.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.syncope.common.lib.jaxb.XmlGenericMapAdapter;
@XmlType
-public class SyncPolicySpec implements PolicySpec {
+public class SyncPolicySpec {
private static final long serialVersionUID = -3144027171719498127L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/core/logic/src/main/java/org/apache/syncope/core/logic/report/ReportJobDelegate.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/report/ReportJobDelegate.java b/core/logic/src/main/java/org/apache/syncope/core/logic/report/ReportJobDelegate.java
index 9920c1f..f7a8def 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/report/ReportJobDelegate.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/report/ReportJobDelegate.java
@@ -87,7 +87,7 @@ public class ReportJobDelegate {
execution.setReport(report);
execution = reportExecDAO.save(execution);
- report.addExec(execution);
+ report.add(execution);
report = reportDAO.save(report);
// 2. define a SAX handler for generating result as XML
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/core/misc/src/main/java/org/apache/syncope/core/misc/policy/PolicyEvaluator.java
----------------------------------------------------------------------
diff --git a/core/misc/src/main/java/org/apache/syncope/core/misc/policy/PolicyEvaluator.java b/core/misc/src/main/java/org/apache/syncope/core/misc/policy/PolicyEvaluator.java
index f7d946c..48cc981 100644
--- a/core/misc/src/main/java/org/apache/syncope/core/misc/policy/PolicyEvaluator.java
+++ b/core/misc/src/main/java/org/apache/syncope/core/misc/policy/PolicyEvaluator.java
@@ -19,9 +19,9 @@
package org.apache.syncope.core.misc.policy;
import java.util.List;
+import org.apache.syncope.common.lib.types.AbstractPolicySpec;
import org.apache.syncope.common.lib.types.AccountPolicySpec;
import org.apache.syncope.common.lib.types.PasswordPolicySpec;
-import org.apache.syncope.common.lib.types.PolicySpec;
import org.apache.syncope.core.persistence.api.entity.AccountPolicy;
import org.apache.syncope.core.persistence.api.entity.Any;
import org.apache.syncope.core.persistence.api.entity.PasswordPolicy;
@@ -39,7 +39,7 @@ public class PolicyEvaluator {
private static final Logger LOG = LoggerFactory.getLogger(PolicyEvaluator.class);
@SuppressWarnings("unchecked")
- public <T extends PolicySpec> T evaluate(final Policy policy, final Any<?, ?, ?> any) {
+ public <T extends AbstractPolicySpec> T evaluate(final Policy policy, final Any<?, ?, ?> any) {
T result;
switch (policy.getType()) {
case PASSWORD:
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Report.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Report.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Report.java
index a2605e7..618e612 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Report.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/Report.java
@@ -25,21 +25,22 @@ public interface Report extends Entity<Long> {
String getName();
- boolean addExec(ReportExec exec);
+ void setName(String name);
- boolean addReportletConf(ReportletConf reportletConf);
+ boolean add(ReportExec exec);
- String getCronExpression();
+ boolean remove(ReportExec exec);
List<? extends ReportExec> getExecs();
- List<? extends ReportletConf> getReportletConfs();
+ boolean add(ReportletConf reportletConf);
- boolean removeExec(ReportExec exec);
+ boolean remove(ReportletConf reportletConf);
- boolean removeReportletConf(ReportletConf reportletConf);
+ List<? extends ReportletConf> getReportletConfs();
+
+ String getCronExpression();
void setCronExpression(String cronExpression);
- void setName(String name);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAReportExecDAO.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAReportExecDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAReportExecDAO.java
index cf9e781..35b7556 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAReportExecDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAReportExecDAO.java
@@ -91,7 +91,7 @@ public class JPAReportExecDAO extends AbstractDAO<ReportExec, Long> implements R
@Override
public void delete(final ReportExec execution) {
if (execution.getReport() != null) {
- execution.getReport().removeExec(execution);
+ execution.getReport().remove(execution);
}
entityManager().remove(execution);
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAReport.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAReport.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAReport.java
index 544868f..15c33ea 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAReport.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAReport.java
@@ -82,13 +82,13 @@ public class JPAReport extends AbstractEntity<Long> implements Report {
}
@Override
- public boolean addExec(final ReportExec exec) {
+ public boolean add(final ReportExec exec) {
checkType(exec, JPAReportExec.class);
return exec != null && !executions.contains((JPAReportExec) exec) && executions.add((JPAReportExec) exec);
}
@Override
- public boolean removeExec(final ReportExec exec) {
+ public boolean remove(final ReportExec exec) {
checkType(exec, JPAReportExec.class);
return exec != null && executions.remove((JPAReportExec) exec);
}
@@ -99,7 +99,7 @@ public class JPAReport extends AbstractEntity<Long> implements Report {
}
@Override
- public boolean addReportletConf(final ReportletConf reportletConf) {
+ public boolean add(final ReportletConf reportletConf) {
if (reportletConf == null) {
return false;
}
@@ -112,7 +112,7 @@ public class JPAReport extends AbstractEntity<Long> implements Report {
}
@Override
- public boolean removeReportletConf(final ReportletConf reportletConf) {
+ public boolean remove(final ReportletConf reportletConf) {
return CollectionUtils.filter(reportletConfs, new Predicate<JPAReportletConfInstance>() {
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ReportTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ReportTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ReportTest.java
index 1144981..536d74f 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ReportTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ReportTest.java
@@ -59,8 +59,8 @@ public class ReportTest extends AbstractTest {
Report report = entityFactory.newEntity(Report.class);
report.setName("new report");
- report.addReportletConf(new UserReportletConf("first"));
- report.addReportletConf(new UserReportletConf("second"));
+ report.add(new UserReportletConf("first"));
+ report.add(new UserReportletConf("second"));
report = reportDAO.save(report);
assertNotNull(report);
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/ReportTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/ReportTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/ReportTest.java
index f143fd8..36f275c 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/ReportTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/ReportTest.java
@@ -80,7 +80,7 @@ public class ReportTest extends AbstractTest {
reportExec.setEndDate(new Date());
reportExec.setStatus(ReportExecStatus.SUCCESS);
- report.addExec(reportExec);
+ report.add(reportExec);
reportExec = reportExecDAO.save(reportExec);
assertNotNull(reportExec);
http://git-wip-us.apache.org/repos/asf/syncope/blob/56568a43/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ReportDataBinderImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ReportDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ReportDataBinderImpl.java
index e98bc7d..6a40803 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ReportDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ReportDataBinderImpl.java
@@ -68,12 +68,12 @@ public class ReportDataBinderImpl implements ReportDataBinder {
toRemove.add(conf);
}
for (ReportletConf conf : toRemove) {
- report.removeReportletConf(conf);
+ report.remove(conf);
}
// 2. take all reportlet confs from reportTO
for (ReportletConf conf : reportTO.getReportletConfs()) {
- report.addReportletConf(conf);
+ report.add(conf);
}
}