diff --git a/spring-katharsis/pom.xml b/spring-katharsis/pom.xml
index 3aeaa973af..674d9a2a14 100644
--- a/spring-katharsis/pom.xml
+++ b/spring-katharsis/pom.xml
@@ -10,9 +10,9 @@
com.baeldung
- parent-boot-1
+ parent-boot-2
0.0.1-SNAPSHOT
- ../parent-boot-1
+ ../parent-boot-2
diff --git a/spring-katharsis/src/main/java/com/baeldung/Application.java b/spring-katharsis/src/main/java/com/baeldung/Application.java
index 6c4f047b26..738afa039e 100644
--- a/spring-katharsis/src/main/java/com/baeldung/Application.java
+++ b/spring-katharsis/src/main/java/com/baeldung/Application.java
@@ -4,7 +4,7 @@ import io.katharsis.spring.boot.v3.KatharsisConfigV3;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Import;
@SpringBootApplication
diff --git a/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/RoleResourceRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/RoleResourceRepository.java
index c5e6326075..a249def128 100644
--- a/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/RoleResourceRepository.java
+++ b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/RoleResourceRepository.java
@@ -7,6 +7,9 @@ import io.katharsis.repository.ResourceRepositoryV2;
import io.katharsis.resource.list.ResourceList;
import com.baeldung.persistence.model.Role;
+
+import java.util.Optional;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -17,7 +20,8 @@ public class RoleResourceRepository implements ResourceRepositoryV2
@Override
public Role findOne(Long id, QuerySpec querySpec) {
- return roleRepository.findOne(id);
+ Optional role = roleRepository.findById(id);
+ return role.isPresent()? role.get() : null;
}
@Override
@@ -27,7 +31,7 @@ public class RoleResourceRepository implements ResourceRepositoryV2
@Override
public ResourceList findAll(Iterable ids, QuerySpec querySpec) {
- return querySpec.apply(roleRepository.findAll(ids));
+ return querySpec.apply(roleRepository.findAllById(ids));
}
@Override
@@ -37,7 +41,7 @@ public class RoleResourceRepository implements ResourceRepositoryV2
@Override
public void delete(Long id) {
- roleRepository.delete(id);
+ roleRepository.deleteById(id);
}
@Override
diff --git a/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserResourceRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserResourceRepository.java
index 616431f3f0..af71da4727 100644
--- a/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserResourceRepository.java
+++ b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserResourceRepository.java
@@ -6,6 +6,8 @@ import io.katharsis.queryspec.QuerySpec;
import io.katharsis.repository.ResourceRepositoryV2;
import io.katharsis.resource.list.ResourceList;
+import java.util.Optional;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -17,7 +19,8 @@ public class UserResourceRepository implements ResourceRepositoryV2
@Override
public User findOne(Long id, QuerySpec querySpec) {
- return userRepository.findOne(id);
+ Optional user = userRepository.findById(id);
+ return user.isPresent()? user.get() : null;
}
@Override
@@ -27,7 +30,7 @@ public class UserResourceRepository implements ResourceRepositoryV2
@Override
public ResourceList findAll(Iterable ids, QuerySpec querySpec) {
- return querySpec.apply(userRepository.findAll(ids));
+ return querySpec.apply(userRepository.findAllById(ids));
}
@Override
@@ -37,7 +40,7 @@ public class UserResourceRepository implements ResourceRepositoryV2
@Override
public void delete(Long id) {
- userRepository.delete(id);
+ userRepository.deleteById(id);
}
@Override
diff --git a/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java
index 066292c00f..d0b4a464c9 100644
--- a/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java
+++ b/spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java
@@ -8,6 +8,7 @@ import io.katharsis.repository.RelationshipRepositoryV2;
import io.katharsis.resource.list.ResourceList;
import java.util.HashSet;
+import java.util.Optional;
import java.util.Set;
import com.baeldung.persistence.model.Role;
@@ -31,7 +32,7 @@ public class UserToRoleRelationshipRepository implements RelationshipRepositoryV
@Override
public void setRelations(User user, Iterable roleIds, String fieldName) {
final Set roles = new HashSet();
- roles.addAll(roleRepository.findAll(roleIds));
+ roles.addAll(roleRepository.findAllById(roleIds));
user.setRoles(roles);
userRepository.save(user);
}
@@ -39,7 +40,7 @@ public class UserToRoleRelationshipRepository implements RelationshipRepositoryV
@Override
public void addRelations(User user, Iterable roleIds, String fieldName) {
final Set roles = user.getRoles();
- roles.addAll(roleRepository.findAll(roleIds));
+ roles.addAll(roleRepository.findAllById(roleIds));
user.setRoles(roles);
userRepository.save(user);
}
@@ -47,7 +48,7 @@ public class UserToRoleRelationshipRepository implements RelationshipRepositoryV
@Override
public void removeRelations(User user, Iterable roleIds, String fieldName) {
final Set roles = user.getRoles();
- roles.removeAll(roleRepository.findAll(roleIds));
+ roles.removeAll(roleRepository.findAllById(roleIds));
user.setRoles(roles);
userRepository.save(user);
}
@@ -60,7 +61,8 @@ public class UserToRoleRelationshipRepository implements RelationshipRepositoryV
@Override
public ResourceList findManyTargets(Long sourceId, String fieldName, QuerySpec querySpec) {
- final User user = userRepository.findOne(sourceId);
+ final Optional userOptional = userRepository.findById(sourceId);
+ User user = userOptional.isPresent() ? userOptional.get() : new User();
return querySpec.apply(user.getRoles());
}
diff --git a/spring-katharsis/src/main/resources/application.properties b/spring-katharsis/src/main/resources/application.properties
index 120b3c62ee..415ec1723b 100644
--- a/spring-katharsis/src/main/resources/application.properties
+++ b/spring-katharsis/src/main/resources/application.properties
@@ -6,7 +6,7 @@ spring.jpa.hibernate.ddl-auto = create-drop
spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.H2Dialect
server.port=8082
-server.context-path=/spring-katharsis
+server.servlet.context-path=/spring-katharsis
katharsis.domainName=http://localhost:8082/spring-katharsis
katharsis.pathPrefix=/
\ No newline at end of file