From 1d196d272009c9a6f367d6877de7d2d300876a09 Mon Sep 17 00:00:00 2001 From: HARDEMAN Sebastien Date: Mon, 27 Jun 2022 15:40:42 +0200 Subject: [PATCH] remove files in order to move them in spring-data-mongodb-2 --- .../config/CustomRepositoryMongoConfig.java | 32 ---------- .../config/EntityCallbackMongoConfig.java | 48 -------------- .../com/baeldung/config/EventMongoConfig.java | 38 ----------- .../UuidIdentifiedEntityEventListener.java | 22 ------- .../main/java/com/baeldung/model/Book.java | 26 -------- .../baeldung/model/UuidIdentifiedEntity.java | 25 -------- .../baeldung/repository/BookRepository.java | 11 ---- .../repository/CustomMongoRepository.java | 13 ---- .../impl/CustomMongoRepositoryImpl.java | 51 --------------- .../repository/CustomRepositoryLiveTest.java | 58 ----------------- .../repository/EntityCallbackLiveTest.java | 63 ------------------- .../baeldung/repository/EventLiveTest.java | 63 ------------------- 12 files changed, 450 deletions(-) delete mode 100644 persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/config/CustomRepositoryMongoConfig.java delete mode 100644 persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/config/EntityCallbackMongoConfig.java delete mode 100644 persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/config/EventMongoConfig.java delete mode 100644 persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/event/UuidIdentifiedEntityEventListener.java delete mode 100644 persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/model/Book.java delete mode 100644 persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/model/UuidIdentifiedEntity.java delete mode 100644 persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/repository/BookRepository.java delete mode 100644 persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/repository/CustomMongoRepository.java delete mode 100644 persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/repository/impl/CustomMongoRepositoryImpl.java delete mode 100644 persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/CustomRepositoryLiveTest.java delete mode 100644 persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/EntityCallbackLiveTest.java delete mode 100644 persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/EventLiveTest.java diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/config/CustomRepositoryMongoConfig.java b/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/config/CustomRepositoryMongoConfig.java deleted file mode 100644 index 585bdba907..0000000000 --- a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/config/CustomRepositoryMongoConfig.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.baeldung.config; - -import org.bson.UuidRepresentation; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; - -import com.baeldung.repository.impl.CustomMongoRepositoryImpl; -import com.mongodb.ConnectionString; -import com.mongodb.MongoClientSettings; -import com.mongodb.client.MongoClient; -import com.mongodb.client.MongoClients; - -@Configuration -@EnableMongoRepositories(basePackages = "com.baeldung.repository", repositoryBaseClass = CustomMongoRepositoryImpl.class) -public class CustomRepositoryMongoConfig { - - @Bean - public MongoClient mongo() throws Exception { - final ConnectionString connectionString = new ConnectionString("mongodb://localhost:27017/test"); - final MongoClientSettings mongoClientSettings = MongoClientSettings.builder() - .uuidRepresentation(UuidRepresentation.STANDARD) - .applyConnectionString(connectionString).build(); - return MongoClients.create(mongoClientSettings); - } - - @Bean - public MongoTemplate mongoTemplate() throws Exception { - return new MongoTemplate(mongo(), "test"); - } -} diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/config/EntityCallbackMongoConfig.java b/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/config/EntityCallbackMongoConfig.java deleted file mode 100644 index 91c64b4801..0000000000 --- a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/config/EntityCallbackMongoConfig.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.baeldung.config; - -import java.util.UUID; - -import org.bson.UuidRepresentation; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback; -import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; - -import com.baeldung.model.UuidIdentifiedEntity; -import com.mongodb.ConnectionString; -import com.mongodb.MongoClientSettings; -import com.mongodb.client.MongoClient; -import com.mongodb.client.MongoClients; - -@Configuration -@EnableMongoRepositories(basePackages = "com.baeldung.repository") -public class EntityCallbackMongoConfig { - - @Bean - public MongoClient mongo() throws Exception { - final ConnectionString connectionString = new ConnectionString("mongodb://localhost:27017/test"); - final MongoClientSettings mongoClientSettings = MongoClientSettings.builder() - .uuidRepresentation(UuidRepresentation.STANDARD) - .applyConnectionString(connectionString).build(); - return MongoClients.create(mongoClientSettings); - } - - @Bean - public MongoTemplate mongoTemplate() throws Exception { - return new MongoTemplate(mongo(), "test"); - } - - @Bean - public BeforeConvertCallback beforeSaveCallback() { - - return (entity, collection) -> { - - if(entity.getId() == null) { - entity.setId(UUID.randomUUID()); - } - return entity; - }; - } - -} diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/config/EventMongoConfig.java b/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/config/EventMongoConfig.java deleted file mode 100644 index dc862e9513..0000000000 --- a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/config/EventMongoConfig.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.baeldung.config; - -import org.bson.UuidRepresentation; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; - -import com.baeldung.event.UuidIdentifiedEntityEventListener; -import com.mongodb.ConnectionString; -import com.mongodb.MongoClientSettings; -import com.mongodb.client.MongoClient; -import com.mongodb.client.MongoClients; - -@Configuration -@EnableMongoRepositories(basePackages = "com.baeldung.repository") -public class EventMongoConfig { - - @Bean - public MongoClient mongo() throws Exception { - final ConnectionString connectionString = new ConnectionString("mongodb://localhost:27017/test"); - final MongoClientSettings mongoClientSettings = MongoClientSettings.builder() - .uuidRepresentation(UuidRepresentation.STANDARD) - .applyConnectionString(connectionString).build(); - return MongoClients.create(mongoClientSettings); - } - - @Bean - public MongoTemplate mongoTemplate() throws Exception { - return new MongoTemplate(mongo(), "test"); - } - - @Bean - public UuidIdentifiedEntityEventListener uuidIdentifiedEntityEventListener() { - - return new UuidIdentifiedEntityEventListener(); - } -} diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/event/UuidIdentifiedEntityEventListener.java b/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/event/UuidIdentifiedEntityEventListener.java deleted file mode 100644 index 002c5994e3..0000000000 --- a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/event/UuidIdentifiedEntityEventListener.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.baeldung.event; - -import java.util.UUID; - -import org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener; -import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent; - -import com.baeldung.model.UuidIdentifiedEntity; - -public class UuidIdentifiedEntityEventListener extends AbstractMongoEventListener { - - @Override - public void onBeforeConvert(BeforeConvertEvent event) { - - super.onBeforeConvert(event); - UuidIdentifiedEntity entity = event.getSource(); - - if(entity.getId() == null) { - entity.setId(UUID.randomUUID()); - } - } -} diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/model/Book.java b/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/model/Book.java deleted file mode 100644 index 31ee0c7142..0000000000 --- a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/model/Book.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.baeldung.model; - -import org.springframework.data.mongodb.core.mapping.Document; - -@Document -public class Book extends UuidIdentifiedEntity { - - private String title; - private String author; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getAuthor() { - return author; - } - - public void setAuthor(String author) { - this.author = author; - } -} diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/model/UuidIdentifiedEntity.java b/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/model/UuidIdentifiedEntity.java deleted file mode 100644 index fae951d214..0000000000 --- a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/model/UuidIdentifiedEntity.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.baeldung.model; - -import java.util.UUID; - -import org.springframework.data.annotation.Id; - -public abstract class UuidIdentifiedEntity { - - @Id - protected UUID id; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - - if(this.id != null) { - - throw new UnsupportedOperationException("ID is already defined"); - } - - this.id = id; - } -} diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/repository/BookRepository.java b/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/repository/BookRepository.java deleted file mode 100644 index 21e068e80d..0000000000 --- a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/repository/BookRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.baeldung.repository; - -import java.util.UUID; - -import org.springframework.data.mongodb.repository.MongoRepository; - -import com.baeldung.model.Book; - -public interface BookRepository extends MongoRepository { - -} diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/repository/CustomMongoRepository.java b/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/repository/CustomMongoRepository.java deleted file mode 100644 index 50f54b7e75..0000000000 --- a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/repository/CustomMongoRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baeldung.repository; - -import java.util.UUID; - -import org.springframework.data.mongodb.repository.MongoRepository; -import org.springframework.data.repository.NoRepositoryBean; - -import com.baeldung.model.UuidIdentifiedEntity; - -@NoRepositoryBean -public interface CustomMongoRepository extends MongoRepository { - -} diff --git a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/repository/impl/CustomMongoRepositoryImpl.java b/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/repository/impl/CustomMongoRepositoryImpl.java deleted file mode 100644 index a7fbb7f6d5..0000000000 --- a/persistence-modules/spring-data-mongodb/src/main/java/com/baeldung/repository/impl/CustomMongoRepositoryImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.baeldung.repository.impl; - -import java.util.List; -import java.util.UUID; - -import org.springframework.data.mongodb.core.MongoOperations; -import org.springframework.data.mongodb.repository.query.MongoEntityInformation; -import org.springframework.data.mongodb.repository.support.SimpleMongoRepository; - -import com.baeldung.model.UuidIdentifiedEntity; -import com.baeldung.repository.CustomMongoRepository; - -public class CustomMongoRepositoryImpl extends SimpleMongoRepository implements CustomMongoRepository { - - public CustomMongoRepositoryImpl(MongoEntityInformation metadata, MongoOperations mongoOperations) { - - super(metadata, mongoOperations); - } - - @Override - public S save(S entity) { - generateId(entity); - return super.save(entity); - } - - @Override - public List saveAll(Iterable entities) { - entities.forEach(entity -> generateId(entity)); - return super.saveAll(entities); - } - - @Override - public S insert(S entity) { - generateId(entity); - return super.insert(entity); - } - - @Override - public List insert(Iterable entities) { - entities.forEach(entity -> generateId(entity)); - return super.insert(entities); - } - - protected void generateId(S entity) { - - if(entity != null && entity.getId() == null) { - entity.setId(UUID.randomUUID()); - } - } - -} diff --git a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/CustomRepositoryLiveTest.java b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/CustomRepositoryLiveTest.java deleted file mode 100644 index 923ddd88bd..0000000000 --- a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/CustomRepositoryLiveTest.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.baeldung.repository; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.mongodb.core.MongoOperations; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.config.CustomRepositoryMongoConfig; -import com.baeldung.model.Book; - -/** - * - * This test requires: - * * mongodb instance running on the environment - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = CustomRepositoryMongoConfig.class) -public class CustomRepositoryLiveTest { - - @Autowired - private BookRepository bookRepository; - - @Autowired - private MongoOperations mongoOps; - - @Before - public void testSetup() { - if (!mongoOps.collectionExists(Book.class)) { - mongoOps.createCollection(Book.class); - } - } - - @After - public void tearDown() { - mongoOps.dropCollection(Book.class); - } - - @Test - public void whenInsertingBook_thenBookIsInserted() { - final Book book = new Book(); - book.setTitle("The Lord of the Rings"); - book.setAuthor("JRR Tolkien"); - Book savedBook = bookRepository.save(book); - - Book result = mongoOps.findOne(Query.query(Criteria.where("_id").is(savedBook.getId())), Book.class); - - assertEquals(result.getTitle(), "The Lord of the Rings"); - } -} diff --git a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/EntityCallbackLiveTest.java b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/EntityCallbackLiveTest.java deleted file mode 100644 index 343472eb36..0000000000 --- a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/EntityCallbackLiveTest.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.baeldung.repository; - -import static org.junit.Assert.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.mongodb.core.MongoOperations; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.config.EntityCallbackMongoConfig; -import com.baeldung.model.Book; - -/** - * - * This test requires: - * * mongodb instance running on the environment - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = EntityCallbackMongoConfig.class) -public class EntityCallbackLiveTest { - - @Autowired - private BookRepository bookRepository; - - @Autowired - private MongoOperations mongoOps; - - @Before - public void testSetup() { - if (!mongoOps.collectionExists(Book.class)) { - mongoOps.createCollection(Book.class); - } - } - - @After - public void tearDown() { - mongoOps.dropCollection(Book.class); - } - - @Test - public void whenSavingArticle_thenArticleIsInserted() { - final Book book = new Book(); - book.setTitle("The Lord of the Rings"); - book.setAuthor("JRR Tolkien"); - - Book savedArticle = bookRepository.save(book); - - Book result = mongoOps.findOne(Query.query(Criteria.where("_id").is(savedArticle.getId())), Book.class); - - assertNotNull(result); - assertEquals(result.getTitle(), "The Lord of the Rings"); - } - - -} diff --git a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/EventLiveTest.java b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/EventLiveTest.java deleted file mode 100644 index a6b3406c9a..0000000000 --- a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/EventLiveTest.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.baeldung.repository; - -import static org.junit.Assert.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.mongodb.core.MongoOperations; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.config.EventMongoConfig; -import com.baeldung.model.Book; - -/** - * - * This test requires: - * * mongodb instance running on the environment - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = EventMongoConfig.class) -public class EventLiveTest { - - @Autowired - private BookRepository bookRepository; - - @Autowired - private MongoOperations mongoOps; - - @Before - public void testSetup() { - if (!mongoOps.collectionExists(Book.class)) { - mongoOps.createCollection(Book.class); - } - } - - @After - public void tearDown() { - mongoOps.dropCollection(Book.class); - } - - @Test - public void whenSavingArticle_thenArticleIsInserted() { - final Book book = new Book(); - book.setTitle("The Lord of the Rings"); - book.setAuthor("JRR Tolkien"); - - Book savedArticle = bookRepository.save(book); - - Book result = mongoOps.findOne(Query.query(Criteria.where("_id").is(savedArticle.getId())), Book.class); - - assertNotNull(result); - assertEquals(result.getTitle(), "The Lord of the Rings"); - } - - -}