Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2

Revert "BAEL-3275: Using blocking queue for pub-sub"

spring-katharsis/README.md

@@ -0,0 +1,11 @@
+## Spring Katharsis
+
+This module contains articles about Spring with Katharsis
+
+### Relevant Articles: 
+
+- [JSON API in a Spring Application](https://www.baeldung.com/json-api-java-spring-web-app)
+
+### The Course
+
+The "REST With Spring" Classes: http://bit.ly/restwithspring

spring-katharsis/pom.xml

@@ -0,0 +1,142 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.springframework.samples</groupId>
+    <artifactId>spring-katharsis</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+	<name>spring-katharsis</name>
+    <packaging>war</packaging>
+	
+    <parent>
+        <artifactId>parent-boot-1</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-1</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+
+        <!-- json api -->
+
+        <dependency>
+            <groupId>io.katharsis</groupId>
+            <artifactId>katharsis-spring</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>${reflections.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>${cargo-maven2-plugin.version}</version>
+                <configuration>
+                    <wait>true</wait>
+                    <container>
+                        <containerId>tomcat8x</containerId>
+                        <type>embedded</type>
+                        <systemProperties>
+                            <!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
+                        </systemProperties>
+                    </container>
+                    <configuration>
+                        <properties>
+                            <cargo.servlet.port>8082</cargo.servlet.port>
+                        </properties>
+                    </configuration>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>live</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven2-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>start-server</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>stop-server</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>none</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*LiveTest.java</include>
+                                    </includes>
+                                    <systemPropertyVariables>
+                                        <webTarget>cargo</webTarget>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <properties>
+        <katharsis.version>3.0.2</katharsis.version>
+        <reflections.version>0.9.10</reflections.version>
+        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+    </properties>
+
+</project>

spring-katharsis/src/main/java/org/baeldung/Application.java

@@ -0,0 +1,18 @@
+package org.baeldung;
+
+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.context.annotation.Import;
+
+@SpringBootApplication
+@Import(KatharsisConfigV3.class)
+public class Application extends SpringBootServletInitializer {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+}

spring-katharsis/src/main/java/org/baeldung/Setup.java

@@ -0,0 +1,40 @@
+package org.baeldung;
+
+import java.util.Arrays;
+import java.util.HashSet;
+
+import javax.annotation.PostConstruct;
+
+import org.baeldung.persistence.dao.RoleRepository;
+import org.baeldung.persistence.dao.UserRepository;
+import org.baeldung.persistence.model.Role;
+import org.baeldung.persistence.model.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class Setup {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private RoleRepository roleRepository;
+
+    @PostConstruct
+    private void setupData() {
+        Role roleUser = new Role("ROLE_USER");
+        roleUser = roleRepository.save(roleUser);
+        Role roleAdmin = new Role("ROLE_ADMIN");
+        roleAdmin = roleRepository.save(roleAdmin);
+
+        final User userJohn = new User("john", "john@test.com");
+        userJohn.setRoles(new HashSet<Role>(Arrays.asList(roleUser, roleAdmin)));
+        userRepository.save(userJohn);
+
+        final User userTom = new User("tom", "tom@test.com");
+        userTom.setRoles(new HashSet<Role>(Arrays.asList(roleUser)));
+        userRepository.save(userTom);
+    }
+
+}

spring-katharsis/src/main/java/org/baeldung/persistence/dao/RoleRepository.java

@@ -0,0 +1,8 @@
+package org.baeldung.persistence.dao;
+
+import org.baeldung.persistence.model.Role;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface RoleRepository extends JpaRepository<Role, Long> {
+
+}

spring-katharsis/src/main/java/org/baeldung/persistence/dao/UserRepository.java

@@ -0,0 +1,8 @@
+package org.baeldung.persistence.dao;
+
+import org.baeldung.persistence.model.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface UserRepository extends JpaRepository<User, Long> {
+
+}

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

@@ -0,0 +1,53 @@
+package org.baeldung.persistence.katharsis;
+
+
+import io.katharsis.queryspec.QuerySpec;
+import io.katharsis.repository.ResourceRepositoryV2;
+import io.katharsis.resource.list.ResourceList;
+
+import org.baeldung.persistence.dao.RoleRepository;
+import org.baeldung.persistence.model.Role;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RoleResourceRepository implements ResourceRepositoryV2<Role, Long> {
+
+    @Autowired private RoleRepository roleRepository;
+
+    @Override
+    public Role findOne(Long id, QuerySpec querySpec) {
+        return roleRepository.findOne(id);
+    }
+
+    @Override
+    public ResourceList<Role> findAll(QuerySpec querySpec) {
+        return querySpec.apply(roleRepository.findAll());
+    }
+
+    @Override
+    public ResourceList<Role> findAll(Iterable<Long> ids, QuerySpec querySpec) {
+        return querySpec.apply(roleRepository.findAll(ids));
+    }
+
+    @Override
+    public <S extends Role> S save(S entity) {
+        return roleRepository.save(entity);
+    }
+
+    @Override
+    public void delete(Long id) {
+        roleRepository.delete(id);
+    }
+
+    @Override
+    public Class<Role> getResourceClass() {
+        return Role.class;
+    }
+
+    @Override
+    public <S extends Role> S create(S entity) {
+        return save(entity);
+    }
+
+}

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

@@ -0,0 +1,53 @@
+package org.baeldung.persistence.katharsis;
+
+import io.katharsis.queryspec.QuerySpec;
+import io.katharsis.repository.ResourceRepositoryV2;
+import io.katharsis.resource.list.ResourceList;
+
+import org.baeldung.persistence.dao.UserRepository;
+import org.baeldung.persistence.model.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UserResourceRepository implements ResourceRepositoryV2<User, Long> {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Override
+    public User findOne(Long id, QuerySpec querySpec) {
+        return userRepository.findOne(id);
+    }
+
+    @Override
+    public ResourceList<User> findAll(QuerySpec querySpec) {
+        return querySpec.apply(userRepository.findAll());
+    }
+
+    @Override
+    public ResourceList<User> findAll(Iterable<Long> ids, QuerySpec querySpec) {
+        return querySpec.apply(userRepository.findAll(ids));
+    }
+
+    @Override
+    public <S extends User> S save(S entity) {
+        return userRepository.save(entity);
+    }
+
+    @Override
+    public void delete(Long id) {
+        userRepository.delete(id);
+    }
+
+    @Override
+    public Class<User> getResourceClass() {
+        return User.class;
+    }
+
+    @Override
+    public <S extends User> S create(S entity) {
+        return save(entity);
+    }
+
+}

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

@@ -0,0 +1,77 @@
+package org.baeldung.persistence.katharsis;
+
+import io.katharsis.queryspec.QuerySpec;
+import io.katharsis.repository.RelationshipRepositoryV2;
+import io.katharsis.resource.list.ResourceList;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.baeldung.persistence.dao.RoleRepository;
+import org.baeldung.persistence.dao.UserRepository;
+import org.baeldung.persistence.model.Role;
+import org.baeldung.persistence.model.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UserToRoleRelationshipRepository implements RelationshipRepositoryV2<User, Long, Role, Long> {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private RoleRepository roleRepository;
+
+    @Override
+    public void setRelation(User User, Long roleId, String fieldName) {
+        // not for many-to-many
+    }
+
+    @Override
+    public void setRelations(User user, Iterable<Long> roleIds, String fieldName) {
+        final Set<Role> roles = new HashSet<Role>();
+        roles.addAll(roleRepository.findAll(roleIds));
+        user.setRoles(roles);
+        userRepository.save(user);
+    }
+
+    @Override
+    public void addRelations(User user, Iterable<Long> roleIds, String fieldName) {
+        final Set<Role> roles = user.getRoles();
+        roles.addAll(roleRepository.findAll(roleIds));
+        user.setRoles(roles);
+        userRepository.save(user);
+    }
+
+    @Override
+    public void removeRelations(User user, Iterable<Long> roleIds, String fieldName) {
+        final Set<Role> roles = user.getRoles();
+        roles.removeAll(roleRepository.findAll(roleIds));
+        user.setRoles(roles);
+        userRepository.save(user);
+    }
+
+    @Override
+    public Role findOneTarget(Long sourceId, String fieldName, QuerySpec querySpec) {
+        // not for many-to-many
+        return null;
+    }
+
+    @Override
+    public ResourceList<Role> findManyTargets(Long sourceId, String fieldName, QuerySpec querySpec) {
+        final User user = userRepository.findOne(sourceId);
+        return  querySpec.apply(user.getRoles());
+    }
+
+    @Override
+    public Class<User> getSourceResourceClass() {
+        return User.class;
+    }
+
+    @Override
+    public Class<Role> getTargetResourceClass() {
+        return Role.class;
+    }
+
+}

spring-katharsis/src/main/java/org/baeldung/persistence/model/Role.java

@@ -0,0 +1,103 @@
+package org.baeldung.persistence.model;
+
+import io.katharsis.resource.annotations.JsonApiId;
+import io.katharsis.resource.annotations.JsonApiRelation;
+import io.katharsis.resource.annotations.JsonApiResource;
+
+import java.util.Set;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+
+@Entity
+@JsonApiResource(type = "roles")
+public class Role {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @JsonApiId
+    private Long id;
+
+    @Column(nullable = false, unique = true)
+    private String name;
+
+    @ManyToMany(mappedBy = "roles")
+    @JsonApiRelation
+    private Set<User> users;
+
+    //
+    public Role() {
+        super();
+    }
+
+    public Role(String name) {
+        super();
+        this.name = name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    //
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + (id == null ? 0 : id.hashCode());
+        result = prime * result + (name == null ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Role other = (Role) obj;
+        if (id == null) {
+            if (other.id != null) {
+                return false;
+            }
+        } else if (!id.equals(other.id)) {
+            return false;
+        }
+        if (name == null) {
+            if (other.name != null) {
+                return false;
+            }
+        } else if (!name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Role [id=").append(id).append(", name=").append(name).append("]");
+        return builder.toString();
+    }
+
+}

spring-katharsis/src/main/java/org/baeldung/persistence/model/User.java

@@ -0,0 +1,112 @@
+package org.baeldung.persistence.model;
+
+import io.katharsis.resource.annotations.JsonApiId;
+import io.katharsis.resource.annotations.JsonApiRelation;
+import io.katharsis.resource.annotations.JsonApiResource;
+import io.katharsis.resource.annotations.SerializeType;
+
+import java.util.Set;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+
+@Entity
+@JsonApiResource(type = "users")
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @JsonApiId
+    private Long id;
+
+    private String username;
+
+    private String email;
+
+    @ManyToMany(fetch = FetchType.EAGER)
+    @JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id"))
+    @JsonApiRelation(serialize=SerializeType.EAGER)
+    private Set<Role> roles;
+
+    public User() {
+        super();
+    }
+
+    public User(String username, String email) {
+        super();
+        this.username = username;
+        this.email = email;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(final Long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(final String email) {
+        this.email = email;
+    }
+
+    public Set<Role> getRoles() {
+        return roles;
+    }
+
+    public void setRoles(Set<Role> roles) {
+        this.roles = roles;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + (email == null ? 0 : email.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final User user = (User) obj;
+        if (!email.equals(user.email)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("User [id=").append(id).append(", username=").append(username).append(", email=").append(email).append(", roles=").append(roles).append("]");
+        return builder.toString();
+    }
+
+}

spring-katharsis/src/main/resources/application.properties

@@ -0,0 +1,12 @@
+spring.datasource.url = jdbc:h2:mem:springKatharsis;DB_CLOSE_DELAY=-1
+spring.datasource.username = sa
+spring.datasource.password =
+spring.jpa.show-sql = false
+spring.jpa.hibernate.ddl-auto = create-drop
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.H2Dialect
+
+server.port=8082
+server.context-path=/spring-katharsis
+
+katharsis.domainName=http://localhost:8082/spring-katharsis
+katharsis.pathPrefix=/

spring-katharsis/src/main/resources/logback.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

spring-katharsis/src/test/java/org/baeldung/SpringContextIntegrationTest.java

@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextIntegrationTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}

spring-katharsis/src/test/java/org/baeldung/SpringContextTest.java

@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}

spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java

@@ -0,0 +1,21 @@
+package org.baeldung.test;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+
+public class JsonApiLiveTest {
+
+    private final static String URL_PREFIX = "http://localhost:8082/spring-katharsis/users";
+
+    @Test
+    public void whenGettingAllUsers_thenCorrect() {
+        final Response response = RestAssured.get(URL_PREFIX);
+        assertEquals(200, response.statusCode());
+        System.out.println(response.asString());
+    }
+
+}