a couple of tiny optimizations, and use of 'var'

Author: gavinking

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementHelper.java

@@ -87,7 +87,7 @@ public static boolean includeInBaseFetchGroup(
 return false;
 }
 
-if ( toOne.getColumnSpan() == 0 ) {
+if ( !toOne.hasColumns() ) {
 // generally this would indicate a "shared PK" one-to-one and there
 // is no column for the association on the owner table - do not add
 // the association to the base group (which would force an immediate

hibernate-core/src/main/java/org/hibernate/generator/GeneratorCreationContext.java

@@ -81,7 +81,7 @@ default Type getType() {
  * The {@link SqlStringGenerationContext} to use when generating SQL.
  */
 default SqlStringGenerationContext getSqlStringGenerationContext() {
-final Database database = getDatabase();
+final var database = getDatabase();
 return fromExplicit( database.getJdbcEnvironment(), database, getDefaultCatalog(), getDefaultSchema() );
 }
 }

hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java

@@ -171,7 +171,7 @@ public static <R> void setFetchGraph(TypedQuery<R> query, EntityGraph<R> graph)
 }
 
 /**
- * Allows a treated subgraph to ve created for a {@link Subgraph}, since the
+ * Allows a treated subgraph to be created for a {@link Subgraph}, since the
  * JPA-standard operation {@link EntityGraph#addTreatedSubgraph(Class)} is
  * declared by {@link EntityGraph}.
  *

hibernate-core/src/main/java/org/hibernate/id/enhanced/ExportableColumnHelper.java

@@ -47,6 +47,11 @@ public List<Column> getColumns() {
 return List.of( column );
 }
 
+@Override
+public boolean hasColumns() {
+return true;
+}
+
 @Override
 public Type getType() {
 return type;

hibernate-core/src/main/java/org/hibernate/mapping/Any.java

@@ -157,7 +157,7 @@ public void addFormula(Formula formula) {
 private void applySelectableLocally(Selectable selectable) {
 // note: adding column to meta or key mapping ultimately calls back into `#applySelectableToSuper`
 //	to add the column to the ANY super.
-if ( discriminatorDescriptor == null && getColumnSpan() == 0 ) {
+if ( discriminatorDescriptor == null && !hasColumns() ) {
 if ( selectable instanceof Column column ) {
 metaMapping.addColumn( column );
 }
@@ -247,7 +247,7 @@ public boolean isValid(MappingContext mappingContext) throws MappingException {
 }
 
 private static String columnName(Column column, MetadataBuildingContext buildingContext) {
-final JdbcServices jdbcServices =
+final var jdbcServices =
 buildingContext.getBootstrapContext().getServiceRegistry()
 .requireService( JdbcServices.class );
 return column.getQuotedName( jdbcServices.getDialect() );

hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java

@@ -235,7 +235,7 @@ public Function<TypeConfiguration, java.lang.reflect.Type> getImplicitJavaTypeAc
 }
 
 public Selectable getColumn() {
-return getColumnSpan() == 0 ? null : getColumn( 0 );
+return hasColumns() ? getColumn( 0 ) : null;
 }
 
 public java.lang.reflect.Type getResolvedJavaType() {

hibernate-core/src/main/java/org/hibernate/mapping/Collection.java

@@ -424,6 +424,11 @@ public int getColumnSpan() {
 return 0;
 }
 
+@Override
+public boolean hasColumns() {
+return false;
+}
+
 @Override
 public Type getType() throws MappingException {
 return getCollectionType();

hibernate-core/src/main/java/org/hibernate/mapping/Component.java

@@ -246,6 +246,17 @@ public int getColumnSpan() {
 return getSelectables().size();
 }
 
+@Override
+public boolean hasColumns() {
+for ( var property : properties ) {
+if ( property.hasColumns() ) {
+return true;
+}
+}
+return discriminator != null
+&& discriminator.hasColumns();
+}
+
 public List<Column> getAggregatedColumns() {
 final List<Column> aggregatedColumns = new ArrayList<>( getPropertySpan() );
 collectAggregatedColumns( aggregatedColumns, this );
@@ -490,7 +501,7 @@ public boolean isSame(Component other) {
 
 @Override
 public boolean[] getColumnInsertability() {
-final boolean[] result = new boolean[getColumnSpan()];
+final var result = new boolean[getColumnSpan()];
 int i = 0;
 for ( var property : getProperties() ) {
 i += copyFlags( property.getValue().getColumnInsertability(), result, i, property.isInsertable() );
@@ -522,7 +533,7 @@ public boolean hasAnyInsertableColumns() {
 
 @Override
 public boolean[] getColumnUpdateability() {
-final boolean[] result = new boolean[getColumnSpan()];
+final var result = new boolean[getColumnSpan()];
 int i = 0;
 for ( var property : getProperties() ) {
 i += copyFlags( property.getValue().getColumnUpdateability(), result, i, property.isUpdatable() );
@@ -582,8 +593,8 @@ public boolean matchesAllProperties(String... propertyNames) {
 }
 
 public boolean hasProperty(String propertyName) {
-for ( Property prop : properties ) {
-if ( prop.getName().equals(propertyName) ) {
+for ( var property : properties ) {
+if ( property.getName().equals(propertyName) ) {
 return true;
 }
 }
@@ -680,7 +691,7 @@ private Generator buildIdentifierGenerator(Dialect dialect, RootClass rootClass,
 for ( int i = 0; i < properties.size(); i++ ) {
 final var property = properties.get( i );
 if ( property.getValue().isSimpleValue() ) {
-final SimpleValue value = (SimpleValue) property.getValue();
+final var value = (SimpleValue) property.getValue();
 if ( !value.getCustomIdGeneratorCreator().isAssigned() ) {
 // skip any 'assigned' generators, they would have been
 // handled by the StandardGenerationContextLocator
@@ -850,9 +861,10 @@ public boolean isValid(MappingContext mappingContext) throws MappingException {
 }
 if ( assignedPropertyNames.size() != properties.size() ) {
 final ArrayList<String> missingProperties = new ArrayList<>();
-for ( Property property : properties ) {
-if ( !assignedPropertyNames.contains( property.getName() ) ) {
-missingProperties.add( property.getName() );
+for ( var property : properties ) {
+final String propertyName = property.getName();
+if ( !assignedPropertyNames.contains( propertyName ) ) {
+missingProperties.add( propertyName );
 }
 }
 throw new MappingException( "component type [" + componentClassName + "] has " + properties.size() + " properties but the instantiator only assigns " + assignedPropertyNames.size() + " properties. missing properties: " + missingProperties );
@@ -886,7 +898,7 @@ private int[] sortProperties(boolean forceRetainOriginalOrder) {
 // because XML mappings might refer to this through the defined order
 if ( forceRetainOriginalOrder || isAlternateUniqueKey() || isEmbedded()
 || getBuildingContext() instanceof MappingDocument ) {
-final Property[] originalProperties = properties.toArray( new Property[0] );
+final var originalProperties = properties.toArray( new Property[0] );
 properties.sort( Comparator.comparing( Property::getName ) );
 originalPropertyOrder = new int[originalProperties.length];
 for ( int j = 0; j < originalPropertyOrder.length; j++ ) {

hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java

@@ -93,6 +93,11 @@ public int getColumnSpan() {
 return associatedClass.getKey().getColumnSpan();
 }
 
+@Override
+public boolean hasColumns() {
+return associatedClass.getKey().hasColumns();
+}
+
 @Override
 public FetchMode getFetchMode() {
 return FetchMode.JOIN;

hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java

@@ -61,7 +61,7 @@ public String getEntityName() {
 }
 
 public OneToOneType getType() throws MappingException {
-if ( getColumnSpan()>0 ) {
+if ( hasColumns() ) {
 return new SpecialOneToOneType(
 getTypeConfiguration(),
 getReferencedEntityName(),
@@ -93,7 +93,7 @@ public OneToOneType getType() throws MappingException {
 
 @Override
 public void createUniqueKey(MetadataBuildingContext context) {
-if ( !hasFormula() && getColumnSpan()>0 ) {
+if ( !hasFormula() && hasColumns() ) {
 getTable().createUniqueKey( getConstraintColumns(), context );
 }
 }