From 43d51a406b48ee44e78eba5d745e159294b76df0 Mon Sep 17 00:00:00 2001
From: Krzysiek Przygudzki <krzysztofprzygudzki+github@gmail.com>
Date: Sat, 14 Apr 2018 21:40:06 +0200
Subject: [PATCH] [BAEL-4453] Upgrade Katharsis to 3.0.2 and fix imports
 (#3910)

---
 spring-katharsis/pom.xml                      | 22 +++++++++++++------
 .../main/java/org/baeldung/Application.java   |  3 +--
 .../persistence/katharsis/JsonApiFilter.java  |  6 ++---
 .../katharsis/RoleResourceRepository.java     |  7 +++---
 .../katharsis/UserResourceRepository.java     |  4 ++--
 .../UserToRoleRelationshipRepository.java     |  4 ++--
 6 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/spring-katharsis/pom.xml b/spring-katharsis/pom.xml
index 49c0a5acf9..00552c6d5b 100644
--- a/spring-katharsis/pom.xml
+++ b/spring-katharsis/pom.xml
@@ -35,21 +35,25 @@
             <groupId>io.katharsis</groupId>
             <artifactId>katharsis-servlet</artifactId>
             <version>${katharsis.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 		<dependency>
 			<groupId>org.reflections</groupId>
 			<artifactId>reflections</artifactId>
 			<version>0.9.10</version>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.7</version>
+        </dependency>
     </dependencies>
 
-
-    <properties>
-        <katharsis.version>2.1.3</katharsis.version>
-        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
-    </properties>
-
-
     <build>
         <plugins>
             <plugin>
@@ -128,5 +132,9 @@
         </profile>
     </profiles>
 
+    <properties>
+        <katharsis.version>3.0.2</katharsis.version>
+        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+    </properties>
 
 </project>
diff --git a/spring-katharsis/src/main/java/org/baeldung/Application.java b/spring-katharsis/src/main/java/org/baeldung/Application.java
index b61151d87f..ee072305d8 100644
--- a/spring-katharsis/src/main/java/org/baeldung/Application.java
+++ b/spring-katharsis/src/main/java/org/baeldung/Application.java
@@ -9,7 +9,6 @@ public class Application extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
-
     }
 
-}
\ No newline at end of file
+}
diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/JsonApiFilter.java b/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/JsonApiFilter.java
index dc07841fe6..3d0d441357 100644
--- a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/JsonApiFilter.java
+++ b/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/JsonApiFilter.java
@@ -1,8 +1,8 @@
 package org.baeldung.persistence.katharsis;
 
-import io.katharsis.invoker.KatharsisInvokerBuilder;
-import io.katharsis.locator.JsonServiceLocator;
-import io.katharsis.servlet.AbstractKatharsisFilter;
+import io.katharsis.invoker.internal.legacy.KatharsisInvokerBuilder;
+import io.katharsis.legacy.locator.JsonServiceLocator;
+import io.katharsis.servlet.legacy.AbstractKatharsisFilter;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
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
index 101e4c2b7e..52ca40e26e 100644
--- 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,7 +1,7 @@
 package org.baeldung.persistence.katharsis;
 
-import io.katharsis.queryParams.QueryParams;
-import io.katharsis.repository.ResourceRepository;
+import io.katharsis.legacy.queryParams.QueryParams;
+import io.katharsis.legacy.repository.ResourceRepository;
 
 import org.baeldung.persistence.dao.RoleRepository;
 import org.baeldung.persistence.model.Role;
@@ -11,8 +11,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class RoleResourceRepository implements ResourceRepository<Role, Long> {
 
-    @Autowired
-    private RoleRepository roleRepository;
+    @Autowired private RoleRepository roleRepository;
 
     @Override
     public Role findOne(Long id, QueryParams params) {
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
index b6d519ab80..a36c3c3c0a 100644
--- 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,7 +1,7 @@
 package org.baeldung.persistence.katharsis;
 
-import io.katharsis.queryParams.QueryParams;
-import io.katharsis.repository.ResourceRepository;
+import io.katharsis.legacy.queryParams.QueryParams;
+import io.katharsis.legacy.repository.ResourceRepository;
 
 import org.baeldung.persistence.dao.UserRepository;
 import org.baeldung.persistence.model.User;
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
index 168cd1c866..19007a285f 100644
--- 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,7 +1,7 @@
 package org.baeldung.persistence.katharsis;
 
-import io.katharsis.queryParams.QueryParams;
-import io.katharsis.repository.RelationshipRepository;
+import io.katharsis.legacy.queryParams.QueryParams;
+import io.katharsis.legacy.repository.RelationshipRepository;
 
 import java.util.HashSet;
 import java.util.Set;