Merge branch 'release-1.4' into 'master'

Release 1.4

See merge request genesys-pgr/application-blocks!34

CHANGELOG.md

 # Changelog
 
+## 1.4 Release
+
+September 19, 2018.
+
+- 4456892 Added support for **IS_NULL**, **IS_NOT_NULL** and **NOT** filtering
+- c72e9c4 `BasicModelFilter#toString()` as JSON
+- 855d7fc Model filters should be abstract
+- 1038e7d Test if password matches after user is created
+- 4ed845f Updated javadoc
+- e47c0f1 Added setters to `OAuthClient` for Jackson deserialization
+- 566f5e6 `BasicModel#id` is included in Minimal JSON view
+- 37d4869 Added method to clean up ACL entries
+- 669962d `PermissionWriter` updated
+- bce713c Improved collection handling in Audit Log
+- 22502ff `SelfCleaning` trims strings to `null`
+- 8eb3871 **FIX:** Build fails
+- 0163e53 Remove all ACL data when `AclAwareModel` is deleted
+- eb23106 `AclAwareModel` exposes `#aclParentObject` for inheriting permissions
+- 4817a4c Added `UuidModelFilter`
+- 445adbb Added `JsonViews.Indexed` for tagging properties that should be posted to indexing service
+- 3cc46a8 JSON prop `_type` conflicts with Elasticsearch
+- 53efa2c `@Type` annotations for `@Lob`
+
+
 ## 1.3.2 Release
 
 - 0a1ff49 Updated OAuth service

README.md

@@ -21,7 +21,7 @@ The **core** provides common data models: `BasicModel`, `VersionedModel`, `Audit
 <dependency>
     <groupId>org.genesys-pgr</groupId>
     <artifactId>application-blocks-core</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4</version>
 </dependency>
 ```
 
@@ -33,7 +33,7 @@ The **security** module provides generic `User` declaration, ACL model and servi
 <dependency>
   <groupId>org.genesys-pgr</groupId>
   <artifactId>application-blocks-security</artifactId>
-  <version>1.4-SNAPSHOT</version>
+  <version>1.4</version>
 </dependency>
 ```
 
@@ -45,6 +45,6 @@ The **auditlog** provides the model and services to capture changes to JPA entit
 <dependency>
     <groupId>org.genesys-pgr</groupId>
     <artifactId>application-blocks-auditlog</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4</version>
 </dependency>
 ```

auditlog/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.genesys-pgr</groupId>
 		<artifactId>application-blocks-parent</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>1.5-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>application-blocks-auditlog</artifactId>
@@ -79,13 +79,13 @@
 		<dependency>
 			<groupId>org.genesys-pgr</groupId>
 			<artifactId>application-blocks-security</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>1.5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.genesys-pgr</groupId>
 			<artifactId>application-blocks-core</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>1.5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

auditlog/src/main/java/org/genesys/blocks/auditlog/annotations/Audited.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/main/java/org/genesys/blocks/auditlog/annotations/NotAudited.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/main/java/org/genesys/blocks/auditlog/component/AuditTrailInterceptor.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -771,6 +771,16 @@ public class AuditTrailInterceptor extends EmptyInterceptor implements Initializ
 		}
 	}
 
