Skip to content

Morphia validation #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2016
Merged

Morphia validation #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ab28dc
Add morphia validation through validation add-on
adrienlauer Feb 26, 2016
53c50a7
Update changelog
adrienlauer Feb 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Version 1.1.0 (?)

* [new] Add Bean Validation support to Morphia (at pre-persist)

# Version 1.0.1 (2016-02-09)

* [fix] Flawed release process made this add-on unusable by clients
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.seedstack.addons.mongodb</groupId>
<artifactId>mongodb</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>mongodb-core</artifactId>
Expand Down
46 changes: 38 additions & 8 deletions morphia/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.seedstack.addons.mongodb</groupId>
<artifactId>mongodb</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>mongodb-morphia</artifactId>
Expand All @@ -31,17 +31,47 @@
<version>${business.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mongodb.morphia</groupId>
<artifactId>morphia</artifactId>
<version>${morphia.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb.morphia</groupId>
<artifactId>morphia</artifactId>
<version>${morphia.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb.morphia</groupId>
<artifactId>morphia-logging-slf4j</artifactId>
<version>${morphia.version}</version>
</dependency>
<dependency>
<groupId>org.seedstack.addons.validation</groupId>
<artifactId>validation</artifactId>
<version>${validation-addon.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.1.0.Final</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.seedstack.seed</groupId>
<artifactId>seed-testing</artifactId>
<version>${seed.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>5.1.3.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>2.2.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand All @@ -53,13 +83,13 @@
<artifactId>business-core</artifactId>
<version>${business.version}</version>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-async</artifactId>
<version>${mongodb.version}</version>
<scope>test</scope>
</dependency>
</dependency>
</dependencies>

</project>
35 changes: 22 additions & 13 deletions morphia/src/it/java/org/seedstack/mongodb/morphia/MorphiaIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,35 @@
*/
package org.seedstack.mongodb.morphia;

import com.google.inject.Inject;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.mongodb.morphia.Datastore;
import org.mongodb.morphia.Key;
import org.seedstack.seed.it.AbstractSeedIT;
import org.seedstack.mongodb.morphia.fixtures.user.Address;
import org.seedstack.mongodb.morphia.fixtures.user.User;
import org.seedstack.seed.it.AbstractSeedIT;

import com.google.inject.Inject;
import javax.validation.ConstraintViolationException;

import static org.assertj.core.api.Fail.fail;

public class MorphiaIT extends AbstractSeedIT {
@Inject
@MorphiaDatastore(clientName = "client1", dbName = "db1")
private Datastore datastore;

@Test
public void datastore_test() {
User user = new User(1L, "Gerard", "menvuça", new Address("France", "78300", "Poissy", "avenue de l'europe", 1));
Key<User> keyUser = datastore.save(user);
Assertions.assertThat(keyUser).isNotNull();
}

public class MorphiaIT extends AbstractSeedIT{
@Inject
@MorphiaDatastore(clientName = "client1",dbName="db1")
private Datastore datastore;

@Test
public void datastore_test(){
User user = new User(1L,"Gerard", "menvuça", new Address("France", "78300", "Poissy", "avenue de l'europe", 1));
Key<User> keyUser = datastore.save(user);
Assertions.assertThat(keyUser).isNotNull();
}
@Test(expected = ConstraintViolationException.class)
public void validation_is_working() {
User user = new User(1L, null, "menvuça", new Address("France", "78300", "Poissy", "avenue de l'europe", 1));
datastore.save(user);
fail("should not have saved");
}
}
211 changes: 110 additions & 101 deletions morphia/src/it/java/org/seedstack/mongodb/morphia/MorphiaRepositoryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,126 +7,135 @@
*/
package org.seedstack.mongodb.morphia;

import com.google.inject.*;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
import com.google.inject.util.Types;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.seedstack.business.domain.Repository;
import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy1;
import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy2;
import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy3;
import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy4;
import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy5;
import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy6;
import org.seedstack.mongodb.morphia.fixtures.user.Address;
import org.seedstack.mongodb.morphia.fixtures.user.User;
import org.seedstack.mongodb.morphia.internal.MorphiaErrorCodes;
import org.seedstack.seed.SeedException;
import org.seedstack.seed.it.AbstractSeedIT;
import org.seedstack.mongodb.morphia.fixtures.dummyobject.*;
import org.seedstack.mongodb.morphia.fixtures.user.Address;
import org.seedstack.mongodb.morphia.fixtures.user.User;

public class MorphiaRepositoryIT extends AbstractSeedIT {

@Inject
@Morphia
private Repository<User, Long> userRepository;
@Inject
@Morphia
private Repository<User, Long> userRepository;

@Inject
private Injector injector;

@Inject
private Injector injector;
@Test
public void repository_injection_test_no_client_for_aggregate() {
try {

@Test
public void repository_injection_test_no_client_for_aggregate() {
try {
injector.getInstance(
Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, Dummy1.class, Long.class)),
Morphia.class));
} catch (ProvisionException e) {
Assertions.assertThat(e.getCause().getMessage())
.isEqualTo(SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATASTORE_CLIENT).getMessage());
}
}

injector.getInstance(
Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, Dummy1.class, Long.class)),
Morphia.class));
} catch (ProvisionException e) {
Assertions.assertThat(e.getCause().getMessage())
.isEqualTo(SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATASTORE_CLIENT).getMessage());
}
}
@Test
public void repository_injection_test_no_dbName_for_aggregate() {
try {
injector.getInstance(
Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, Dummy2.class, Long.class)),
Morphia.class));
} catch (ProvisionException e) {
Assertions.assertThat(e.getCause().getMessage())
.isEqualTo(SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATASTORE_DATABASE).getMessage());
}
}

