HHH-8844 - Add support for Java 8 date and time types (JSR-310)

Author: sebersole

build.gradle

@@ -22,6 +22,7 @@ buildscript {
     repositories {
         mavenCentral()
         mavenLocal()
+		jcenter()
 
         maven {
             name 'jboss-nexus'
@@ -120,9 +121,6 @@ subprojects { subProject ->
 			// todo : need to make sure these are non-exported
 			description = 'Non-exported compile-time dependencies.'
 		}
-		jbossLoggingTool {
-			description = "Dependencies for running the JBoss logging AnnotationProcessor tool"
-		}
 		jaxb {
 			description = 'Dependencies for running ant xjc (jaxb class generation)'
 		}
@@ -149,8 +147,6 @@ subprojects { subProject ->
 		testRuntime( libraries.h2 )
 		testRuntime( libraries.woodstox )
 
-		jbossLoggingTool( libraries.logging_processor )
-
 		jaxb( libraries.jaxb ){
 			exclude group: "javax.xml.stream"
 		}
@@ -159,7 +155,6 @@ subprojects { subProject ->
 		jaxb( libraries.jaxb2_jaxb )
 		jaxb( libraries.jaxb2_jaxb_xjc )
 
-		animalSniffer ( libraries.animal_sniffer )
 		javaApiSignature ( libraries.java16_signature )
 	}
 
@@ -273,32 +268,10 @@ subprojects { subProject ->
 	// Gradle plugin).  For now, just compile first in order to get the logging classes.
 	eclipseClasspath.dependsOn generateSources
 
-
-	// Animal Sniffer ~~~~~~~~~~~~~~~~~~
-	//      add animal sniffer Java API checking to the main compile tasks
-
-	// copy the resolved Animal Sniffer signature dependency artifact to a known location and name
-	task copyJavaApiSignature(type: Copy) {
-		from configurations.javaApiSignature
-		into "$buildDir/javaApiSignature/"
-		rename '.*signature', 'javaApi.signature'
-	}
-
-	// prepare the Animal Sniffer signature copy every time (before) we compile
-	compileJava.dependsOn copyJavaApiSignature
-
-	// and then after compilation, run the Animal Sniffer tool
-	compileJava.doLast {
-		ant.taskdef(
-				name: 'animalSniffer',
-				classname: 'org.codehaus.mojo.animal_sniffer.ant.CheckSignatureTask',
-				classpath: configurations.animalSniffer.asPath
-		)
-
-		ant.animalSniffer(
-				signature: "$buildDir/javaApiSignature/javaApi.signature",
-				classpath: sourceSets.main.compileClasspath.asPath) {
-			path( path: sourceSets.main.output.classesDir )
+	if ( subProject.name != 'hibernate-java8' ) {
+		apply plugin: org.hibernate.build.animalsniffer.AnimalSnifferPlugin
+		animalsniffer {
+			signature = "org.codehaus.mojo.signature:java16:+@signature"
 		}
 	}
 

buildSrc/build.gradle

@@ -0,0 +1,12 @@
+repositories {
+	mavenCentral()
+}
+
+apply plugin: "groovy"
+
+dependencies {
+	compile gradleApi()
+	compile localGroovy()
+
+	compile "org.codehaus.mojo:animal-sniffer:1.14"
+}

buildSrc/src/main/groovy/org/hibernate/build/animalsniffer/AnimalSnifferPlugin.groovy

@@ -0,0 +1,92 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2015, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.build.animalsniffer
+
+import org.gradle.api.Action
+import org.gradle.api.GradleException
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.plugins.JavaPlugin
+
+import groovy.transform.Canonical
+import org.codehaus.mojo.animal_sniffer.SignatureChecker
+import org.codehaus.mojo.animal_sniffer.logging.Logger
+import org.slf4j.LoggerFactory
+
+class AnimalSnifferPlugin implements Plugin<Project> {
+	private org.slf4j.Logger logger = LoggerFactory.getLogger( this.class )
+
+	@Override
+	void apply(Project project) {
+		project.configurations.maybeCreate( "signature" )
+		final AnimalSnifferExtension extension = project.extensions.create( "animalsniffer", AnimalSnifferExtension )
+
+		project.tasks.findByName( JavaPlugin.CLASSES_TASK_NAME ).doLast(
+				new Action<Task>() {
+					@Override
+					void execute(Task task) {
+						if ( extension.skip ) {
+							return;
+						}
+
+						def logger = new GradleLogger( logger )
+						def signatures = project.configurations.signature.resolvedConfiguration.resolvedArtifacts*.file
+						signatures.each {
+							SignatureChecker signatureChecker = new SignatureChecker(
+									it.newInputStream(),
+									Collections.emptySet(),
+									logger
+							)
+							signatureChecker.setCheckJars( false );
+
+							List<File> sourceDirs = new ArrayList<File>();
+							sourceDirs.addAll( task.project.sourceSets.main.java.srcDirs )
+							signatureChecker.setSourcePath( sourceDirs )
+
+							signatureChecker.process( project.file( task.project.sourceSets.main.output.classesDir ) );
+
+							if ( signatureChecker.isSignatureBroken() ) {
+								throw new GradleException(
+										"Signature errors found. Verify them and ignore them with the proper annotation if needed."
+								);
+							}
+						}
+					}
+				}
+		);
+	}
+}
+
+@Canonical
+class GradleLogger implements Logger {
+	@Delegate
+	org.slf4j.Logger logger
+}
+
+class AnimalSnifferExtension {
+	String signature = ""
+	String[] signatures = []
+	boolean skip = false
+}

hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java

@@ -33,7 +33,7 @@
  *
  * @author Steve Ebersole
  */
-public class Identifier {
+public class Identifier implements Comparable<Identifier> {
 	private final String text;
 	private final boolean isQuoted;
 
@@ -211,5 +211,10 @@ public static Identifier quote(Identifier identifier) {
 				? identifier
 				: Identifier.toIdentifier( identifier.getText(), true );
 	}
+
+	@Override
+	public int compareTo(Identifier o) {
+		return getCanonicalName().compareTo( o.getCanonicalName() );
+	}
 }
 

hibernate-core/src/main/java/org/hibernate/boot/model/relational/Database.java

@@ -26,9 +26,9 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
@@ -48,7 +48,7 @@ public class Database {
 
 	private Schema implicitSchema;
 
-	private final Map<Schema.Name,Schema> schemaMap = new HashMap<Schema.Name, Schema>();
+	private final Map<Schema.Name,Schema> schemaMap = new TreeMap<Schema.Name, Schema>();
 
 	private List<AuxiliaryDatabaseObject> auxiliaryDatabaseObjects;
 	private List<InitCommand> initCommands;

hibernate-core/src/main/java/org/hibernate/boot/model/relational/Schema.java

@@ -24,8 +24,8 @@
 package org.hibernate.boot.model.relational;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeMap;
 
 import org.hibernate.HibernateException;
 import org.hibernate.boot.model.naming.Identifier;
@@ -48,8 +48,8 @@ public class Schema {
 
 	private final Name physicalName;
 
-	private Map<Identifier, Table> tables = new HashMap<Identifier, Table>();
-	private Map<Identifier, Sequence> sequences = new HashMap<Identifier, Sequence>();
+	private Map<Identifier, Table> tables = new TreeMap<Identifier, Table>();
+	private Map<Identifier, Sequence> sequences = new TreeMap<Identifier, Sequence>();
 
 	public Schema(Database database, Name name) {
 		this.database = database;
@@ -168,7 +168,7 @@ public Iterable<Sequence> getSequences() {
 		return sequences.values();
 	}
 
-	public static class Name {
+	public static class Name implements Comparable<Name> {
 		private final Identifier catalog;
 		private final Identifier schema;
 
@@ -211,5 +211,38 @@ public int hashCode() {
 			result = 31 * result + (schema != null ? schema.hashCode() : 0);
 			return result;
 		}
+
+		@Override
+		public int compareTo(Name that) {
+			// per Comparable, the incoming Name cannot be null.  However, its catalog/schema might be
+			// so we need to account for that.
+			int catalogCheck = ComparableHelper.compare( this.getCatalog(), that.getCatalog() );
+			if ( catalogCheck != 0 ) {
+				return catalogCheck;
+			}
+
+			return ComparableHelper.compare( this.getSchema(), that.getSchema() );
+		}
+	}
+
+	public static class ComparableHelper {
+		public static <T extends Comparable<T>> int compare(T first, T second) {
+			if ( first == null ) {
+				if ( second == null ) {
+					return 0;
+				}
+				else {
+					return 1;
+				}
+			}
+			else {
+				if ( second == null ) {
+					return -1;
+				}
+				else {
+					return first.compareTo( second );
+				}
+			}
+		}
 	}
 }

hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java

@@ -33,7 +33,7 @@
  * @author Gavin King
  * @author Steve Ebersole
  */
-public class ComparableComparator implements Comparator<Comparable>, Serializable {
+public class ComparableComparator<T extends Comparable> implements Comparator<T>, Serializable {
 	public static final Comparator INSTANCE = new ComparableComparator();
 
 	@SuppressWarnings({ "unchecked" })

hibernate-core/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java

@@ -22,7 +22,6 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.test.criteria;
-import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,19 +35,24 @@
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.dialect.TeradataDialect;
-import org.hibernate.test.hql.StateProvince;
+
 import org.hibernate.testing.SkipForDialect;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.hibernate.test.hql.StateProvince;
+import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * HHH-2166 Long "in" lists in queries results in a Java stack overflow
  * exception. to reproduce this issue, you should add
  * "<argLine>-Xss128k</argLine>" to the surefire plugin (test on Fedora 12)
  * 
  * @author Strong Liu
  */
+@Ignore
 public class LongInElementsTest extends BaseCoreFunctionalTestCase {
 	private static final int ELEMENTS_SIZE = 4000;
 

hibernate-envers/hibernate-envers.gradle

@@ -1,11 +1,5 @@
 apply plugin: 'hibernate-matrix-testing'
 
-configurations {
-    hibernateJpaModelGenTool {
-        description = "Dependencies for running the Hibernate JPA Metamodel Generator AnnotationProcessor tool"
-    }
-}
-
 dependencies {
     compile( project( ':hibernate-core' ) )
     compile( project( ':hibernate-entitymanager' ) )
@@ -17,8 +11,6 @@ dependencies {
     testCompile( project(path: ':hibernate-entitymanager', configuration: 'tests') )
 
     testRuntime( libraries.javassist )
-
-    hibernateJpaModelGenTool( project( ':hibernate-jpamodelgen' ) )
 }
 
 def pomName() {
@@ -48,8 +40,6 @@ sourceSets {
     }
 }
 
-addMetaGenProcessor( sourceSets.main )
-
 jar {
     manifest {
         instructionFirst 'Import-Package',

hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversMessageLogger.java

@@ -23,8 +23,7 @@
  */
 package org.hibernate.envers.internal;
 
-import org.hibernate.internal.CoreMessageLogger;
-
+import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageLogger;
@@ -38,7 +37,7 @@
  * New messages must be added after the last message defined to ensure message codes are unique.
  */
 @MessageLogger(projectCode = "HHH")
-public interface EnversMessageLogger extends CoreMessageLogger {
+public interface EnversMessageLogger extends BasicLogger {
 	/**
 	 * Message indicating that user attempted to use the deprecated ValidTimeAuditStrategy
 	 */