From 5d1aea1897a26c052b52d74ae0274665d26763f9 Mon Sep 17 00:00:00 2001
From: Andrea Boriero <andrea@hibernate.org>
Date: Thu, 9 Apr 2020 07:37:45 +0100
Subject: [PATCH] Fix merge checkstyle and compilation errors

---
 .../java/org/hibernate/annotations/Type.java  |  2 +-
 .../pagination/SQLServer2005LimitHandler.java |  3 +-
 .../dialect/internal/DialectFactoryImpl.java  |  4 ++-
 .../org/hibernate/metadata/package-info.java  |  2 +-
 .../hibernate/procedure/FunctionReturn.java   |  2 +-
 .../org/hibernate/query/sqm/NodeBuilder.java  |  2 +-
 .../sql/results/graph/BiDirectionalFetch.java |  8 +++--
 .../graph/DomainResultCreationState.java      |  5 +--
 .../results/internal/SqlSelectionImpl.java    | 10 +++---
 .../test/pagination/PaginationTest.java       | 35 -------------------
 .../LimitWithExpreesionAndFetchJoinTest.java  |  2 +-
 .../junit5/SessionFactoryScopeExtension.java  | 10 +++---
 .../testing/orm/junit/DomainModel.java        |  6 ++--
 .../testing/orm/junit/ServiceRegistry.java    |  6 ++--
 14 files changed, 34 insertions(+), 63 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Type.java b/hibernate-core/src/main/java/org/hibernate/annotations/Type.java
index bc76c2764667..3da8a48639a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/Type.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/Type.java
@@ -29,7 +29,7 @@
 public @interface Type {
 	/**
 	 * The Hibernate type name.  This should be one of: <ul>
-	 *     <li>Registration key for a basic type (see {@link org.hibernate.type.BasicTypeRegistry)}</li>
+	 *     <li>Registration key for a basic type (see {@link org.hibernate.type.BasicTypeRegistry})</li>
 	 *     <li>Type-definition name (see {@link TypeDef#name()})</li>
 	 *     <li>FQN for a {@link org.hibernate.type.Type} implementation class</li>
 	 *     <li>FQN for a {@link org.hibernate.usertype.UserType} implementation class</li>
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2005LimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2005LimitHandler.java
index b8620100b593..739a54da2773 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2005LimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2005LimitHandler.java
@@ -135,7 +135,7 @@ public int bindLimitParametersAtEndOfQuery(RowSelection selection, PreparedState
 	/**
 	 * Add any missing aliases to the given {@code select} list, and return
 	 * comma-separated list of all aliases in the list, unless the given list
-	 * contains {@literal *} or {@literal {table.*}, in which case {@literal *}
+	 * contains {@literal *} or {@literal {table.*}}, in which case {@literal *}
 	 * is returned.
 	 *
 	 * @param sql the whole query
@@ -144,6 +144,7 @@ public int bindLimitParametersAtEndOfQuery(RowSelection selection, PreparedState
 	 * @param result a string builder for inserting missing aliases
 	 *
 	 * @return a comma-separated list of aliases, or {@literal *}
+	 *
 	 */
 	private String selectAliases(String sql, int afterSelectOffset, int fromOffset, StringBuilder result) {
 		final List<String> aliases = new LinkedList<>();
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryImpl.java
index a9738fe707ca..7d1ae3da8f48 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryImpl.java
@@ -106,7 +106,9 @@ private Dialect constructDialect(Object dialectReference, DialectResolutionInfoS
 									);
 								}
 							}
-							catch (NoSuchMethodException nsme) {}
+							catch (NoSuchMethodException nsme) {
+
+							}
 							return dialectClass.newInstance();
 						}
 						catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