@Test
public void repository_injection_test_no_dbName_for_aggregate() {
try {
injector.getInstance(
Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, Dummy2.class, Long.class)),
Morphia.class));
} catch (ProvisionException e) {
Assertions.assertThat(e.getCause().getMessage())
.isEqualTo(SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATASTORE_DATABASE).getMessage());
}
}
@Test
public void repository_injection_test_no_mongoDb_client() {
try {
injector.getInstance(
Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, Dummy3.class, Long.class)),
Morphia.class));
} catch (ProvisionException e) {
Assertions.assertThat(e.getCause().getMessage())
.isEqualTo(SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATASTORE_CLIENT).getMessage());
}
}

@Test
public void repository_injection_test_no_mongoDb_client() {
try {
injector.getInstance(
Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, Dummy3.class, Long.class)),
Morphia.class));
} catch (ProvisionException e) {
Assertions.assertThat(e.getCause().getMessage())
.isEqualTo(SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATASTORE_CLIENT).getMessage());
}
}
@Test
public void repository_injection_test_no_mongoDb_database() {
try {
injector.getInstance(
Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, Dummy4.class, Long.class)),
Morphia.class));
} catch (ProvisionException e) {
Assertions.assertThat(e.getCause().getMessage())
.isEqualTo(SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATABASE_NAME).getMessage());
}
}

@Test
public void repository_injection_test_no_mongoDb_database() {
try {
injector.getInstance(
Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, Dummy4.class, Long.class)),
Morphia.class));
} catch (ProvisionException e) {
Assertions.assertThat(e.getCause().getMessage())
.isEqualTo(SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATABASE_NAME).getMessage());
}
}
@Test
public void repository_injection_test_no_mongodb_for_aggregate() {
try {
injector.getInstance(
Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, Dummy5.class, Long.class)),
Morphia.class));
} catch (ProvisionException e) {
Assertions.assertThat(e.getCause().getMessage())
.isEqualTo(SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATASTORE_CONFIGURATION).getMessage());
}
}

@Test
public void repository_injection_test_no_mongodb_for_aggregate() {
try {
injector.getInstance(
Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, Dummy5.class, Long.class)),
Morphia.class));
} catch (ProvisionException e) {
Assertions.assertThat(e.getCause().getMessage())
.isEqualTo(SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATASTORE_CONFIGURATION).getMessage());
}
}
@Test
public void repository_injection_async_client() {
try {
injector.getInstance(
Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, Dummy6.class, Long.class)),
Morphia.class));
} catch (ProvisionException e) {
Assertions.assertThat(e.getCause().getMessage())
.isEqualTo(SeedException.createNew(MorphiaErrorCodes.ERROR_ASYNC_CLIENT).getMessage());
}
}

@Test
public void repository_injection_async_client() {
try {
injector.getInstance(
Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, Dummy6.class, Long.class)),
Morphia.class));
} catch (ProvisionException e) {
Assertions.assertThat(e.getCause().getMessage())
.isEqualTo(SeedException.createNew(MorphiaErrorCodes.ERROR_ASYNC_CLIENT).getMessage());
}
}

@Test
public void mongodb_repository_test() {
Assertions.assertThat(userRepository).isNotNull();
User user1 = getUser(1L, "N°", "1");
userRepository.persist(user1);
User user2 = userRepository.load(user1.getEntityId());
Assertions.assertThat(user1.getId()).isEqualTo(user2.getId());
Assertions.assertThat(user1.getEntityId()).isEqualTo(user2.getEntityId());
userRepository.delete(user1);
User user3 = userRepository.load(user1.getEntityId());
Assertions.assertThat(user3).isEqualTo(null);
User user5 = getUser(2L, "N°", "2");
userRepository.delete(user5);
userRepository.save(user5);
User user6 = userRepository.load(user5.getEntityId());
Assertions.assertThat(user6.getId()).isEqualTo(user5.getId());
userRepository.delete(user5);
user6 = userRepository.load(user5.getEntityId());
Assertions.assertThat(user6).isEqualTo(null);
userRepository.persist(user5);
Assertions.assertThat(userRepository.load(2L)).isNotEqualTo(null);
}

@Test
public void mongodb_repository_test() {
Assertions.assertThat(userRepository).isNotNull();
User user1 = getUser(1L, "N°", "1");
userRepository.persist(user1);
User user2 = userRepository.load(user1.getEntityId());
Assertions.assertThat(user1.getId()).isEqualTo(user2.getId());
Assertions.assertThat(user1.getEntityId()).isEqualTo(user2.getEntityId());
userRepository.delete(user1);
User user3 = userRepository.load(user1.getEntityId());
Assertions.assertThat(user3).isEqualTo(null);
User user5 = getUser(2L, "N°", "2");
userRepository.delete(user5);
userRepository.save(user5);
User user6 = userRepository.load(user5.getEntityId());
Assertions.assertThat(user6.getId()).isEqualTo(user5.getId());
userRepository.delete(user5);
user6 = userRepository.load(user5.getEntityId());
Assertions.assertThat(user6).isEqualTo(null);
userRepository.persist(user5);
Assertions.assertThat(userRepository.load(2L)).isNotEqualTo(null);
}

public User getUser(long id, String firstname, String lastName) {
return new User(id, firstname, lastName, new Address("France", "75001", "Paris", "Champ Elysee avenue", 1));
}
public User getUser(long id, String firstname, String lastName) {
return new User(id, firstname, lastName, new Address("France", "75001", "Paris", "Champ Elysee avenue", 1));
}

}
8 changes: 4 additions & 4 deletions morphia/src/it/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

public class Dummy1 extends BaseAggregateRoot<Long> {

@Override
public Long getEntityId() {
return null;
}
@Override
public Long getEntityId() {
return null;
}

}
Loading