diff --git a/pom.xml b/pom.xml index b20d82618b..faf214b567 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ log4j log4j2 lombok - + mapstruct metrics mesos-marathon @@ -121,7 +121,7 @@ selenium-junit-testng solr spark-java - spring-5 + spring-5-mvc spring-akka spring-amqp @@ -140,7 +140,6 @@ spring-data-couchbase-2 spring-data-dynamodb spring-data-elasticsearch - spring-data-javaslang spring-data-mongodb spring-data-neo4j spring-data-redis diff --git a/spring-data-javaslang/.gitignore b/spring-data-javaslang/.gitignore deleted file mode 100644 index 7ee5423d14..0000000000 --- a/spring-data-javaslang/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/target/ -/project/ -.idea -.classpath -.eclipse diff --git a/spring-data-javaslang/pom.xml b/spring-data-javaslang/pom.xml deleted file mode 100644 index 02d214344e..0000000000 --- a/spring-data-javaslang/pom.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - 4.0.0 - spring-data-javaslang - spring-data-javaslang - 0.0.1-SNAPSHOT - - - 2.9.1-01 - 2.3.7-01 - 2.4.8 - 2.0.5 - 1.5.1.RELEASE - 4.3.6.RELEASE - 4.3.6.RELEASE - 4.3.6.RELEASE - ${basedir}/src/test/java - - - - parent-boot-5 - com.baeldung - 0.0.1-SNAPSHOT - ../parent-boot-5 - - - - - test-app - - verify - - - org.springframework.boot - spring-boot-maven-plugin - - - spring-boot-run - verify - - run - - false - - - - - - - - - - - org.springframework.boot - spring-boot-devtools - true - - - - com.h2database - h2 - 1.4.193 - - - - io.javaslang - javaslang - ${javaslang.version} - - - - org.springframework.data - spring-data-jpa - 1.11.0.RELEASE - - - - org.springframework.boot - spring-boot - ${spring-boot.version} - - - - org.springframework.boot - spring-boot-starter-data-jpa - ${spring-boot.version} - - - - org.springframework.boot - spring-boot-starter-test - ${spring-boot.version} - - - - org.springframework - spring-context - ${spring-context.version} - - - - org.springframework - spring-core - ${spring-core.version} - - - - \ No newline at end of file diff --git a/spring-data-javaslang/src/main/java/com/baeldung/spring_data/model/Book.java b/spring-data-javaslang/src/main/java/com/baeldung/spring_data/model/Book.java deleted file mode 100644 index 95653abb6c..0000000000 --- a/spring-data-javaslang/src/main/java/com/baeldung/spring_data/model/Book.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.baeldung.spring_data.model; - -import javaslang.collection.Seq; - -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; - -@Entity -@Table(name = "book") -public class Book { - - @GeneratedValue - @Id - private Long id; - - private String title; - - private Seq authors; - - - public void setTitle(String title){ - this.title = title; - } - - public String getTitle(){ - return this.title; - } - - public Long getId(){ - return this.id; - } - - public void setAuthors(Seq authors){ - this.authors = authors; - } - - public Seq getAuthors(){ - return this.authors; - } -} diff --git a/spring-data-javaslang/src/main/java/com/baeldung/spring_data/model/JavaBook.java b/spring-data-javaslang/src/main/java/com/baeldung/spring_data/model/JavaBook.java deleted file mode 100644 index ab99b0d929..0000000000 --- a/spring-data-javaslang/src/main/java/com/baeldung/spring_data/model/JavaBook.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.baeldung.spring_data.model; - -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; - -import java.util.List; - -@Entity -@Table(name = "java_book") -public class JavaBook { - - @GeneratedValue - @Id - private Long id; - - private String title; - - @ElementCollection - private List authors; - - - public void setAuthors(List authors){ - this.authors = authors; - } - - public void setTitle(String title){ - this.title = title; - } - - public String getTitle(){ - return this.title; - } - - public Long getId(){ - return this.id; - } -} - diff --git a/spring-data-javaslang/src/main/java/com/baeldung/spring_data/repository/BookRepository.java b/spring-data-javaslang/src/main/java/com/baeldung/spring_data/repository/BookRepository.java deleted file mode 100644 index 75b6d0b426..0000000000 --- a/spring-data-javaslang/src/main/java/com/baeldung/spring_data/repository/BookRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.spring_data.repository; - -import com.baeldung.spring_data.model.Book; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import javaslang.collection.Seq; -import javaslang.control.Option; - -@Repository -public interface BookRepository extends JpaRepository{ - Book save(Book book); - - Option findById(Long id); - - Option> findByTitleContaining(String title); - -} diff --git a/spring-data-javaslang/src/main/java/com/baeldung/spring_data/repository/JavaBookRepository.java b/spring-data-javaslang/src/main/java/com/baeldung/spring_data/repository/JavaBookRepository.java deleted file mode 100644 index a4aeab85ee..0000000000 --- a/spring-data-javaslang/src/main/java/com/baeldung/spring_data/repository/JavaBookRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung.spring_data.repository; - -import com.baeldung.spring_data.model.JavaBook; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface JavaBookRepository extends JpaRepository{ - JavaBook save(JavaBook book); - - JavaBook findById(Long id); - - List findByTitleContaining(String title); -} \ No newline at end of file diff --git a/spring-data-javaslang/src/main/java/com/baeldung/spring_data_app/MainApp.java b/spring-data-javaslang/src/main/java/com/baeldung/spring_data_app/MainApp.java deleted file mode 100644 index d8a194e92e..0000000000 --- a/spring-data-javaslang/src/main/java/com/baeldung/spring_data_app/MainApp.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung.spring_data_app; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -@Configuration -@EnableJpaRepositories("com.baeldung.spring_data.repository") -@EnableTransactionManagement -@EntityScan("com.baeldung.spring_data.model") -@SpringBootApplication -public class MainApp { - public static void main(String[] args){ - SpringApplication.run(MainApp.class, args); - } -} diff --git a/spring-data-javaslang/src/test/java/com/baeldung/spring_data_tests/SpringIntegrationTest.java b/spring-data-javaslang/src/test/java/com/baeldung/spring_data_tests/SpringIntegrationTest.java deleted file mode 100644 index 7a23fa1ef2..0000000000 --- a/spring-data-javaslang/src/test/java/com/baeldung/spring_data_tests/SpringIntegrationTest.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.baeldung.spring_data_tests; - -import com.baeldung.spring_data.model.Book; -import com.baeldung.spring_data.model.JavaBook; -import com.baeldung.spring_data.repository.BookRepository; -import com.baeldung.spring_data.repository.JavaBookRepository; -import com.baeldung.spring_data_app.MainApp; -import javaslang.collection.List; -import javaslang.collection.Seq; -import javaslang.control.Option; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.test.context.junit4.SpringRunner; - -import java.util.ArrayList; - -import static org.assertj.core.api.Assertions.assertThat; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = MainApp.class,webEnvironment = WebEnvironment.NONE) -public class SpringIntegrationTest { - - @Autowired - private JavaBookRepository javaRepository; - - @Autowired - private BookRepository repository; - - @Test - public void should_return_seq(){ - Seq authors = List.of("author1","author2"); - Book testBook = new Book(); - testBook.setTitle("Javaslang in Spring Data Seq Test Return"); - testBook.setAuthors(authors); - Book book = repository.save(testBook); - Option> books = repository.findByTitleContaining("Seq Test"); - - assertThat(books).isNotEmpty(); - } - - - @Test - public void should_return_option_with_book(){ - Seq authors = List.of("author1","author2"); - Book testBook = new Book(); - testBook.setTitle("Javaslang in Spring Data"); - testBook.setAuthors(authors); - Book book = repository.save(testBook); - Option retBook = repository.findById(1L); - - assertThat(retBook.isDefined()).isTrue(); - assertThat(retBook).isNotEmpty(); - } - - @Test - public void should_return_list(){ - ArrayList authors = new ArrayList(); - authors.add("author1"); - authors.add("author2"); - JavaBook testBook = new JavaBook(); - testBook.setTitle("Javaslang in Spring Data Seq Return"); - testBook.setAuthors(authors); - JavaBook book = javaRepository.save(testBook); - java.util.List books = javaRepository.findByTitleContaining("Seq"); - assertThat(books) - .isNotEmpty() - .hasSize(1) - .extracting("title") - .contains("Javaslang in Spring Data Seq Return"); - } - - @Test - public void should_return_book(){ - ArrayList authors = new ArrayList(); - authors.add("author1"); - authors.add("author2"); - JavaBook testBook = new JavaBook(); - testBook.setTitle("Javaslang in Spring Data"); - testBook.setAuthors(authors); - JavaBook book = javaRepository.save(testBook); - JavaBook retBook = javaRepository.findById(1L); - - assertThat(retBook.getId()).isEqualTo(1L); - assertThat(retBook.getTitle()).isEqualTo("Javaslang in Spring Data"); - } -} \ No newline at end of file