diff --git a/hibernate-core/src/main/java/org/hibernate/metadata/package-info.java b/hibernate-core/src/main/java/org/hibernate/metadata/package-info.java
index fab71d73843a..84b224b2ee0b 100644
--- a/hibernate-core/src/main/java/org/hibernate/metadata/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/metadata/package-info.java
@@ -8,6 +8,6 @@
 /**
  * This package defines an API for accessing the Hibernate runtime metamodel.
  *
- * @deprecated (since 6.0) Use Hibernate's mapping model {@link org.hibernate.metamodel.MappingMetamodel}
+ * deprecated (since 6.0) Use Hibernate's mapping model {@link org.hibernate.metamodel.MappingMetamodel}
  */
 package org.hibernate.metadata;
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java b/hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java
index 59e4b9fef9d1..dc317fe9a7e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/FunctionReturn.java
@@ -10,7 +10,7 @@
 
 /**
  * Describes the function return for ProcedureCalls that represent calls to
- * a function ({@code "{? = call ...} syntax) rather that a proc ({@code {call ...} syntax)
+ * a function ({@code "{? = call ...}} syntax) rather that a proc ({@code {call ...}} syntax)
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
index 8f653eb3e0b1..2aa3c529477a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
@@ -266,7 +266,7 @@ default TypeConfiguration getTypeConfiguration() {
 
 	/**
 	 * @implNote Notice that this returns a JPA parameter not the SqmParameter
-	 * @see JpaParameterExpression#
+	 * @see JpaParameterExpression
 	 *
 	 */
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/BiDirectionalFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/BiDirectionalFetch.java
index efe9623cd76d..f0a9709b71a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/BiDirectionalFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/BiDirectionalFetch.java
@@ -17,11 +17,12 @@
  * The following query is used throughout the javadocs for these impls
  * to help describe what it going on and why certain methods do certain things.
  *
