iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[BAEL-4453] Upgrade Katharsis to 3.0.2 and fix imports (#3910)

This commit is contained in:
Krzysiek Przygudzki 2018-04-14 21:40:06 +02:00 committed by Grzegorz Piwowarek
parent d6d44c7cb9
commit 43d51a406b
6 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-katharsis/pom.xml
View File

@ -35,21 +35,25 @@
<groupId>io.katharsis</groupId> <groupId>io.katharsis</groupId>
<artifactId>katharsis-servlet</artifactId> <artifactId>katharsis-servlet</artifactId>
<version>${katharsis.version}</version> <version>${katharsis.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.reflections</groupId> <groupId>org.reflections</groupId>
<artifactId>reflections</artifactId> <artifactId>reflections</artifactId>
<version>0.9.10</version> <version>0.9.10</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
</dependency>
</dependencies> </dependencies>
<properties>
<katharsis.version>2.1.3</katharsis.version>
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
</properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -128,5 +132,9 @@
</profile> </profile>
</profiles> </profiles>
<properties>
<katharsis.version>3.0.2</katharsis.version>
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
</properties>
</project> </project>

1
spring-katharsis/src/main/java/org/baeldung/Application.java
View File

@ -9,7 +9,6 @@ public class Application extends SpringBootServletInitializer {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(Application.class, args); SpringApplication.run(Application.class, args);
} }
} }

6
spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/JsonApiFilter.java
View File

@ -1,8 +1,8 @@
package org.baeldung.persistence.katharsis; package org.baeldung.persistence.katharsis;
import io.katharsis.invoker.KatharsisInvokerBuilder; import io.katharsis.invoker.internal.legacy.KatharsisInvokerBuilder;
import io.katharsis.locator.JsonServiceLocator; import io.katharsis.legacy.locator.JsonServiceLocator;
import io.katharsis.servlet.AbstractKatharsisFilter; import io.katharsis.servlet.legacy.AbstractKatharsisFilter;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;

7
spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java
View File

@ -1,7 +1,7 @@
package org.baeldung.persistence.katharsis; package org.baeldung.persistence.katharsis;
import io.katharsis.queryParams.QueryParams; import io.katharsis.legacy.queryParams.QueryParams;
import io.katharsis.repository.ResourceRepository; import io.katharsis.legacy.repository.ResourceRepository;
import org.baeldung.persistence.dao.RoleRepository; import org.baeldung.persistence.dao.RoleRepository;
import org.baeldung.persistence.model.Role; import org.baeldung.persistence.model.Role;
@ -11,8 +11,7 @@ import org.springframework.stereotype.Component;
@Component @Component
public class RoleResourceRepository implements ResourceRepository<Role, Long> { public class RoleResourceRepository implements ResourceRepository<Role, Long> {
@Autowired @Autowired private RoleRepository roleRepository;
private RoleRepository roleRepository;
@Override @Override
public Role findOne(Long id, QueryParams params) { public Role findOne(Long id, QueryParams params) {

4
spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java
View File

@ -1,7 +1,7 @@
package org.baeldung.persistence.katharsis; package org.baeldung.persistence.katharsis;
import io.katharsis.queryParams.QueryParams; import io.katharsis.legacy.queryParams.QueryParams;
import io.katharsis.repository.ResourceRepository; import io.katharsis.legacy.repository.ResourceRepository;
import org.baeldung.persistence.dao.UserRepository; import org.baeldung.persistence.dao.UserRepository;
import org.baeldung.persistence.model.User; import org.baeldung.persistence.model.User;

4
spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java
View File

@ -1,7 +1,7 @@
package org.baeldung.persistence.katharsis; package org.baeldung.persistence.katharsis;
import io.katharsis.queryParams.QueryParams; import io.katharsis.legacy.queryParams.QueryParams;
import io.katharsis.repository.RelationshipRepository; import io.katharsis.legacy.repository.RelationshipRepository;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;