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/08/18 15:03:59 UTC
[1/2] syncope git commit: Moving the buildnumber-maven-plugin to
core/login only,
removing commons-validator as it pulls in the old commons-collections,
plus some white noise
Repository: syncope
Updated Branches:
refs/heads/2_0_X d16c96623 -> 67f65c831
refs/heads/master 5c10b4ba5 -> ea6559c85
Moving the buildnumber-maven-plugin to core/login only, removing commons-validator as it pulls in the old commons-collections, plus some white noise
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/67f65c83
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/67f65c83
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/67f65c83
Branch: refs/heads/2_0_X
Commit: 67f65c8311e08cf7c6cd427f08293779c469ae1b
Parents: d16c966
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Aug 18 17:03:35 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Aug 18 17:03:35 2017 +0200
----------------------------------------------------------------------
core/logic/pom.xml | 18 ++++++++
.../core/persistence/api/dao/AnyDAO.java | 4 +-
.../persistence/jpa/dao/AbstractAnyDAO.java | 10 ++---
.../core/persistence/jpa/inner/UserTest.java | 4 +-
.../provisioning/java/pushpull/PullUtils.java | 2 +-
ext/saml2sp/logic/pom.xml | 5 ---
.../apache/syncope/core/logic/SAML2SPLogic.java | 7 +--
.../core/logic/saml2/SAML2UserManager.java | 2 +-
.../org/apache/syncope/fit/AbstractITCase.java | 9 ++--
.../syncope/fit/core/AuthenticationITCase.java | 3 +-
.../apache/syncope/fit/core/WorkflowITCase.java | 3 +-
pom.xml | 47 ++++++--------------
12 files changed, 51 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/67f65c83/core/logic/pom.xml
----------------------------------------------------------------------
diff --git a/core/logic/pom.xml b/core/logic/pom.xml
index 6224038..3a77c0f 100644
--- a/core/logic/pom.xml
+++ b/core/logic/pom.xml
@@ -101,6 +101,24 @@ under the License.
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
http://git-wip-us.apache.org/repos/asf/syncope/blob/67f65c83/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/AnyDAO.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/AnyDAO.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/AnyDAO.java
index 3415377..d0bd1e0 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/AnyDAO.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/AnyDAO.java
@@ -41,9 +41,9 @@ public interface AnyDAO<A extends Any<?>> extends DAO<A> {
A findByWorkflowId(String workflowId);
- List<A> findByAttrValue(String schemaName, PlainAttrValue attrValue);
+ List<A> findByPlainAttrValue(String schemaName, PlainAttrValue attrValue);
- A findByAttrUniqueValue(String schemaName, PlainAttrValue attrUniqueValue);
+ A findByPlainAttrUniqueValue(String schemaName, PlainAttrValue attrUniqueValue);
/**
* Find any objects by derived attribute value. This method could fail if one or more string literals contained
http://git-wip-us.apache.org/repos/asf/syncope/blob/67f65c83/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
index 15b79da..894ec21 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
@@ -199,7 +199,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
return result;
}
- private Query findByAttrValueQuery(final String entityName) {
+ private Query findByPlainAttrValueQuery(final String entityName) {
return entityManager().createQuery("SELECT e FROM " + entityName + " e"
+ " WHERE e.attribute.schema.id = :schemaKey AND (e.stringValue IS NOT NULL"
+ " AND e.stringValue = :stringValue)"
@@ -211,7 +211,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
@Override
@SuppressWarnings("unchecked")
- public List<A> findByAttrValue(final String schemaKey, final PlainAttrValue attrValue) {
+ public List<A> findByPlainAttrValue(final String schemaKey, final PlainAttrValue attrValue) {
PlainSchema schema = plainSchemaDAO().find(schemaKey);
if (schema == null) {
LOG.error("Invalid schema name '{}'", schemaKey);
@@ -221,7 +221,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
String entityName = schema.isUniqueConstraint()
? anyUtils().plainAttrUniqueValueClass().getName()
: anyUtils().plainAttrValueClass().getName();
- Query query = findByAttrValueQuery(entityName);
+ Query query = findByPlainAttrValueQuery(entityName);
query.setParameter("schemaKey", schemaKey);
query.setParameter("stringValue", attrValue.getStringValue());
query.setParameter("booleanValue", attrValue.getBooleanValue() == null
@@ -247,7 +247,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
}
@Override
- public A findByAttrUniqueValue(final String schemaKey, final PlainAttrValue attrUniqueValue) {
+ public A findByPlainAttrUniqueValue(final String schemaKey, final PlainAttrValue attrUniqueValue) {
PlainSchema schema = plainSchemaDAO().find(schemaKey);
if (schema == null) {
LOG.error("Invalid schema name '{}'", schemaKey);
@@ -258,7 +258,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
return null;
}
- List<A> result = findByAttrValue(schemaKey, attrUniqueValue);
+ List<A> result = findByPlainAttrValue(schemaKey, attrUniqueValue);
return result.isEmpty()
? null
: result.iterator().next();
http://git-wip-us.apache.org/repos/asf/syncope/blob/67f65c83/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
index e5dcdd4..2fccd24 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
@@ -103,7 +103,7 @@ public class UserTest extends AbstractTest {
final UPlainAttrValue fullnameValue = entityFactory.newEntity(UPlainAttrValue.class);
fullnameValue.setStringValue("Gioacchino Rossini");
- final List<User> list = userDAO.findByAttrValue("fullname", fullnameValue);
+ final List<User> list = userDAO.findByPlainAttrValue("fullname", fullnameValue);
assertEquals("did not get expected number of users", 1, list.size());
}
@@ -112,7 +112,7 @@ public class UserTest extends AbstractTest {
final UPlainAttrValue coolValue = entityFactory.newEntity(UPlainAttrValue.class);
coolValue.setBooleanValue(true);
- final List<User> list = userDAO.findByAttrValue("cool", coolValue);
+ final List<User> list = userDAO.findByPlainAttrValue("cool", coolValue);
assertEquals("did not get expected number of users", 1, list.size());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/67f65c83/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java
index 819c5f3..7dee306 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java
@@ -246,7 +246,7 @@ public class PullUtils {
}
List<? extends Any<?>> anys = getAnyDAO(provision.getAnyType().getKind()).
- findByAttrValue(intAttrName.getSchemaName(), value);
+ findByPlainAttrValue(intAttrName.getSchemaName(), value);
for (Any<?> any : anys) {
result.add(any.getKey());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/67f65c83/ext/saml2sp/logic/pom.xml
----------------------------------------------------------------------
diff --git a/ext/saml2sp/logic/pom.xml b/ext/saml2sp/logic/pom.xml
index 134b7c9..b20998c 100644
--- a/ext/saml2sp/logic/pom.xml
+++ b/ext/saml2sp/logic/pom.xml
@@ -64,11 +64,6 @@ under the License.
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-impl</artifactId>
</dependency>
-
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/syncope/blob/67f65c83/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
----------------------------------------------------------------------
diff --git a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
index c07badb..dff5010 100644
--- a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
+++ b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
@@ -37,7 +37,6 @@ import javax.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
-import org.apache.commons.validator.routines.UrlValidator;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
import org.apache.cxf.rs.security.jose.jws.JwsSignatureVerifier;
import org.apache.syncope.common.lib.AbstractBaseBean;
@@ -110,6 +109,7 @@ import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
import org.apache.syncope.core.spring.security.AuthContextUtils;
import org.apache.syncope.core.spring.security.AuthDataAccessor;
import org.apache.syncope.core.spring.security.Encryptor;
+import org.springframework.util.ResourceUtils;
@Component
public class SAML2SPLogic extends AbstractSAML2Logic<AbstractBaseBean> {
@@ -130,9 +130,6 @@ public class SAML2SPLogic extends AbstractSAML2Logic<AbstractBaseBean> {
private static final Encryptor ENCRYPTOR = Encryptor.getInstance();
- private static final UrlValidator URL_VALIDATOR = new UrlValidator(
- new String[] { "http", "https" }, UrlValidator.ALLOW_LOCAL_URLS);
-
@Autowired
private AccessTokenDataBinder accessTokenDataBinder;
@@ -163,7 +160,7 @@ public class SAML2SPLogic extends AbstractSAML2Logic<AbstractBaseBean> {
isValid = false;
}
if (isValid) {
- isValid = URL_VALIDATOR.isValid(url);
+ isValid = ResourceUtils.isUrl(url);
}
if (!isValid) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/67f65c83/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java
----------------------------------------------------------------------
diff --git a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java
index a7af5e2..0798939 100644
--- a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java
+++ b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java
@@ -138,7 +138,7 @@ public class SAML2UserManager {
}
CollectionUtils.collect(
- userDAO.findByAttrValue(intAttrName.getSchemaName(), value),
+ userDAO.findByPlainAttrValue(intAttrName.getSchemaName(), value),
new Transformer<User, String>() {
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/67f65c83/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
index 880ed66..9c77fd5 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
@@ -35,6 +35,7 @@ import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
import javax.naming.directory.ModificationItem;
import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.IOUtils;
@@ -51,6 +52,7 @@ import org.apache.syncope.common.lib.policy.AbstractPolicyTO;
import org.apache.syncope.common.lib.to.AbstractSchemaTO;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.AttrTO;
+import org.apache.syncope.common.lib.to.ConnInstanceTO;
import org.apache.syncope.common.lib.to.ResourceTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.MembershipTO;
@@ -69,6 +71,7 @@ import org.apache.syncope.common.rest.api.service.AnyTypeClassService;
import org.apache.syncope.common.rest.api.service.AnyTypeService;
import org.apache.syncope.common.rest.api.service.CamelRouteService;
import org.apache.syncope.common.rest.api.service.ConfigurationService;
+import org.apache.syncope.common.rest.api.service.ConnectorHistoryService;
import org.apache.syncope.common.rest.api.service.ConnectorService;
import org.apache.syncope.common.rest.api.service.DomainService;
import org.apache.syncope.common.rest.api.service.DynRealmService;
@@ -82,6 +85,7 @@ import org.apache.syncope.common.rest.api.service.MailTemplateService;
import org.apache.syncope.common.rest.api.service.RealmService;
import org.apache.syncope.common.rest.api.service.RelationshipTypeService;
import org.apache.syncope.common.rest.api.service.ReportTemplateService;
+import org.apache.syncope.common.rest.api.service.ResourceHistoryService;
import org.apache.syncope.common.rest.api.service.RoleService;
import org.apache.syncope.common.rest.api.service.SAML2IdPService;
import org.apache.syncope.common.rest.api.service.SAML2SPService;
@@ -102,11 +106,6 @@ import org.junit.FixMethodOrder;
import org.junit.runners.MethodSorters;
import org.springframework.jdbc.core.JdbcTemplate;
-import com.google.common.net.HttpHeaders;
-import org.apache.syncope.common.lib.to.ConnInstanceTO;
-import org.apache.syncope.common.rest.api.service.ConnectorHistoryService;
-import org.apache.syncope.common.rest.api.service.ResourceHistoryService;
-
@FixMethodOrder(MethodSorters.JVM)
public abstract class AbstractITCase {
http://git-wip-us.apache.org/repos/asf/syncope/blob/67f65c83/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java
index 6ee4484..ddabfac 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.fit.core;
-import org.apache.syncope.fit.ActivitiDetector;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -77,6 +75,7 @@ import org.apache.syncope.common.rest.api.service.SchemaService;
import org.apache.syncope.common.rest.api.service.UserService;
import org.apache.syncope.core.spring.security.Encryptor;
import org.apache.syncope.fit.AbstractITCase;
+import org.apache.syncope.fit.ActivitiDetector;
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
http://git-wip-us.apache.org/repos/asf/syncope/blob/67f65c83/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java
index 529c13e..a600b06 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.fit.core;
-import org.apache.syncope.fit.ActivitiDetector;
-
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
@@ -34,6 +32,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.lib.to.WorkflowDefinitionTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.fit.AbstractITCase;
+import org.apache.syncope.fit.ActivitiDetector;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/syncope/blob/67f65c83/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4332731..7691a3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -403,7 +403,6 @@ under the License.
<commons-lang.version>3.6</commons-lang.version>
<commons-text.version>1.1</commons-text.version>
<commons-collection.version>4.1</commons-collection.version>
- <commons-validator.version>1.6</commons-validator.version>
<commons-logging.version>1.1.3</commons-logging.version>
<joda.version>2.9.9</joda.version>
@@ -1002,11 +1001,6 @@ under the License.
<artifactId>commons-collections4</artifactId>
<version>${commons-collection.version}</version>
</dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>${commons-validator.version}</version>
- </dependency>
<dependency>
<groupId>net.tirasa.connid</groupId>
@@ -1930,7 +1924,13 @@ under the License.
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
</plugin>
-
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-maven-plugin</artifactId>
@@ -1957,8 +1957,14 @@ under the License.
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>nbm-maven-plugin</artifactId>
+ <version>4.1</version>
</plugin>
-
+
<plugin>
<groupId>com.github.klieber</groupId>
<artifactId>phantomjs-maven-plugin</artifactId>
@@ -1974,13 +1980,6 @@ under the License.
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>nbm-maven-plugin</artifactId>
- <version>4.1</version>
- </plugin>
-
</plugins>
</pluginManagement>
@@ -2195,24 +2194,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.4</version>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- </configuration>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[2/2] syncope git commit: Moving the buildnumber-maven-plugin to
core/login only,
removing commons-validator as it pulls in the old commons-collections,
plus some white noise
Posted by il...@apache.org.
Moving the buildnumber-maven-plugin to core/login only, removing commons-validator as it pulls in the old commons-collections, plus some white noise
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ea6559c8
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ea6559c8
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ea6559c8
Branch: refs/heads/master
Commit: ea6559c856f2b6a136dc2179a7a9d92148c7c278
Parents: 5c10b4b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Aug 18 17:03:35 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Aug 18 17:03:49 2017 +0200
----------------------------------------------------------------------
core/logic/pom.xml | 18 ++++++++
.../core/persistence/api/dao/AnyDAO.java | 4 +-
.../persistence/jpa/dao/AbstractAnyDAO.java | 10 ++---
.../core/persistence/jpa/inner/UserTest.java | 4 +-
.../provisioning/java/pushpull/PullUtils.java | 2 +-
ext/saml2sp/logic/pom.xml | 5 ---
.../apache/syncope/core/logic/SAML2SPLogic.java | 7 +--
.../core/logic/saml2/SAML2UserManager.java | 2 +-
.../org/apache/syncope/fit/AbstractITCase.java | 9 ++--
.../syncope/fit/core/AuthenticationITCase.java | 3 +-
.../apache/syncope/fit/core/WorkflowITCase.java | 3 +-
pom.xml | 47 ++++++--------------
12 files changed, 51 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea6559c8/core/logic/pom.xml
----------------------------------------------------------------------
diff --git a/core/logic/pom.xml b/core/logic/pom.xml
index 640e1fa..2bf2af2 100644
--- a/core/logic/pom.xml
+++ b/core/logic/pom.xml
@@ -101,6 +101,24 @@ under the License.
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea6559c8/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/AnyDAO.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/AnyDAO.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/AnyDAO.java
index 3415377..d0bd1e0 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/AnyDAO.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/AnyDAO.java
@@ -41,9 +41,9 @@ public interface AnyDAO<A extends Any<?>> extends DAO<A> {
A findByWorkflowId(String workflowId);
- List<A> findByAttrValue(String schemaName, PlainAttrValue attrValue);
+ List<A> findByPlainAttrValue(String schemaName, PlainAttrValue attrValue);
- A findByAttrUniqueValue(String schemaName, PlainAttrValue attrUniqueValue);
+ A findByPlainAttrUniqueValue(String schemaName, PlainAttrValue attrUniqueValue);
/**
* Find any objects by derived attribute value. This method could fail if one or more string literals contained
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea6559c8/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
index 15b79da..894ec21 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
@@ -199,7 +199,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
return result;
}
- private Query findByAttrValueQuery(final String entityName) {
+ private Query findByPlainAttrValueQuery(final String entityName) {
return entityManager().createQuery("SELECT e FROM " + entityName + " e"
+ " WHERE e.attribute.schema.id = :schemaKey AND (e.stringValue IS NOT NULL"
+ " AND e.stringValue = :stringValue)"
@@ -211,7 +211,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
@Override
@SuppressWarnings("unchecked")
- public List<A> findByAttrValue(final String schemaKey, final PlainAttrValue attrValue) {
+ public List<A> findByPlainAttrValue(final String schemaKey, final PlainAttrValue attrValue) {
PlainSchema schema = plainSchemaDAO().find(schemaKey);
if (schema == null) {
LOG.error("Invalid schema name '{}'", schemaKey);
@@ -221,7 +221,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
String entityName = schema.isUniqueConstraint()
? anyUtils().plainAttrUniqueValueClass().getName()
: anyUtils().plainAttrValueClass().getName();
- Query query = findByAttrValueQuery(entityName);
+ Query query = findByPlainAttrValueQuery(entityName);
query.setParameter("schemaKey", schemaKey);
query.setParameter("stringValue", attrValue.getStringValue());
query.setParameter("booleanValue", attrValue.getBooleanValue() == null
@@ -247,7 +247,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
}
@Override
- public A findByAttrUniqueValue(final String schemaKey, final PlainAttrValue attrUniqueValue) {
+ public A findByPlainAttrUniqueValue(final String schemaKey, final PlainAttrValue attrUniqueValue) {
PlainSchema schema = plainSchemaDAO().find(schemaKey);
if (schema == null) {
LOG.error("Invalid schema name '{}'", schemaKey);
@@ -258,7 +258,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im
return null;
}
- List<A> result = findByAttrValue(schemaKey, attrUniqueValue);
+ List<A> result = findByPlainAttrValue(schemaKey, attrUniqueValue);
return result.isEmpty()
? null
: result.iterator().next();
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea6559c8/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
index e5dcdd4..2fccd24 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
@@ -103,7 +103,7 @@ public class UserTest extends AbstractTest {
final UPlainAttrValue fullnameValue = entityFactory.newEntity(UPlainAttrValue.class);
fullnameValue.setStringValue("Gioacchino Rossini");
- final List<User> list = userDAO.findByAttrValue("fullname", fullnameValue);
+ final List<User> list = userDAO.findByPlainAttrValue("fullname", fullnameValue);
assertEquals("did not get expected number of users", 1, list.size());
}
@@ -112,7 +112,7 @@ public class UserTest extends AbstractTest {
final UPlainAttrValue coolValue = entityFactory.newEntity(UPlainAttrValue.class);
coolValue.setBooleanValue(true);
- final List<User> list = userDAO.findByAttrValue("cool", coolValue);
+ final List<User> list = userDAO.findByPlainAttrValue("cool", coolValue);
assertEquals("did not get expected number of users", 1, list.size());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea6559c8/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java
index 819c5f3..7dee306 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java
@@ -246,7 +246,7 @@ public class PullUtils {
}
List<? extends Any<?>> anys = getAnyDAO(provision.getAnyType().getKind()).
- findByAttrValue(intAttrName.getSchemaName(), value);
+ findByPlainAttrValue(intAttrName.getSchemaName(), value);
for (Any<?> any : anys) {
result.add(any.getKey());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea6559c8/ext/saml2sp/logic/pom.xml
----------------------------------------------------------------------
diff --git a/ext/saml2sp/logic/pom.xml b/ext/saml2sp/logic/pom.xml
index 4aa7b86..c67c755 100644
--- a/ext/saml2sp/logic/pom.xml
+++ b/ext/saml2sp/logic/pom.xml
@@ -59,11 +59,6 @@ under the License.
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-impl</artifactId>
</dependency>
-
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea6559c8/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
----------------------------------------------------------------------
diff --git a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
index 39c7bfa..0da3f45 100644
--- a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
+++ b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
@@ -35,7 +35,6 @@ import javax.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
-import org.apache.commons.validator.routines.UrlValidator;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
import org.apache.cxf.rs.security.jose.jws.JwsSignatureVerifier;
import org.apache.cxf.rs.security.saml.sso.SSOValidatorResponse;
@@ -109,6 +108,7 @@ import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
import org.apache.syncope.core.spring.security.AuthContextUtils;
import org.apache.syncope.core.spring.security.AuthDataAccessor;
import org.apache.syncope.core.spring.security.Encryptor;
+import org.springframework.util.ResourceUtils;
@Component
public class SAML2SPLogic extends AbstractSAML2Logic<AbstractBaseBean> {
@@ -129,9 +129,6 @@ public class SAML2SPLogic extends AbstractSAML2Logic<AbstractBaseBean> {
private static final Encryptor ENCRYPTOR = Encryptor.getInstance();
- private static final UrlValidator URL_VALIDATOR = new UrlValidator(
- new String[] { "http", "https" }, UrlValidator.ALLOW_LOCAL_URLS);
-
@Autowired
private AccessTokenDataBinder accessTokenDataBinder;
@@ -162,7 +159,7 @@ public class SAML2SPLogic extends AbstractSAML2Logic<AbstractBaseBean> {
isValid = false;
}
if (isValid) {
- isValid = URL_VALIDATOR.isValid(url);
+ isValid = ResourceUtils.isUrl(url);
}
if (!isValid) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea6559c8/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java
----------------------------------------------------------------------
diff --git a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java
index a7af5e2..0798939 100644
--- a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java
+++ b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2UserManager.java
@@ -138,7 +138,7 @@ public class SAML2UserManager {
}
CollectionUtils.collect(
- userDAO.findByAttrValue(intAttrName.getSchemaName(), value),
+ userDAO.findByPlainAttrValue(intAttrName.getSchemaName(), value),
new Transformer<User, String>() {
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea6559c8/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
index 880ed66..9c77fd5 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
@@ -35,6 +35,7 @@ import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
import javax.naming.directory.ModificationItem;
import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.IOUtils;
@@ -51,6 +52,7 @@ import org.apache.syncope.common.lib.policy.AbstractPolicyTO;
import org.apache.syncope.common.lib.to.AbstractSchemaTO;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.AttrTO;
+import org.apache.syncope.common.lib.to.ConnInstanceTO;
import org.apache.syncope.common.lib.to.ResourceTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.MembershipTO;
@@ -69,6 +71,7 @@ import org.apache.syncope.common.rest.api.service.AnyTypeClassService;
import org.apache.syncope.common.rest.api.service.AnyTypeService;
import org.apache.syncope.common.rest.api.service.CamelRouteService;
import org.apache.syncope.common.rest.api.service.ConfigurationService;
+import org.apache.syncope.common.rest.api.service.ConnectorHistoryService;
import org.apache.syncope.common.rest.api.service.ConnectorService;
import org.apache.syncope.common.rest.api.service.DomainService;
import org.apache.syncope.common.rest.api.service.DynRealmService;
@@ -82,6 +85,7 @@ import org.apache.syncope.common.rest.api.service.MailTemplateService;
import org.apache.syncope.common.rest.api.service.RealmService;
import org.apache.syncope.common.rest.api.service.RelationshipTypeService;
import org.apache.syncope.common.rest.api.service.ReportTemplateService;
+import org.apache.syncope.common.rest.api.service.ResourceHistoryService;
import org.apache.syncope.common.rest.api.service.RoleService;
import org.apache.syncope.common.rest.api.service.SAML2IdPService;
import org.apache.syncope.common.rest.api.service.SAML2SPService;
@@ -102,11 +106,6 @@ import org.junit.FixMethodOrder;
import org.junit.runners.MethodSorters;
import org.springframework.jdbc.core.JdbcTemplate;
-import com.google.common.net.HttpHeaders;
-import org.apache.syncope.common.lib.to.ConnInstanceTO;
-import org.apache.syncope.common.rest.api.service.ConnectorHistoryService;
-import org.apache.syncope.common.rest.api.service.ResourceHistoryService;
-
@FixMethodOrder(MethodSorters.JVM)
public abstract class AbstractITCase {
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea6559c8/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java
index 6ee4484..ddabfac 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuthenticationITCase.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.fit.core;
-import org.apache.syncope.fit.ActivitiDetector;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -77,6 +75,7 @@ import org.apache.syncope.common.rest.api.service.SchemaService;
import org.apache.syncope.common.rest.api.service.UserService;
import org.apache.syncope.core.spring.security.Encryptor;
import org.apache.syncope.fit.AbstractITCase;
+import org.apache.syncope.fit.ActivitiDetector;
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea6559c8/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java
index 529c13e..a600b06 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.fit.core;
-import org.apache.syncope.fit.ActivitiDetector;
-
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
@@ -34,6 +32,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.lib.to.WorkflowDefinitionTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.fit.AbstractITCase;
+import org.apache.syncope.fit.ActivitiDetector;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/syncope/blob/ea6559c8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 74a71f9..0977425 100644
--- a/pom.xml
+++ b/pom.xml
@@ -402,7 +402,6 @@ under the License.
<commons-lang.version>3.6</commons-lang.version>
<commons-text.version>1.1</commons-text.version>
<commons-collection.version>4.1</commons-collection.version>
- <commons-validator.version>1.6</commons-validator.version>
<commons-logging.version>1.1.3</commons-logging.version>
<joda.version>2.9.9</joda.version>
@@ -976,11 +975,6 @@ under the License.
<artifactId>commons-collections4</artifactId>
<version>${commons-collection.version}</version>
</dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>${commons-validator.version}</version>
- </dependency>
<dependency>
<groupId>net.tirasa.connid</groupId>
@@ -1856,7 +1850,13 @@ under the License.
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
</plugin>
-
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-maven-plugin</artifactId>
@@ -1883,8 +1883,14 @@ under the License.
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>nbm-maven-plugin</artifactId>
+ <version>4.1</version>
</plugin>
-
+
<plugin>
<groupId>com.github.klieber</groupId>
<artifactId>phantomjs-maven-plugin</artifactId>
@@ -1900,13 +1906,6 @@ under the License.
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>nbm-maven-plugin</artifactId>
- <version>4.1</version>
- </plugin>
-
</plugins>
</pluginManagement>
@@ -2121,24 +2120,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.4</version>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- </configuration>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>