From f8bd799544f3aa57bff1c999b9cc799cc0300f82 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Fri, 5 Jul 2019 16:03:07 +0100 Subject: [PATCH] HHH-13496 Make inner classes 'static' when possible --- .../boot/internal/InFlightMetadataCollectorImpl.java | 2 +- .../hibernate/boot/model/source/internal/hbm/ModelBinder.java | 4 ++-- .../bytecode/enhance/internal/bytebuddy/EnhancerImpl.java | 2 +- .../main/java/org/hibernate/dialect/Teradata14Dialect.java | 2 +- .../container/internal/JpaCompliantLifecycleStrategy.java | 2 +- .../resource/beans/internal/ManagedBeanRegistryImpl.java | 2 +- .../org/hibernate/tool/schema/internal/SchemaDropperImpl.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java index 0c971aae31..d778e327b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java @@ -1356,7 +1356,7 @@ public class InFlightMetadataCollectorImpl implements InFlightMetadataCollector return xrefEntry == null ? null : xrefEntry.secondaryTableJoinMap; } - private final class EntityTableXrefImpl implements EntityTableXref { + private static final class EntityTableXrefImpl implements EntityTableXref { private final Identifier primaryTableLogicalName; private final Table primaryTable; private EntityTableXrefImpl superEntityTableXref; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java index ac9826e4d9..0b43642fb8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java @@ -4149,7 +4149,7 @@ public class ModelBinder { } } - private class ManyToOneFkSecondPass extends FkSecondPass { + private static class ManyToOneFkSecondPass extends FkSecondPass { private final MappingDocument mappingDocument; private final ManyToOne manyToOneBinding; @@ -4210,7 +4210,7 @@ public class ModelBinder { } } - private class NaturalIdUniqueKeyBinderImpl implements NaturalIdUniqueKeyBinder { + private static class NaturalIdUniqueKeyBinderImpl implements NaturalIdUniqueKeyBinder { private final MappingDocument mappingDocument; private final PersistentClass entityBinding; private final List attributeBindings = new ArrayList(); diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java index e7fc851df5..4d67197dbb 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java @@ -541,7 +541,7 @@ public class EnhancerImpl implements Enhancer { } } - private class EnhancerClassFileLocator extends ClassFileLocator.ForClassLoader { + private static class EnhancerClassFileLocator extends ClassFileLocator.ForClassLoader { // The name of the class to (possibly be) transformed. private String className; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Teradata14Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Teradata14Dialect.java index 00ce90322b..9744036649 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Teradata14Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Teradata14Dialect.java @@ -207,7 +207,7 @@ public class Teradata14Dialect extends TeradataDialect { } - private class TeradataIndexExporter extends StandardIndexExporter implements Exporter { + private static class TeradataIndexExporter extends StandardIndexExporter implements Exporter { public TeradataIndexExporter(Dialect dialect) { super(dialect); diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java index b848a5b9cc..e9b5314a2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/JpaCompliantLifecycleStrategy.java @@ -170,7 +170,7 @@ public class JpaCompliantLifecycleStrategy implements BeanLifecycleStrategy { } - private class NamedBeanImpl implements ContainedBeanImplementor { + private static class NamedBeanImpl implements ContainedBeanImplementor { private final Class beanType; private final String beanName; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/ManagedBeanRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/ManagedBeanRegistryImpl.java index c90730721e..8c8ec7b4a1 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/ManagedBeanRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/ManagedBeanRegistryImpl.java @@ -120,7 +120,7 @@ public class ManagedBeanRegistryImpl implements ManagedBeanRegistry, BeanContain registrations.clear(); } - private class ContainedBeanManagedBeanAdapter implements ManagedBean { + private static class ContainedBeanManagedBeanAdapter implements ManagedBean { private final Class beanClass; private final ContainedBean containedBean; diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java index 66395c39d1..142fb30463 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java @@ -548,7 +548,7 @@ public class SchemaDropperImpl implements SchemaDropper { } } - private class JdbcContextDelayedDropImpl implements JdbcContext { + private static class JdbcContextDelayedDropImpl implements JdbcContext { private final ServiceRegistry serviceRegistry; private final JdbcServices jdbcServices; private final JdbcConnectionAccess jdbcConnectionAccess;