+	/**
+	 * Try method.
+	 *
+	 * @param entity the entity
+	 * @param methodName the method name
+	 * @return the boolean
+	 * @throws NoSuchMethodException the no such method exception
+	 * @throws IllegalAccessException the illegal access exception
+	 * @throws InvocationTargetException the invocation target exception
+	 */
 	public Boolean tryMethod(final Object entity, final String methodName) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
 		final Method getter = entity.getClass().getMethod(methodName);
 		if (getter != null) {

auditlog/src/main/java/org/genesys/blocks/auditlog/model/AuditAction.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/main/java/org/genesys/blocks/auditlog/model/AuditLog.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/main/java/org/genesys/blocks/auditlog/model/TransactionAuditLog.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/main/java/org/genesys/blocks/auditlog/model/filters/AuditLogFilter.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/main/java/org/genesys/blocks/auditlog/persistence/AuditLogCustomRepository.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,8 +64,8 @@ public interface AuditLogCustomRepository {
 	Page<AuditLog> listAuditLogs(AuditLogFilter filters, Pageable page);
 
 	/**
-	 * Load entity from database by classname and id
-	 * 
+	 * Load entity from database by classname and id.
+	 *
 	 * @param classPk classPK of the entity
 	 * @param id the internal database id of the entity
 	 * @return the persisted entity of type classPk

auditlog/src/main/java/org/genesys/blocks/auditlog/persistence/AuditLogRepository.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/main/java/org/genesys/blocks/auditlog/persistence/AuditLogRepositoryCustomImpl.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/main/java/org/genesys/blocks/auditlog/service/AuditTrailService.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/main/java/org/genesys/blocks/auditlog/service/ClassPKService.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/main/java/org/genesys/blocks/auditlog/service/impl/AuditTrailServiceImpl.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/main/java/org/genesys/blocks/auditlog/service/impl/ClassPKServiceImpl.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/test/java/org/genesys/blocks/auditlog/component/AuditTrailInterceptorTest.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,12 @@ import java.util.stream.Stream;
 import org.genesys.blocks.auditlog.annotations.Audited;
 import org.junit.Test;
 
+/**
+ * The Class AuditTrailInterceptorTest.
+ */
 public class AuditTrailInterceptorTest {
+	
+	/** The audit trail interceptor. */
 	AuditTrailInterceptor auditTrailInterceptor = new AuditTrailInterceptor();
 
 	private abstract class AbstractSuperClass {
@@ -61,6 +66,9 @@ public class AuditTrailInterceptorTest {
 		auditTrailInterceptor.setAuditedClasses(Stream.of(AbstractSuperClass.class, SuperInterface.class, StandaloneClass.class).collect(Collectors.toSet()));
 	}
 
+	/**
+	 * Test primitive types.
+	 */
 	@Test
 	public void testPrimitiveTypes() {
 		assertThat(auditTrailInterceptor.isPrimitiveType(Long.class), is(true));
@@ -80,6 +88,9 @@ public class AuditTrailInterceptorTest {
 		assertThat(auditTrailInterceptor.isPrimitiveType(UUID.class), is(true));
 	}
 
+	/**
+	 * Test audited.
+	 */
 	@Test
 	public void testAudited() {
 		for (int i = 0; i < 10; i++) {

auditlog/src/test/java/org/genesys/blocks/auditlog/model/AuditLogEntityTest.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,9 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
 
+/**
+ * The Class AuditLogEntityTest.
+ */
 public class AuditLogEntityTest extends EntityTest<AuditLog, AuditLogRepository> {
 
 	@Autowired
@@ -44,11 +47,17 @@ public class AuditLogEntityTest extends EntityTest<AuditLog, AuditLogRepository>
 		assertThat(repository.count(), is(0l));
 	}
 
+	/**
+	 * Fail persist.
+	 */
 	@Test(expected = DataIntegrityViolationException.class)
 	public void failPersist() {
 		repository.save(new AuditLog());
 	}
 
+	/**
+	 * Successful persist.
+	 */
 	@Test
 	public void successfulPersist() {
 		final AuditLog log = makeDefault();

auditlog/src/test/java/org/genesys/blocks/auditlog/model/ClassPKEntityTest.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,9 @@ import org.genesys.blocks.persistence.ClassPKRepository;
 import org.junit.Test;
 import org.springframework.dao.DataIntegrityViolationException;
 
+/**
+ * The Class ClassPKEntityTest.
+ */
 public class ClassPKEntityTest extends EntityTest<ClassPK, ClassPKRepository> {
 
 	@Override
@@ -33,17 +36,26 @@ public class ClassPKEntityTest extends EntityTest<ClassPK, ClassPKRepository> {
 		repository.deleteAll();
 	}
 
+	/**
+	 * Fail persist.
+	 */
 	@Test(expected = DataIntegrityViolationException.class)
 	public void failPersist() {
 		repository.save(new ClassPK());
 	}
 
+	/**
+	 * Fail duplicate.
+	 */
 	@Test(expected = DataIntegrityViolationException.class)
 	public void failDuplicate() {
 		repository.save(makeClassPK(Long.class));
 		repository.save(makeClassPK(Long.class));
 	}
 
+	/**
+	 * Successful persist.
+	 */
 	@Test
 	public void successfulPersist() {
 		final ClassPK cpk = repository.save(makeClassPK(Long.class));

auditlog/src/test/java/org/genesys/blocks/auditlog/model/ExampleAuditedEntity.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,9 @@ import javax.persistence.Table;
 import org.genesys.blocks.auditlog.annotations.Audited;
 import org.genesys.blocks.model.BasicModel;
 
+/**
+ * The Class ExampleAuditedEntity.
+ */
 @Entity
 @Table(name = "exampleauditedentity")
 @Audited
@@ -54,34 +57,74 @@ public class ExampleAuditedEntity extends BasicModel {
 	@CollectionTable(name = "entity_set", joinColumns = @JoinColumn(name = "entityId", referencedColumnName = "id"))
 	private Set<String> set;
 
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
 	public String getName() {
 		return name;
 	}
 
+	/**
+	 * Sets the name.
+	 *
+	 * @param name the new name
+	 */
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	/**
+	 * Sets the reference.
+	 *
+	 * @param refEntity the new reference
+	 */
 	public void setReference(ExampleAuditedEntity refEntity) {
 		this.reference = refEntity;
 	}
 
+	/**
+	 * Gets the reference.
+	 *
+	 * @return the reference
+	 */
 	public ExampleAuditedEntity getReference() {
 		return reference;
 	}
 
+	/**
+	 * Gets the list.
+	 *
+	 * @return the list
+	 */
 	public List<Long> getList() {
 		return list;
 	}
 	
+	/**
+	 * Sets the list.
+	 *
+	 * @param list the new list
+	 */
 	public void setList(List<Long> list) {
 		this.list = list;
 	}
 	
+	/**
+	 * Gets the sets the.
+	 *
+	 * @return the sets the
+	 */
 	public Set<String> getSet() {
 		return set;
 	}
 	
+	/**
+	 * Sets the sets the.
+	 *
+	 * @param set the new sets the
+	 */
 	public void setSet(Set<String> set) {
 		this.set = set;
 	}

auditlog/src/test/java/org/genesys/blocks/auditlog/persistence/ExampleAuditedEntityRepository.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

auditlog/src/test/java/org/genesys/blocks/auditlog/service/AuditTrailServiceTest.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,9 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
 
+/**
+ * The Class AuditTrailServiceTest.
+ */
 public class AuditTrailServiceTest extends ServiceTest {
 
 	@Autowired
@@ -57,6 +60,9 @@ public class AuditTrailServiceTest extends ServiceTest {
 		auditLogRepository.deleteAll();
 	}
 
+	/**
+	 * Save 1.
+	 */
 	@Test
 	public void save1() {
 		final Long entity = new Long(42);
@@ -71,6 +77,9 @@ public class AuditTrailServiceTest extends ServiceTest {
 		assertThat(log.getReferencedEntity(), nullValue());
 	}
 
+	/**
+	 * Save ref ent.
+	 */
 	@Test
 	public void saveRefEnt() {
 		final Long entity = new Long(42);
@@ -86,6 +95,9 @@ public class AuditTrailServiceTest extends ServiceTest {
 		assertThat(log.getReferencedEntity(), equalTo(classPkService.getClassPk(AuditLog.class)));
 	}
 
+	/**
+	 * Test example audited entity.
+	 */
 	@Test
 	public void testExampleAuditedEntity() {
 		ExampleAuditedEntity entity = new ExampleAuditedEntity();
@@ -100,6 +112,9 @@ public class AuditTrailServiceTest extends ServiceTest {
 		assertThat(listAuditLogs(entity), hasSize(1));
 	}
 
+	/**
+	 * Test transactional list query.
+	 */
 	@Test
 	public void testTransactionalListQuery() {
 		ExampleAuditedEntity entity = exampleAuditedEntityService.testList();
@@ -115,6 +130,9 @@ public class AuditTrailServiceTest extends ServiceTest {
 		assertThat(lastLog.getNewState(), is(entity.getName()));
 	}
 
+	/**
+	 * Test delete.
+	 */
 	@Test
 	public void testDelete() {
 		ExampleAuditedEntity entity = exampleAuditedEntityService.testList();
@@ -131,6 +149,9 @@ public class AuditTrailServiceTest extends ServiceTest {
 		assertThat(lastLog.getPreviousState(), is(entity.getName()));
 	}
 
+	/**
+	 * Test rollback.
+	 */
 	@Test
 	public void testRollback() {
 		ExampleAuditedEntity entity = new ExampleAuditedEntity();
@@ -153,6 +174,9 @@ public class AuditTrailServiceTest extends ServiceTest {
 		}
 	}
 
+	/**
+	 * Test load referenced entity.
+	 */
 	@Test
 	public void testLoadReferencedEntity() {
 		ExampleAuditedEntity entity = new ExampleAuditedEntity();
@@ -169,6 +193,9 @@ public class AuditTrailServiceTest extends ServiceTest {
 		assertThat(((ExampleAuditedEntity) lookup).getId(), is(entity.getId()));
 	}
 
+	/**
+	 * Test referenced entity audit log.
+	 */
 	@Test
 	public void testReferencedEntityAuditLog() {
 		ExampleAuditedEntity refEntity = new ExampleAuditedEntity();
@@ -191,6 +218,9 @@ public class AuditTrailServiceTest extends ServiceTest {
 		assertThat(((ExampleAuditedEntity) listAuditLogs(entity).get(0).getNewEntity()).getId(), is(refEntity.getId()));
 	}
 
+	/**
+	 * Test embedded collections.
+	 */
 	@Test
 	public void testEmbeddedCollections() {
 		ExampleAuditedEntity entity = new ExampleAuditedEntity();

auditlog/src/test/java/org/genesys/blocks/auditlog/service/ClassPKServiceTest.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,9 @@ import org.genesys.blocks.auditlog.test.ServiceTest;
 import org.genesys.blocks.model.ClassPK;
 import org.junit.Test;
 
+/**
+ * The Class ClassPKServiceTest.
+ */
 public class ClassPKServiceTest extends ServiceTest {
 
 	@Override
@@ -33,6 +36,9 @@ public class ClassPKServiceTest extends ServiceTest {
 		classPkRepository.deleteAll();
 	}