HHH-9803 - Checkstyle fix ups

hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SubEntityInfo.java

@@ -29,5 +29,5 @@
  * @author Steve Ebersole
  */
 public interface SubEntityInfo extends EntityInfo {
-    String getExtends();
+	String getExtends();
 }

hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java

@@ -50,8 +50,8 @@
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtracter;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtracter;
 import org.hibernate.hql.spi.id.IdTableSupportStandardImpl;
-import org.hibernate.hql.spi.id.global.GlobalTemporaryTableBulkIdStrategy;
 import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
+import org.hibernate.hql.spi.id.global.GlobalTemporaryTableBulkIdStrategy;
 import org.hibernate.hql.spi.id.local.AfterUseAction;
 import org.hibernate.internal.util.JdbcExceptionHelper;
 import org.hibernate.procedure.internal.StandardCallableStatementSupport;
@@ -78,8 +78,7 @@ public String processSql(String sql, RowSelection selection) {
 			final boolean hasOffset = LimitHelper.hasFirstRow( selection );
 			sql = sql.trim();
 			boolean isForUpdate = false;
-			if (sql.toLowerCase(Locale.ROOT
-                        ).endsWith( " for update" )) {
+			if (sql.toLowerCase(Locale.ROOT).endsWith( " for update" )) {
 				sql = sql.substring( 0, sql.length() - 11 );
 				isForUpdate = true;
 			}

hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/DotNode.java

@@ -35,7 +35,6 @@
 import org.hibernate.persister.collection.QueryableCollection;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.Queryable;
-import org.hibernate.sql.JoinFragment;
 import org.hibernate.sql.JoinType;
 import org.hibernate.type.CollectionType;
 import org.hibernate.type.EntityType;
@@ -61,8 +60,8 @@ public class DotNode extends FromReferenceNode implements DisplayableNode, Selec
 	public static boolean useThetaStyleImplicitJoins;
 	public static boolean regressionStyleJoinSuppression;
 
-	public static interface IllegalCollectionDereferenceExceptionBuilder {
-		public QueryException buildIllegalCollectionDereferenceException(
+	public interface IllegalCollectionDereferenceExceptionBuilder {
+		QueryException buildIllegalCollectionDereferenceException(
 				String collectionPropertyName,
 				FromReferenceNode lhs);
 	}
@@ -126,7 +125,7 @@ public static enum DereferenceType {
 	 *
 	 * @param joinType The type of join to use.
 	 *
-	 * @see JoinFragment
+	 * @see org.hibernate.sql.JoinFragment
 	 */
 	public void setJoinType(JoinType joinType) {
 		this.joinType = joinType;

hibernate-core/src/main/java/org/hibernate/hql/internal/classic/PreprocessingParser.java

@@ -90,7 +90,9 @@ public void token(String token, QueryTranslatorImpl q) throws QueryException {
 		}
 
 		//ignore whitespace
-		if ( ParserHelper.isWhitespace( token ) ) return;
+		if ( ParserHelper.isWhitespace( token ) ) {
+			return;
+		}
 
 		//do replacements
 		String substoken = ( String ) replacements.get( token );

hibernate-core/src/main/java/org/hibernate/internal/CacheImpl.java

@@ -25,7 +25,6 @@
 
 import java.io.Serializable;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java

@@ -68,7 +68,6 @@
 import org.hibernate.SQLQuery;
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
-import org.hibernate.Session;
 import org.hibernate.SessionBuilder;
 import org.hibernate.SessionEventListener;
 import org.hibernate.SessionException;
@@ -169,7 +168,7 @@
  * Concrete implementation of a Session.
  * <p/>
  * Exposes two interfaces:<ul>
- * <li>{@link Session} to the application</li>
+ * <li>{@link org.hibernate.Session} to the application</li>
  * <li>{@link org.hibernate.engine.spi.SessionImplementor} to other Hibernate components (SPI)</li>
  * </ul>
  * <p/>

hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java

@@ -1504,9 +1504,7 @@ void rehash() {
 						// Reuse trailing consecutive sequence at same slot
 						HashEntry<K, V> lastRun = e;
 						int lastIdx = idx;
-						for ( HashEntry<K, V> last = next;
-							  last != null;
-							  last = last.next ) {
+						for ( HashEntry<K, V> last = next; last != null; last = last.next ) {
 							int k = last.hash & sizeMask;
 							if ( k != lastIdx ) {
 								lastIdx = k;

hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java

@@ -42,7 +42,6 @@
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.Enumeration;
-import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -181,7 +180,7 @@ public static enum ReferenceType {
 	public static enum Option {
 		/**
 		 * Indicates that referential-equality (== instead of .equals()) should
-		 * be used when locating keys. This offers similar behavior to {@link IdentityHashMap}
+		 * be used when locating keys. This offers similar behavior to {@link java.util.IdentityHashMap}
 		 */
 		IDENTITY_COMPARISONS
 	}
@@ -814,9 +813,7 @@ int rehash() {
 						// Reuse trailing consecutive sequence at same slot
 						HashEntry<K, V> lastRun = e;
 						int lastIdx = idx;
-						for ( HashEntry<K, V> last = next;
-							  last != null;
-							  last = last.next ) {
+						for ( HashEntry<K, V> last = next; last != null; last = last.next ) {
 							int k = last.hash & sizeMask;
 							if ( k != lastIdx ) {
 								lastIdx = k;
@@ -1674,8 +1671,7 @@ public V nextElement() {
 	/*
 		  * This class is needed for JDK5 compatibility.
 		  */
-	static class SimpleEntry<K, V> implements Entry<K, V>,
-											  java.io.Serializable {
+	static class SimpleEntry<K, V> implements Entry<K, V>, java.io.Serializable {
 		private static final long serialVersionUID = -8499721149061103585L;
 
 		private final K key;

hibernate-core/src/main/java/org/hibernate/internal/util/collections/SingletonIterator.java

@@ -29,16 +29,15 @@
 /**
  * @author Gavin King
  */
-public final class SingletonIterator implements Iterator {
-
-	private Object value;
+public final class SingletonIterator<T> implements Iterator<T> {
+	private T value;
 	private boolean hasNext = true;
 
 	public boolean hasNext() {
 		return hasNext;
 	}
 
-	public Object next() {
+	public T next() {
 		if (hasNext) {
 			hasNext = false;
 			return value;
@@ -52,7 +51,7 @@ public void remove() {
 		throw new UnsupportedOperationException();
 	}
 
-	public SingletonIterator(Object value) {
+	public SingletonIterator(T value) {
 		this.value = value;
 	}