From 1353eed9055384a369f8d59e2a73fd1b266b9d84 Mon Sep 17 00:00:00 2001 From: eugenp Date: Wed, 28 Jan 2015 11:03:11 +0200 Subject: [PATCH 1/4] Eclipse cleanup work --- spring-security-rest-full/.classpath | 15 ++++++--- spring-security-rest-full/.project | 7 +++- .../.settings/org.eclipse.jdt.core.prefs | 1 + .../org.eclipse.wst.common.component | 2 ++ spring-security-rest-full/pom.xml | 32 +++++++++---------- 5 files changed, 35 insertions(+), 22 deletions(-) diff --git a/spring-security-rest-full/.classpath b/spring-security-rest-full/.classpath index 7049a8b952..aef5aab76d 100644 --- a/spring-security-rest-full/.classpath +++ b/spring-security-rest-full/.classpath @@ -1,18 +1,23 @@ - + - - + + + + + + + - + @@ -23,7 +28,7 @@ - + diff --git a/spring-security-rest-full/.project b/spring-security-rest-full/.project index e9390d617f..188b8b07fe 100644 --- a/spring-security-rest-full/.project +++ b/spring-security-rest-full/.project @@ -26,8 +26,13 @@ - org.hibernate.eclipse.console.hibernateBuilder + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + LaunchConfigHandle + <project>/.externalToolBuilders/org.hibernate.eclipse.console.hibernateBuilder.launch + diff --git a/spring-security-rest-full/.settings/org.eclipse.jdt.core.prefs b/spring-security-rest-full/.settings/org.eclipse.jdt.core.prefs index df81356514..9b54696b56 100644 --- a/spring-security-rest-full/.settings/org.eclipse.jdt.core.prefs +++ b/spring-security-rest-full/.settings/org.eclipse.jdt.core.prefs @@ -5,6 +5,7 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.7 diff --git a/spring-security-rest-full/.settings/org.eclipse.wst.common.component b/spring-security-rest-full/.settings/org.eclipse.wst.common.component index 3b942952f2..7ad7c118a0 100644 --- a/spring-security-rest-full/.settings/org.eclipse.wst.common.component +++ b/spring-security-rest-full/.settings/org.eclipse.wst.common.component @@ -5,6 +5,8 @@ + + diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml index c9a785ee54..8b01c7f61b 100644 --- a/spring-security-rest-full/pom.xml +++ b/spring-security-rest-full/pom.xml @@ -329,22 +329,22 @@ - - com.mysema.maven - apt-maven-plugin - 1.1.3 - - - - process - - - target/generated-sources/java - com.mysema.query.apt.jpa.JPAAnnotationProcessor - - - - + + + + + + + + + + + + + + + + From 3788b264ff487c08c566b27fbf3d2ffd5e5628b0 Mon Sep 17 00:00:00 2001 From: eugenp Date: Wed, 28 Jan 2015 11:04:03 +0200 Subject: [PATCH 2/4] Eclipse cleanup work --- .../org.hibernate.eclipse.console.hibernateBuilder.launch | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 spring-security-rest-full/.externalToolBuilders/org.hibernate.eclipse.console.hibernateBuilder.launch diff --git a/spring-security-rest-full/.externalToolBuilders/org.hibernate.eclipse.console.hibernateBuilder.launch b/spring-security-rest-full/.externalToolBuilders/org.hibernate.eclipse.console.hibernateBuilder.launch new file mode 100644 index 0000000000..9bc0284d26 --- /dev/null +++ b/spring-security-rest-full/.externalToolBuilders/org.hibernate.eclipse.console.hibernateBuilder.launch @@ -0,0 +1,7 @@ + + + + + + + From f479bc8a2178a3b5f7e46a05c6f85f115a0bda93 Mon Sep 17 00:00:00 2001 From: eugenp Date: Wed, 28 Jan 2015 11:19:10 +0200 Subject: [PATCH 3/4] minor formatting cleanup --- .../java/org/baeldung/persistence/dao/UserSpecification.java | 2 +- .../org/baeldung/persistence/service/impl/MyUserService.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserSpecification.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserSpecification.java index 8de25ea494..909f93a3e7 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserSpecification.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserSpecification.java @@ -38,7 +38,7 @@ public class UserSpecification implements Specification { return builder.lessThanOrEqualTo(root. get(criteria.getKey()), criteria.getValue().toString()); } else if (criteria.getOperation().equalsIgnoreCase(":")) { if (root.get(criteria.getKey()).getJavaType() == String.class) { - return builder.like(root.get(criteria.getKey()), "%" + criteria.getValue() + "%"); + return builder.like(root. get(criteria.getKey()), "%" + criteria.getValue() + "%"); } else { return builder.equal(root.get(criteria.getKey()), criteria.getValue()); } diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/MyUserService.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/MyUserService.java index 20bc67a01d..804f4d41c0 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/MyUserService.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/MyUserService.java @@ -34,4 +34,3 @@ public class MyUserService { repository.save(user); } } - From 300ff44b4659b7aec84b934b70ba04b9b563fe94 Mon Sep 17 00:00:00 2001 From: eugenp Date: Wed, 28 Jan 2015 12:12:51 +0200 Subject: [PATCH 4/4] making the userspecification immutable and re-enabling a problematic plugin --- spring-security-rest-full/pom.xml | 34 +++++++++---------- .../persistence/dao/UserSpecification.java | 10 +----- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml index 8b01c7f61b..0a6b72d545 100644 --- a/spring-security-rest-full/pom.xml +++ b/spring-security-rest-full/pom.xml @@ -327,24 +327,24 @@ - + - - - - - - - - - - - - - - - - + + com.mysema.maven + apt-maven-plugin + 1.1.3 + + + + process + + + target/generated-sources/java + com.mysema.query.apt.jpa.JPAAnnotationProcessor + + + + diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserSpecification.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserSpecification.java index 909f93a3e7..7d37874fd2 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserSpecification.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserSpecification.java @@ -11,11 +11,7 @@ import org.springframework.data.jpa.domain.Specification; public class UserSpecification implements Specification { - private SearchCriteria criteria; - - public UserSpecification() { - - } + private final SearchCriteria criteria; public UserSpecification(final SearchCriteria criteria) { super(); @@ -26,10 +22,6 @@ public class UserSpecification implements Specification { return criteria; } - public void setCriteria(final SearchCriteria criteria) { - this.criteria = criteria; - } - @Override public Predicate toPredicate(final Root root, final CriteriaQuery query, final CriteriaBuilder builder) { if (criteria.getOperation().equalsIgnoreCase(">")) {