HHH-18675: Fix for Hibernate codestyle

leonschenk · beikov · commit 0a1a9f757d75 · 2024-10-02T16:08:59.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java
@@ -55,7 +55,6 @@
 import java.util.function.BiFunction;
 
 import static java.util.Collections.unmodifiableMap;
-import static java.util.Objects.nonNull;
 import static org.hibernate.metamodel.internal.InjectionHelper.injectField;
 
 /**
@@ -274,9 +273,9 @@ public Map<String, IdentifiableDomainType<?>> getIdentifiableTypesByName() {
 			attribute = factoryFunction.apply( entityType, genericProperty );
 			if ( !property.isGeneric() ) {
 				final PersistentAttribute<X, ?> concreteAttribute = factoryFunction.apply( entityType, property );
-				if (nonNull(concreteAttribute)) {
+				if ( concreteAttribute != null ) {
 					@SuppressWarnings("unchecked") final AttributeContainer<X> attributeContainer = (AttributeContainer<X>) entityType;
-					attributeContainer.getInFlightAccess().addConcreteGenericAttribute(concreteAttribute);
+					attributeContainer.getInFlightAccess().addConcreteGenericAttribute( concreteAttribute );
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@`
`55`	`55`	`import java.util.function.BiFunction;`
`56`	`56`
`57`	`57`	`import static java.util.Collections.unmodifiableMap;`
`58`		`-import static java.util.Objects.nonNull;`
`59`	`58`	`import static org.hibernate.metamodel.internal.InjectionHelper.injectField;`
`60`	`59`
`61`	`60`	`/**`
`@@ -274,9 +273,9 @@ public Map<String, IdentifiableDomainType<?>> getIdentifiableTypesByName() {`
`274`	`273`	`attribute = factoryFunction.apply( entityType, genericProperty );`
`275`	`274`	`if ( !property.isGeneric() ) {`
`276`	`275`	`final PersistentAttribute<X, ?> concreteAttribute = factoryFunction.apply( entityType, property );`
`277`		`- if (nonNull(concreteAttribute)) {`
	`276`	`+ if ( concreteAttribute != null ) {`
`278`	`277`	`@SuppressWarnings("unchecked") final AttributeContainer<X> attributeContainer = (AttributeContainer<X>) entityType;`
`279`		`- attributeContainer.getInFlightAccess().addConcreteGenericAttribute(concreteAttribute);`
	`278`	`+ attributeContainer.getInFlightAccess().addConcreteGenericAttribute( concreteAttribute );`
`280`	`279`	`}`
`281`	`280`	`}`
`282`	`281`	`}`