Merge branch '28-hibernate-5' into 'master'

Resolve "Hibernate 5"

Closes #28

See merge request !40

CHANGELOG.md

 # Changelog
 
+## 1.2 Release
+
+April 14, 2020
+
+1.2 is a service release that changes entity inheritance type to JOINED
+for improved query performance. See file-repository-core/src/main/resources/liquibase/liquibase-changeLog.yml
+for database upgrades.
+
+- cc20fbe JOINED inheritance strategy
+
+
 ## 1.1 Release
 
 April 2, 2020

file-repository-core/pom.xml

@@ -20,14 +20,13 @@
 	<parent>
 		<groupId>org.genesys-pgr</groupId>
 		<artifactId>file-repository</artifactId>
-		<version>1.2-SNAPSHOT</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>file-repository-core</artifactId>
 	<name>Genesys File Repository</name>
 	<description>Simple DublinCore file repository</description>
 
 	<properties>
-		<commons.io.version>2.4</commons.io.version>
 		<tika.version>1.14</tika.version>
 	</properties>
 
@@ -125,6 +124,13 @@
 			<version>${spring.security.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-library</artifactId>
+			<version>${org.hamcrest.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-test</artifactId>
@@ -162,7 +168,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-elasticsearch</artifactId>
-			<version>2.1.15.RELEASE</version>
+			<version>3.2.5.RELEASE</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -175,7 +181,7 @@
 		<!-- Hibernate dependencies -->
 		<dependency>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
+			<artifactId>hibernate-core</artifactId>
 			<version>${hibernate.version}</version>
 		</dependency>
 
@@ -204,7 +210,7 @@
 		<dependency>
 			<groupId>org.genesys-pgr</groupId>
 			<artifactId>application-blocks-security</artifactId>
-			<version>1.7-SNAPSHOT</version>
+			<version>${application.blocks.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tika</groupId>
@@ -219,7 +225,12 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.8.8</version>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>

file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFile.java

@@ -72,7 +72,7 @@ public class RepositoryFile extends AuditedVersionedModelWithoutId implements Ac
 	/** The Constant serialVersionUID. */
 	private static final long serialVersionUID = -4816923593950502695L;
 
-	public static final Sort DEFAULT_SORT = new Sort("originalFilename");
+	public static final Sort DEFAULT_SORT = Sort.by("originalFilename");
 
 	/** The id. */
 	@Id

file-repository-core/src/main/java/org/genesys/filerepository/model/RepositoryFolder.java

@@ -61,7 +61,7 @@ public class RepositoryFolder extends UuidModel implements AclAwareModel {
 	/** The Constant serialVersionUID. */
 	private static final long serialVersionUID = -7947000802758739238L;
 
-	public static final Sort DEFAULT_SORT = new Sort("name");
+	public static final Sort DEFAULT_SORT = Sort.by("name");
 
 	/**
 	 * Reference to parent Folder. Root folders have this set to null. This

file-repository-core/src/main/java/org/genesys/filerepository/persistence/ImageGalleryPersistence.java

@@ -19,14 +19,14 @@ package org.genesys.filerepository.persistence;
 import org.genesys.filerepository.model.ImageGallery;
 import org.genesys.filerepository.model.RepositoryFolder;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.stereotype.Repository;
 
 /**
  * The Interface ImageGalleryPersistence.
  */
 @Repository
-public interface ImageGalleryPersistence extends JpaRepository<ImageGallery, Long>, QueryDslPredicateExecutor<ImageGallery> {
+public interface ImageGalleryPersistence extends JpaRepository<ImageGallery, Long>, QuerydslPredicateExecutor<ImageGallery> {
 
 	/**
 	 * Find gallery for specified path.

file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryFilePersistence.java

@@ -23,7 +23,7 @@ import org.genesys.filerepository.RepositoryPersistence;
 import org.genesys.filerepository.model.RepositoryFile;
 import org.genesys.filerepository.model.RepositoryFolder;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Repository;
  *
  */
 @Repository
-public interface RepositoryFilePersistence extends RepositoryPersistence<RepositoryFile>, QueryDslPredicateExecutor<RepositoryFile> {
+public interface RepositoryFilePersistence extends RepositoryPersistence<RepositoryFile>, QuerydslPredicateExecutor<RepositoryFile> {
 
 	/**
 	 * Find by uuid.

file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryFolderRepository.java

@@ -22,14 +22,14 @@ import java.util.UUID;
 import org.genesys.filerepository.RepositoryPersistence;
 import org.genesys.filerepository.model.RepositoryFolder;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.stereotype.Repository;
 
 /**
  * JPA Repository for {@link RepositoryFolder}
  */
 @Repository
-public interface RepositoryFolderRepository extends RepositoryPersistence<RepositoryFolder>, QueryDslPredicateExecutor<RepositoryFolder> {
+public interface RepositoryFolderRepository extends RepositoryPersistence<RepositoryFolder>, QuerydslPredicateExecutor<RepositoryFolder> {
 
 	/**
 	 * Find by uuid.

file-repository-core/src/main/java/org/genesys/filerepository/persistence/RepositoryImagePersistence.java

@@ -23,14 +23,14 @@ import org.genesys.filerepository.RepositoryPersistence;
 import org.genesys.filerepository.model.RepositoryFolder;
 import org.genesys.filerepository.model.RepositoryImage;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.stereotype.Repository;
 
 /**
  * The Interface RepositoryImagePersistence.
  */
 @Repository
-public interface RepositoryImagePersistence extends RepositoryPersistence<RepositoryImage>, QueryDslPredicateExecutor<RepositoryImage> {
+public interface RepositoryImagePersistence extends RepositoryPersistence<RepositoryImage>, QuerydslPredicateExecutor<RepositoryImage> {
 
 	/**
 	 * Find by uuid.

file-repository-core/src/main/java/org/genesys/filerepository/service/impl/ImageGalleryServiceImpl.java

@@ -56,6 +56,8 @@ import org.springframework.util.CollectionUtils;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
+import javax.persistence.EntityNotFoundException;
+
 /**
  * Image Gallery service.
  */
@@ -235,7 +237,7 @@ public class ImageGalleryServiceImpl implements ImageGalleryService {
 	@Transactional
 	@PreAuthorize("hasRole('ADMINISTRATOR') or hasPermission(#imageGallery, 'write')")
 	public ImageGallery updateImageGalery(final ImageGallery imageGallery, final String title, final String description) {
-		final ImageGallery imageGallery2 = imageGalleryPersistence.findOne(imageGallery.getId());
+		final ImageGallery imageGallery2 = imageGalleryPersistence.findById(imageGallery.getId()).orElseThrow(() -> new EntityNotFoundException("Record not found."));
 
 		imageGallery2.setTitle(title);
 		imageGallery2.setDescription(description);
@@ -254,7 +256,7 @@ public class ImageGalleryServiceImpl implements ImageGalleryService {
 	@Transactional
 	@PreAuthorize("hasRole('ADMINISTRATOR') or hasPermission(#imageGallery, 'write')")
 	public ImageGallery saveImageOrder(final ImageGallery imageGallery) {
-		final ImageGallery imageGallery2 = imageGalleryPersistence.findOne(imageGallery.getId());
+		final ImageGallery imageGallery2 = imageGalleryPersistence.findById(imageGallery.getId()).orElseThrow(() -> new EntityNotFoundException("Record not found."));
 
 		imageGallery2.setImages(imageGallery.getImages());
 		imageGalleryPersistence.save(imageGallery2);
@@ -266,7 +268,7 @@ public class ImageGalleryServiceImpl implements ImageGalleryService {
 	
 	@Override
 	public void ensureThumbnails(final ImageGallery imageGallery) {
-		final ImageGallery imageGallery2 = imageGalleryPersistence.findOne(imageGallery.getId());
+		final ImageGallery imageGallery2 = imageGalleryPersistence.findById(imageGallery.getId()).orElseThrow(() -> new EntityNotFoundException("Record not found."));
 
 		if (CollectionUtils.isEmpty(imageGallery2.getImages())) {
 			LOG.debug("ImageGallery has no images, skipping thumbnail generation for path=" + imageGallery2.getPath());
@@ -325,7 +327,7 @@ public class ImageGalleryServiceImpl implements ImageGalleryService {
 	@Override
 	public void ensureThumbnails(final ImageGallery imageGallery, final Integer width, final Integer height) {
 
-		final ImageGallery imageGallery2 = imageGalleryPersistence.findOne(imageGallery.getId());
+		final ImageGallery imageGallery2 = imageGalleryPersistence.findById(imageGallery.getId()).orElseThrow(() -> new EntityNotFoundException("Record not found."));
 
 		if (CollectionUtils.isEmpty(imageGallery2.getImages())) {
 			LOG.debug("ImageGallery has no images, skipping thumbnail generation for path=" + imageGallery2.getPath());

file-repository-core/src/test/java/org/genesys/filerepository/config/DatabaseConfig.java

@@ -33,7 +33,7 @@ import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.orm.hibernate4.HibernateExceptionTranslator;
+import org.springframework.orm.hibernate5.HibernateExceptionTranslator;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;

file-repository-core/src/test/java/org/genesys/filerepository/config/ServiceBeanConfig.java

@@ -35,13 +35,11 @@ import org.genesys.filerepository.service.impl.S3StorageServiceImpl;
 import org.genesys.filerepository.service.impl.ThumbnailGenerator1;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -74,13 +72,13 @@ public class ServiceBeanConfig implements InitializingBean, DisposableBean {
 	 * @return the property placeholder configurer
 	 */
 	@Bean
-	public static PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() {
-		final PropertyPlaceholderConfigurer propertyPlaceholderConfigurer = new PropertyPlaceholderConfigurer();
+	public static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
+		final PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer = new PropertySourcesPlaceholderConfigurer();
 		// Need to ignore "genesys.properties" if not found
 		propertyPlaceholderConfigurer.setIgnoreResourceNotFound(true);
 		propertyPlaceholderConfigurer.setFileEncoding("utf-8");
 
-		propertyPlaceholderConfigurer.setLocations(new Resource[] { new ClassPathResource("spring/spring.properties") });
+		propertyPlaceholderConfigurer.setLocations(new ClassPathResource("spring/spring.properties"));
 
 		return propertyPlaceholderConfigurer;
 	}

file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryAddTest.java

@@ -16,8 +16,9 @@
 
 package org.genesys.filerepository.service;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.nio.file.Path;

file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryDirectoryTest.java

@@ -16,8 +16,8 @@
 
 package org.genesys.filerepository.service;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
 
 import java.io.IOException;
 import java.nio.file.Path;

file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryTestUtil.java

@@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.IOException;
 import java.io.InputStream;

file-repository-core/src/test/java/org/genesys/filerepository/service/FileRepositoryUpdateTest.java

@@ -17,7 +17,7 @@
 package org.genesys.filerepository.service;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.IOException;
 import java.nio.file.Path;

file-repository-core/src/test/java/org/genesys/filerepository/service/FileSystemStorageTest.java

@@ -17,7 +17,7 @@
 package org.genesys.filerepository.service;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.io.FileNotFoundException;

file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryTest.java

@@ -17,7 +17,7 @@
 package org.genesys.filerepository.service;
 
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import javax.persistence.EntityNotFoundException;
 import javax.transaction.Transactional;
 
 import org.genesys.filerepository.InvalidRepositoryFileDataException;
@@ -150,7 +151,7 @@ public class ImageGalleryTest extends RepositoryServiceTest {
 	/**
 	 * Update gallery blah null.
 	 */
-	@Test(expected = NullPointerException.class)
+	@Test(expected = EntityNotFoundException.class)
 	public void updateGalleryBlahNull() {
 		imageGalleryService.updateImageGalery(new ImageGallery(), null, null);
 	}
@@ -409,19 +410,19 @@ public class ImageGalleryTest extends RepositoryServiceTest {
 		imageGalleryService.createImageGallery(initialPath.resolve("gallery2"), DEFAULT_GALLERY_TITLE, DEFAULT_GALLERY_DESCRIPTION);
 		imageGalleryService.createImageGallery(initialPath.resolve("sub/gallery3"), DEFAULT_GALLERY_TITLE, DEFAULT_GALLERY_DESCRIPTION);
 
-		Page<ImageGallery> page = imageGalleryService.listImageGalleries(new PageRequest(0, 3));
+		Page<ImageGallery> page = imageGalleryService.listImageGalleries(PageRequest.of(0, 3));
 		assertThat(page.getContent().size(), is(3));
 		assertThat(page.getTotalElements(), is(3l));
 
-		page = imageGalleryService.listImageGalleries(new PageRequest(0, 2));
+		page = imageGalleryService.listImageGalleries(PageRequest.of(0, 2));
 		assertThat(page.getContent().size(), is(2));
 		assertThat(page.getTotalElements(), is(3l));
 
-		page = imageGalleryService.listImageGalleries(initialPath, new PageRequest(0, 3));
+		page = imageGalleryService.listImageGalleries(initialPath, PageRequest.of(0, 3));
 		assertThat(page.getContent().size(), is(3));
 		assertThat(page.getTotalElements(), is(3l));
 
-		page = imageGalleryService.listImageGalleries(initialPath.resolve("sub"), new PageRequest(0, 3));
+		page = imageGalleryService.listImageGalleries(initialPath.resolve("sub"), PageRequest.of(0, 3));
 		assertThat(page.getContent().size(), is(1));
 		assertThat(page.getTotalElements(), is(1l));
 	}

file-repository-core/src/test/java/org/genesys/filerepository/service/ImageGalleryThumbnailsTest.java

@@ -16,8 +16,8 @@
 
 package org.genesys.filerepository.service;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;

file-repository-core/src/test/java/org/genesys/filerepository/service/MetadataTest.java

@@ -17,7 +17,7 @@
 package org.genesys.filerepository.service;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.IOException;
 import java.nio.file.Path;

file-repository-core/src/test/java/org/genesys/filerepository/service/RepositoryFolderTest.java

@@ -17,7 +17,7 @@
 package org.genesys.filerepository.service;
 
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;