- * ````
+ *
+ * ```
  * @Entity
  * class Person {
  *     ...
- *     @ManyToOne(mappedBy="owner")
+ *     @ManyToOne (mappedBy="owner")
  *     Address getAddress() {...}
  * }
  *
@@ -36,7 +37,8 @@
  * 		join fetch p.address a
  * 		join fetch a.owner o
  * 		join fetch o.address oa
- * ````
+ * ```
+ *
  *
  * Here we have one root result and 3 fetches.  2 of the fetches are bi-directional:
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultCreationState.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultCreationState.java
index 6e14ca52682e..2ee5cfa5a7ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultCreationState.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultCreationState.java
@@ -39,7 +39,8 @@ default ModelPart resolveModelPart(NavigablePath navigablePath) {
 	 *
 	 * We walk fetches via the SqlAstCreationContext because each "context"
 	 * will define differently what should be fetched (HQL versus load)
-	 *
+	 */
+ 	/*
 	 * todo (6.0) : centralize the implementation of this
 	 * 		most of the logic in the impls of this is identical.  variations include:
 	 * 				1) given a Fetchable, determine the FetchTiming and `selected`[1].  Tricky as functional
@@ -63,6 +64,6 @@ default ModelPart resolveModelPart(NavigablePath navigablePath) {
 	 * todo (6.0) : wrt the "trickiness" of `selected[1]`, that may no longer be an issue given how TableGroups
 	 * 		are built/accessed.  Comes down to how we'd know whether to join fetch or select fetch.  Simply pass
 	 * 		along FetchStyle?
-	 */
+ 	 */
 	List<Fetch> visitFetches(FetchParent fetchParent);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java
index ffc4c84126b3..16c7a9367be9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java
@@ -18,19 +18,19 @@
 /**
  * @asciidoc
  *
- * ````
+ * ```
  * @Entity
  * class MyEntity {
  *     ...
- *     @Column( name = "the_column", ... )
+ *     @Column ( name = "the_column", ... )
  *     public String getTheColumn() { ... }
  *
- *     @Convert( ... )
- *     @Column( name = "the_column", ... )
+ *     @Convert ( ... )
+ *     @Column ( name = "the_column", ... )
  *     ConvertedType getTheConvertedColumn() { ... }
  *
  * }
- * ````
+ * ```
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/test/java/org/hibernate/test/pagination/PaginationTest.java b/hibernate-core/src/test/java/org/hibernate/test/pagination/PaginationTest.java
index f81090293324..0ae47ac813e7 100755
--- a/hibernate-core/src/test/java/org/hibernate/test/pagination/PaginationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/pagination/PaginationTest.java
@@ -106,41 +106,6 @@ public void testOffset() {
 		);
 	}
 
-	/**
-	 * @author <a href="mailto:piotr.findeisen@gmail.com">Piotr Findeisen</a>
-	 */
-	@Test
-	@TestForIssue( jiraKey = "HHH-951" )
-	@RequiresDialectFeature(
-			value = DialectChecks.SupportLimitCheck.class,
-			comment = "Dialect does not support limit"
-	)
-	public void testLimitWithExpreesionAndFetchJoin() {
-		Session session = openSession();
-		session.beginTransaction();
-
-		String hql = "SELECT b, 1 FROM DataMetaPoint b inner join fetch b.dataPoint dp";
-		session.createQuery(hql)
-				.setMaxResults(3)
-				// This should not fail
-				.list();
-
-		HQLQueryPlan queryPlan = new HQLQueryPlan( hql, false, Collections.EMPTY_MAP, sessionFactory());
-		String sqlQuery = queryPlan.getTranslators()[0]
-				.collectSqlStrings().get(0);
-
-		session.getTransaction().commit();
-		session.close();
-
-		Matcher matcher = Pattern.compile(
-				"(?is)\\b(?<column>\\w+\\.\\w+)\\s+as\\s+(?<alias>\\w+)\\b.*\\k<column>\\s+as\\s+\\k<alias>")
-				.matcher(sqlQuery);
-		if (matcher.find()) {
-			fail(format("Column %s mapped to alias %s twice in generated SQL: %s", matcher.group("column"),
-						matcher.group("alias"), sqlQuery));
-		}
-	}
-
 	@Test
 	@RequiresDialectFeature(
 			value = DialectChecks.SupportLimitAndOffsetCheck.class,
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/pagination/LimitWithExpreesionAndFetchJoinTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/pagination/LimitWithExpreesionAndFetchJoinTest.java
index 720167b85316..c6ef20a1d8c4 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/pagination/LimitWithExpreesionAndFetchJoinTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/pagination/LimitWithExpreesionAndFetchJoinTest.java
@@ -23,7 +23,7 @@
 
 public class LimitWithExpreesionAndFetchJoinTest extends BaseNonConfigCoreFunctionalTestCase {
 	/**
-	 * @author Piotr Findeisen <piotr.findeisen@gmail.com>
+	 * @author Piotr Findeisen
 	 */
 	@Test
 	@TestForIssue( jiraKey = "HHH-951" )
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit5/SessionFactoryScopeExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit5/SessionFactoryScopeExtension.java
index 388ea7b6e577..497b57f0d4af 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit5/SessionFactoryScopeExtension.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit5/SessionFactoryScopeExtension.java
@@ -27,13 +27,13 @@
  *
  * [code]
  * .Annotation-driven example
- * ````
+ * ```
  *
- * @FunctionalSessionFactoryTesting(
- * 		model = @ModelToTest(
+ * @FunctionalSessionFactoryTesting (
+ * 		model = @ModelToTest (
  * 			true, // export
  * 			standardModels = {
- * 				@DomainModel( AvailableDomainModel.CONTACTS )
+ * 				@DomainModel ( AvailableDomainModel.CONTACTS )
  *  		},
  *  		annotatedClasses = {
  *  			SomeAdditionalClass.class
@@ -52,7 +52,7 @@
  *
  * }
  *
- * ````
+ * ```
  *
  *
  * @see SessionFactoryScope
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DomainModel.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DomainModel.java
index 2ae2b0cca86a..6e9cb0461e77 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DomainModel.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DomainModel.java
@@ -31,7 +31,7 @@
  *
  * [source, JAVA, indent=0]
  * ----
- * @TestDomain( ... )
+ * @TestDomain ( ... )
  * class MyTest implements TestDomainAware {
  *
  * 		@Test
@@ -55,8 +55,8 @@
  *
  * [source, JAVA, indent=0]
  * ----
- * @ServiceRegistry( ... )
- * @TestDomain( ... )
+ * @ServiceRegistry ( ... )
+ * @TestDomain ( ... )
  * class MyTest implements TestDomainAware {
  *
  * 		@Test
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistry.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistry.java
index 1a2ab737fa47..053b283b6055 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistry.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistry.java
@@ -23,7 +23,7 @@
  *
  * [source, JAVA, indent=0]
  * ----
- * @ServiceRegistry( ... )
+ * @ServiceRegistry ( ... )
  * class MyTest extends ServiceRegistryAware {
  * 		@Test
  * 		public void doTheTest() {
@@ -48,8 +48,8 @@
  *
  * [source, JAVA, indent=0]
  * ----
- * @ServiceRegistry( ... )
- * @TestDomain( ... )
+ * @ServiceRegistry ( ... )
+ * @TestDomain ( ... )
  * class MyTest ... {
  * }
  * ----