BAEL-4453 (eugenp#3304)

krishan-gandhi2 · pivovarit · commit b5c7ffeb19aa · 2017-12-30T11:19:08.000+01:00
diff --git a/spring-katharsis/pom.xml b/spring-katharsis/pom.xml
@@ -36,12 +36,16 @@
             <artifactId>katharsis-servlet</artifactId>
             <version>${katharsis.version}</version>
         </dependency>
-
+		<dependency>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</artifactId>
+			<version>0.9.10</version>
+		</dependency>
     </dependencies>
 
 
     <properties>
-        <katharsis.version>1.0.1</katharsis.version>
+        <katharsis.version>2.1.3</katharsis.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
     </properties>
 
diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java b/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java
@@ -1,6 +1,6 @@
 package org.baeldung.persistence.katharsis;
 
-import io.katharsis.queryParams.RequestParams;
+import io.katharsis.queryParams.QueryParams;
 import io.katharsis.repository.ResourceRepository;
 
 import org.baeldung.persistence.dao.RoleRepository;
@@ -15,17 +15,17 @@ public class RoleResourceRepository implements ResourceRepository<Role, Long> {
     private RoleRepository roleRepository;
 
     @Override
-    public Role findOne(Long id, RequestParams params) {
+    public Role findOne(Long id, QueryParams params) {
         return roleRepository.findOne(id);
     }
 
     @Override
-    public Iterable<Role> findAll(RequestParams params) {
+    public Iterable<Role> findAll(QueryParams params) {
         return roleRepository.findAll();
     }
 
     @Override
-    public Iterable<Role> findAll(Iterable<Long> ids, RequestParams params) {
+    public Iterable<Role> findAll(Iterable<Long> ids, QueryParams params) {
         return roleRepository.findAll(ids);
     }
 
diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java b/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java
@@ -1,6 +1,6 @@
 package org.baeldung.persistence.katharsis;
 
-import io.katharsis.queryParams.RequestParams;
+import io.katharsis.queryParams.QueryParams;
 import io.katharsis.repository.ResourceRepository;
 
 import org.baeldung.persistence.dao.UserRepository;
@@ -15,17 +15,17 @@ public class UserResourceRepository implements ResourceRepository<User, Long> {
     private UserRepository userRepository;
 
     @Override
-    public User findOne(Long id, RequestParams params) {
+    public User findOne(Long id, QueryParams params) {
         return userRepository.findOne(id);
     }
 
     @Override
-    public Iterable<User> findAll(RequestParams params) {
+    public Iterable<User> findAll(QueryParams params) {
         return userRepository.findAll();
     }
 
     @Override
-    public Iterable<User> findAll(Iterable<Long> ids, RequestParams params) {
+    public Iterable<User> findAll(Iterable<Long> ids, QueryParams params) {
         return userRepository.findAll(ids);
     }
 
diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java b/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java
@@ -1,6 +1,6 @@
 package org.baeldung.persistence.katharsis;
 
-import io.katharsis.queryParams.RequestParams;
+import io.katharsis.queryParams.QueryParams;
 import io.katharsis.repository.RelationshipRepository;
 
 import java.util.HashSet;
@@ -52,13 +52,13 @@ public void removeRelations(User user, Iterable<Long> roleIds, String fieldName)
     }
 
     @Override
-    public Role findOneTarget(Long sourceId, String fieldName, RequestParams requestParams) {
+    public Role findOneTarget(Long sourceId, String fieldName, QueryParams QueryParams) {
         // not for many-to-many
         return null;
     }
 
     @Override
-    public Iterable<Role> findManyTargets(Long sourceId, String fieldName, RequestParams requestParams) {
+    public Iterable<Role> findManyTargets(Long sourceId, String fieldName, QueryParams QueryParams) {
         final User user = userRepository.findOne(sourceId);
         return user.getRoles();
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package org.baeldung.persistence.katharsis;`
`2`	`2`
`3`		`-import io.katharsis.queryParams.RequestParams;`
	`3`	`+import io.katharsis.queryParams.QueryParams;`
`4`	`4`	`import io.katharsis.repository.RelationshipRepository;`
`5`	`5`
`6`	`6`	`import java.util.HashSet;`
`@@ -52,13 +52,13 @@ public void removeRelations(User user, Iterable<Long> roleIds, String fieldName)`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`
`55`		`- public Role findOneTarget(Long sourceId, String fieldName, RequestParams requestParams) {`
	`55`	`+ public Role findOneTarget(Long sourceId, String fieldName, QueryParams QueryParams) {`
`56`	`56`	`// not for many-to-many`
`57`	`57`	`return null;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`		`- public Iterable<Role> findManyTargets(Long sourceId, String fieldName, RequestParams requestParams) {`
	`61`	`+ public Iterable<Role> findManyTargets(Long sourceId, String fieldName, QueryParams QueryParams) {`
`62`	`62`	`final User user = userRepository.findOne(sourceId);`
`63`	`63`	`return user.getRoles();`
`64`	`64`	`}`