remove unnecessary logging

and add more 'var' usage

Author: gavinking

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java

@@ -65,7 +65,6 @@
 import org.hibernate.sql.results.graph.collection.internal.DelayedCollectionFetch;
 import org.hibernate.sql.results.graph.collection.internal.EagerCollectionFetch;
 import org.hibernate.sql.results.graph.collection.internal.SelectEagerCollectionFetch;
-import org.jboss.logging.Logger;
 
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -80,7 +79,6 @@
 public class PluralAttributeMappingImpl
 		extends AbstractAttributeMapping
 		implements PluralAttributeMapping, FetchProfileAffectee, FetchOptions {
-	private static final Logger log = Logger.getLogger( PluralAttributeMappingImpl.class );
 
 	/**
 	 * Allows callback after creation of the attribute mapping.
@@ -96,8 +94,7 @@ public interface Aware {
 		void injectAttributeMapping(PluralAttributeMapping attributeMapping);
 	}
 
-	@SuppressWarnings("rawtypes")
-	private final CollectionMappingType collectionMappingType;
+	private final CollectionMappingType<?> collectionMappingType;
 	private final String referencedPropertyName;
 	private final String mapKeyPropertyName;
 
@@ -237,10 +234,11 @@ public boolean isBidirectionalAttributeName(NavigablePath fetchablePath, ToOneAt
 		return fetchablePath.getLocalName().endsWith( bidirectionalAttributeName );
 	}
 
-	@SuppressWarnings("unused")
 	public void finishInitialization(
+			@SuppressWarnings("unused")
 			Property bootProperty,
 			Collection bootDescriptor,
+			@SuppressWarnings("unused")
 			MappingModelCreationProcess creationProcess) {
 		final boolean hasOrder = bootDescriptor.getOrderBy() != null;
 		final boolean hasManyToManyOrder = bootDescriptor.getManyToManyOrdering() != null;
@@ -249,13 +247,6 @@ public void finishInitialization(
 			final TranslationContext context = collectionDescriptor::getFactory;
 
 			if ( hasOrder ) {
-				if ( log.isTraceEnabled() ) {
-					log.tracef(
-							"Translating order-by fragment [%s] for collection role: %s",
-							bootDescriptor.getOrderBy(),
-							collectionDescriptor.getRole()
-					);
-				}
 				orderByFragment = OrderByFragmentTranslator.translate(
 						bootDescriptor.getOrderBy(),
 						this,
@@ -264,13 +255,6 @@ public void finishInitialization(
 			}
 
 			if ( hasManyToManyOrder ) {
-				if ( log.isTraceEnabled() ) {
-					log.tracef(
-							"Translating many-to-many order-by fragment [%s] for collection role: %s",
-							bootDescriptor.getOrderBy(),
-							collectionDescriptor.getRole()
-					);
-				}
 				manyToManyOrderByFragment = OrderByFragmentTranslator.translate(
 						bootDescriptor.getManyToManyOrdering(),
 						this,
@@ -286,8 +270,7 @@ public NavigableRole getNavigableRole() {
 	}
 
 	@Override
-	@SuppressWarnings("rawtypes")
-	public CollectionMappingType getMappedType() {
+	public CollectionMappingType<?> getMappedType() {
 		return collectionMappingType;
 	}
 
@@ -384,32 +367,34 @@ public boolean hasPartitionedSelectionMapping() {
 
 	@Override
 	public void applySoftDeleteRestrictions(TableGroup tableGroup, PredicateConsumer predicateConsumer) {
-		if ( !hasSoftDelete() ) {
-			// short-circuit
-			return;
-		}
+		if ( hasSoftDelete() ) {
+			final var descriptor = getCollectionDescriptor();
+			if ( descriptor.isOneToMany() || descriptor.isManyToMany() ) {
+				// see if the associated entity has soft-delete defined
+				final var elementDescriptor = (EntityCollectionPart) getElementDescriptor();
+				final var associatedEntityDescriptor = elementDescriptor.getAssociatedEntityMappingType();
+				final var softDeleteMapping = associatedEntityDescriptor.getSoftDeleteMapping();
+				if ( softDeleteMapping != null ) {
+					final String primaryTableName =
+							associatedEntityDescriptor.getSoftDeleteTableDetails().getTableName();
+					final TableReference primaryTableReference =
+							tableGroup.resolveTableReference( primaryTableName );
+					final Predicate softDeleteRestriction =
+							softDeleteMapping.createNonDeletedRestriction( primaryTableReference );
+					predicateConsumer.applyPredicate( softDeleteRestriction );
+				}
+			}
 
-		if ( getCollectionDescriptor().isOneToMany()
-				|| getCollectionDescriptor().isManyToMany() ) {
-			// see if the associated entity has soft-delete defined
-			final EntityCollectionPart elementDescriptor = (EntityCollectionPart) getElementDescriptor();
-			final EntityMappingType associatedEntityDescriptor = elementDescriptor.getAssociatedEntityMappingType();
-			final SoftDeleteMapping softDeleteMapping = associatedEntityDescriptor.getSoftDeleteMapping();
+			// apply the collection's soft-delete mapping, if one
+			final var softDeleteMapping = getSoftDeleteMapping();
 			if ( softDeleteMapping != null ) {
-				final String primaryTableName = associatedEntityDescriptor.getSoftDeleteTableDetails().getTableName();
-				final TableReference primaryTableReference = tableGroup.resolveTableReference( primaryTableName );
-				final Predicate softDeleteRestriction = softDeleteMapping.createNonDeletedRestriction( primaryTableReference );
+				final TableReference primaryTableReference =
+						tableGroup.resolveTableReference( getSoftDeleteTableDetails().getTableName() );
+				final Predicate softDeleteRestriction =
+						softDeleteMapping.createNonDeletedRestriction( primaryTableReference );
 				predicateConsumer.applyPredicate( softDeleteRestriction );
 			}
 		}
-
-		// apply the collection's soft-delete mapping, if one
-		final SoftDeleteMapping softDeleteMapping = getSoftDeleteMapping();
-		if ( softDeleteMapping != null ) {
-			final TableReference primaryTableReference = tableGroup.resolveTableReference( getSoftDeleteTableDetails().getTableName() );
-			final Predicate softDeleteRestriction = softDeleteMapping.createNonDeletedRestriction( primaryTableReference );
-			predicateConsumer.applyPredicate( softDeleteRestriction );
-		}
 	}
 
 	@Override
@@ -418,9 +403,9 @@ public <T> DomainResult<T> createDomainResult(
 			TableGroup tableGroup,
 			String resultVariable,
 			DomainResultCreationState creationState) {
-		final TableGroup collectionTableGroup = creationState.getSqlAstCreationState()
-				.getFromClauseAccess()
-				.getTableGroup( navigablePath );
+		final TableGroup collectionTableGroup =
+				creationState.getSqlAstCreationState().getFromClauseAccess()
+						.getTableGroup( navigablePath );
 
 		assert collectionTableGroup != null;
 
@@ -440,7 +425,7 @@ public Fetch generateFetch(
 			boolean selected,
 			String resultVariable,
 			DomainResultCreationState creationState) {
-		final SqlAstCreationState sqlAstCreationState = creationState.getSqlAstCreationState();
+		final var sqlAstCreationState = creationState.getSqlAstCreationState();
 
 		final boolean added = creationState.registerVisitedAssociationKey( fkDescriptor.getAssociationKey() );
 

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java

@@ -9,7 +9,6 @@
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.ordering.ast.ParseTreeVisitor;
 
-import org.jboss.logging.Logger;
 
 import org.antlr.v4.runtime.BailErrorStrategy;
 import org.antlr.v4.runtime.BufferedTokenStream;
@@ -28,7 +27,6 @@
  * @see jakarta.persistence.OrderBy
  */
 public class OrderByFragmentTranslator {
-	private static final Logger LOG = Logger.getLogger( OrderByFragmentTranslator.class.getName() );
 
 	/**
 	 * Perform the translation of the user-supplied fragment, returning the translation.
@@ -43,28 +41,18 @@ public static OrderByFragment translate(
 			String fragment,
 			PluralAttributeMapping pluralAttributeMapping,
 			TranslationContext context) {
-		if ( LOG.isTraceEnabled() ) {
-			LOG.tracef(
-					"Beginning parsing of order-by fragment [%s] : %s",
-					pluralAttributeMapping.getCollectionDescriptor().getRole(),
-					fragment
-			);
-		}
-
-		final OrderingParser.OrderByFragmentContext parseTree = buildParseTree( context, fragment );
-
-		final ParseTreeVisitor visitor = new ParseTreeVisitor( pluralAttributeMapping, context );
-
+		final var parseTree = buildParseTree( fragment );
+		final var visitor = new ParseTreeVisitor( pluralAttributeMapping, context );
 		return new OrderByFragmentImpl( visitor.visitOrderByFragment( parseTree ) );
 	}
 
 
-	private static OrderingParser.OrderByFragmentContext buildParseTree(TranslationContext context, String fragment) {
-		final OrderingLexer lexer = new OrderingLexer( CharStreams.fromString( fragment ) );
+	private static OrderingParser.OrderByFragmentContext buildParseTree(String fragment) {
+		final var lexer = new OrderingLexer( CharStreams.fromString( fragment ) );
 
-		final OrderingParser parser = new OrderingParser( new BufferedTokenStream( lexer ) );
+		final var parser = new OrderingParser( new BufferedTokenStream( lexer ) );
 
-		// try to use SLL(k)-based parsing first - its faster
+		// try to use SLL(k)-based parsing first - it's faster
 		parser.getInterpreter().setPredictionMode( PredictionMode.SLL );
 		parser.removeErrorListeners();
 		parser.setErrorHandler( new BailErrorStrategy() );

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/PathConsumer.java

@@ -18,7 +18,6 @@
  * @author Steve Ebersole
  */
 public class PathConsumer {
-	private static final Logger log = Logger.getLogger( BasicDotIdentifierConsumer.class );
 
 	private final TranslationContext translationContext;
 
@@ -48,19 +47,11 @@ public void consumeIdentifier(
 			reset();
 		}
 
-		if ( pathSoFar.length() != 0 ) {
+		if ( !pathSoFar.isEmpty() ) {
 			pathSoFar.append( '.' );
 		}
 		pathSoFar.append( unquotedIdentifier );
 
-//		log.tracef(
-//				"BasicDotIdentifierHandler#consumeIdentifier( %s, %s, %s ) - %s",
-//				unquotedIdentifier,
-//				isBase,
-//				isTerminal,
-//				pathSoFar
-//		);
-
 		currentPart = currentPart.resolvePathPart( unquotedIdentifier, identifier, isTerminal, translationContext );
 	}