Skip to content

Commit 0df7b6f

Browse files
gavinkinggavinking
committed
standardize on lowercase 'log'
because we were inconsistent here
1 parent 0777f26 commit 0df7b6f

File tree

132 files changed

+812
-723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+812
-723
lines changed

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
* @author Jürgen Kreitler
132132
*/
133133
public class H2LegacyDialect extends Dialect {
134-
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( H2LegacyDialect.class );
134+
private static final CoreMessageLogger log = CoreLogging.messageLogger( H2LegacyDialect.class );
135135

136136
private final LimitHandler limitHandler;
137137

@@ -161,7 +161,7 @@ public H2LegacyDialect(DatabaseVersion version) {
161161
: LimitOffsetLimitHandler.OFFSET_ONLY_INSTANCE;
162162

163163
if ( version.isBefore( 1, 2, 139 ) ) {
164-
LOG.unsupportedMultiTableBulkHqlJpaql( version.getMajor(), version.getMinor(), version.getMicro() );
164+
log.unsupportedMultiTableBulkHqlJpaql( version.getMajor(), version.getMinor(), version.getMicro() );
165165
}
166166

167167
// supportsTuplesInSubqueries = version.isSameOrAfter( 1, 4, 198 );

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyServerConfiguration.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
*/
2828
public class HANALegacyServerConfiguration {
2929

30-
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( HANALegacyServerConfiguration.class );
30+
private static final CoreMessageLogger log = CoreLogging.messageLogger( HANALegacyServerConfiguration.class );
31+
3132
private static final Pattern CLOUD_VERSION_PATTERN = Pattern.compile( "\\(fa/CE(\\d+)\\.(\\d+)\\)" );
3233
public static final int MAX_LOB_PREFETCH_SIZE_DEFAULT_VALUE = 1024;
3334

@@ -62,7 +63,7 @@ public static HANALegacyServerConfiguration fromDialectResolutionInfo(DialectRes
6263
}
6364
catch (SQLException e) {
6465
// Ignore
65-
LOG.debug(
66+
log.debug(
6667
"An error occurred while trying to determine the database version.",
6768
e );
6869
}
@@ -79,7 +80,7 @@ public static HANALegacyServerConfiguration fromDialectResolutionInfo(DialectRes
7980
}
8081
catch (SQLException e) {
8182
// Ignore
82-
LOG.debug(
83+
log.debug(
8384
"An error occurred while trying to determine the value of the HANA parameter indexserver.ini / session / max_lob_prefetch_size.",
8485
e );
8586
}
@@ -117,7 +118,7 @@ public static DatabaseVersion determineDatabaseVersion(DialectResolutionInfo inf
117118
}
118119
catch (SQLException e) {
119120
// Ignore
120-
LOG.debug( "An error occurred while trying to determine the HANA Cloud version.", e );
121+
log.debug( "An error occurred while trying to determine the HANA Cloud version.", e );
121122
}
122123
}
123124
return databaseVersion == null

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,13 @@
9999
* @author Fred Toussi
100100
*/
101101
public class HSQLLegacyDialect extends Dialect {
102-
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
102+
103+
private static final CoreMessageLogger log = Logger.getMessageLogger(
103104
MethodHandles.lookup(),
104105
CoreMessageLogger.class,
105106
org.hibernate.community.dialect.HSQLLegacyDialect.class.getName()
106107
);
108+
107109
private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate( this );
108110
private final HSQLIdentityColumnSupport identityColumnSupport;
109111

@@ -760,7 +762,7 @@ private ReadUncommittedLockingStrategy(EntityPersister lockable, LockMode lockMo
760762
public void lock(Object id, Object version, Object object, int timeout, SharedSessionContractImplementor session)
761763
throws StaleObjectStateException, JDBCException {
762764
if ( getLockMode().greaterThan( LockMode.READ ) ) {
763-
LOG.hsqldbSupportsOnlyReadCommittedIsolation();
765+
log.hsqldbSupportsOnlyReadCommittedIsolation();
764766
}
765767
super.lock( id, version, object, timeout, session );
766768
}

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.hibernate.dialect.sequence.SequenceSupport;
2727
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
2828
import org.hibernate.engine.spi.SessionFactoryImplementor;
29-
import org.hibernate.internal.CoreMessageLogger;
3029
import org.hibernate.persister.entity.EntityPersister;
3130
import org.hibernate.query.common.TemporalUnit;
3231
import org.hibernate.query.sqm.IntervalType;
@@ -41,9 +40,7 @@
4140
import org.hibernate.sql.exec.spi.JdbcOperation;
4241
import org.hibernate.type.descriptor.jdbc.JdbcType;
4342
import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
44-
import org.jboss.logging.Logger;
4543

46-
import java.lang.invoke.MethodHandles;
4744
import java.sql.Types;
4845

4946
import static org.hibernate.dialect.SimpleDatabaseVersion.ZERO_VERSION;
@@ -79,11 +76,6 @@
7976
* @author Ploski and Hanson
8077
*/
8178
public class RDMSOS2200Dialect extends Dialect {
82-
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
83-
MethodHandles.lookup(),
84-
CoreMessageLogger.class,
85-
RDMSOS2200Dialect.class.getName()
86-
);
8779

8880
/**
8981
* Constructs a RDMSOS2200Dialect

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/array/GaussDBArrayContainsOperatorFunction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void render(
4444
final JdbcMappingContainer needleTypeContainer = needleExpression.getExpressionType();
4545
final JdbcMapping needleType = needleTypeContainer == null ? null : needleTypeContainer.getSingleJdbcMapping();
4646
if ( needleType == null || needleType instanceof BasicPluralType<?, ?> ) {
47-
LOG.deprecatedArrayContainsWithArray();
47+
log.deprecatedArrayContainsWithArray();
4848
if ( nullable ) {
4949
super.render( sqlAppender, sqlAstArguments, returnType, walker );
5050
}

‎hibernate-core/src/main/java/org/hibernate/AssertionFailure.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
public class AssertionFailure extends RuntimeException {
1616

17-
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AssertionFailure.class );
17+
private static final CoreMessageLogger log = CoreLogging.messageLogger( AssertionFailure.class );
1818

1919
/**
2020
* Creates an instance of AssertionFailure using the given message.
@@ -23,7 +23,7 @@ public class AssertionFailure extends RuntimeException {
2323
*/
2424
public AssertionFailure(String message) {
2525
super( message );
26-
LOG.failed( this );
26+
log.failed( this );
2727
}
2828

2929
/**
@@ -34,6 +34,6 @@ public AssertionFailure(String message) {
3434
*/
3535
public AssertionFailure(String message, Throwable cause) {
3636
super( message, cause );
37-
LOG.failed( cause );
37+
log.failed( cause );
3838
}
3939
}

‎hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
* @author Gail Badner
4242
*/
4343
public class UnresolvedEntityInsertActions {
44-
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UnresolvedEntityInsertActions.class );
44+
45+
private static final CoreMessageLogger log = CoreLogging.messageLogger( UnresolvedEntityInsertActions.class );
4546

4647
private static final int INIT_SIZE = 5;
4748

@@ -63,8 +64,8 @@ public void addUnresolvedEntityInsertAction(AbstractEntityInsertAction insert, N
6364
"Attempt to add an unresolved insert action that has no non-nullable transient entities."
6465
);
6566
}
66-
if ( LOG.isTraceEnabled() ) {
67-
LOG.tracev(
67+
if ( log.isTraceEnabled() ) {
68+
log.tracev(
6869
"Adding insert with non-nullable, transient entities; insert=[{0}], dependencies=[{1}]",
6970
insert,
7071
dependencies.toLoggableString( insert.getSession() )
@@ -96,7 +97,7 @@ public Iterable<AbstractEntityInsertAction> getDependentEntityInsertActions() {
9697
*/
9798
public void checkNoUnresolvedActionsAfterOperation() throws PropertyValueException {
9899
if ( isEmpty() ) {
99-
LOG.trace( "No entity insert actions have non-nullable, transient entity dependencies." );
100+
log.trace( "No entity insert actions have non-nullable, transient entity dependencies." );
100101
}
101102
else {
102103
final var firstDependentAction = dependenciesByAction.keySet().iterator().next();
@@ -142,7 +143,7 @@ private void logCannotResolveNonNullableTransientDependencies(SharedSessionContr
142143
}
143144
}
144145

145-
LOG.cannotResolveNonNullableTransientDependencies(
146+
log.cannotResolveNonNullableTransientDependencies(
146147
transientEntityString,
147148
dependentEntityStrings,
148149
nonNullableTransientPropertyPaths
@@ -186,13 +187,13 @@ public Set<AbstractEntityInsertAction> resolveDependentActions(Object managedEnt
186187
throw new IllegalArgumentException( "EntityEntry did not have status MANAGED or READ_ONLY: " + entityEntry );
187188
}
188189

189-
final boolean traceEnabled = LOG.isTraceEnabled();
190+
final boolean traceEnabled = log.isTraceEnabled();
190191
// Find out if there are any unresolved insertions that are waiting for the
191192
// specified entity to be resolved.
192193
final var dependentActions = dependentActionsByTransientEntity.remove( managedEntity );
193194
if ( dependentActions == null ) {
194195
if ( traceEnabled ) {
195-
LOG.tracev(
196+
log.tracev(
196197
"No unresolved entity inserts that depended on [{0}]",
197198
infoString( entityEntry.getEntityName(), entityEntry.getId() )
198199
);
@@ -202,15 +203,15 @@ public Set<AbstractEntityInsertAction> resolveDependentActions(Object managedEnt
202203
else {
203204
final Set<AbstractEntityInsertAction> resolvedActions = new IdentitySet<>();
204205
if ( traceEnabled ) {
205-
LOG.tracev(
206+
log.tracev(
206207
"Unresolved inserts before resolving [{0}]: [{1}]",
207208
infoString( entityEntry.getEntityName(), entityEntry.getId() ),
208209
toString()
209210
);
210211
}
211212
for ( var dependentAction : dependentActions ) {
212213
if ( traceEnabled ) {
213-
LOG.tracev(
214+
log.tracev(
214215
"Resolving insert [{0}] dependency on [{1}]",
215216
infoString( dependentAction.getEntityName(), dependentAction.getId() ),
216217
infoString( entityEntry.getEntityName(), entityEntry.getId() )
@@ -220,7 +221,7 @@ public Set<AbstractEntityInsertAction> resolveDependentActions(Object managedEnt
220221
dependencies.resolveNonNullableTransientEntity( managedEntity );
221222
if ( dependencies.isEmpty() ) {
222223
if ( traceEnabled ) {
223-
LOG.tracev(
224+
log.tracev(
224225
"Resolving insert [{0}] (only depended on [{1}])",
225226
dependentAction,
226227
infoString( entityEntry.getEntityName(), entityEntry.getId() )
@@ -232,7 +233,7 @@ public Set<AbstractEntityInsertAction> resolveDependentActions(Object managedEnt
232233
}
233234
}
234235
if ( traceEnabled ) {
235-
LOG.tracev(
236+
log.tracev(
236237
"Unresolved inserts after resolving [{0}]: [{1}]",
237238
infoString( entityEntry.getEntityName(), entityEntry.getId() ),
238239
toString()
@@ -273,7 +274,7 @@ public String toString() {
273274
*/
274275
public void serialize(ObjectOutputStream oos) throws IOException {
275276
final int queueSize = dependenciesByAction.size();
276-
LOG.tracev( "Starting serialization of [{0}] unresolved insert entries", queueSize );
277+
log.tracev( "Starting serialization of [{0}] unresolved insert entries", queueSize );
277278
oos.writeInt( queueSize );
278279
for ( AbstractEntityInsertAction unresolvedAction : dependenciesByAction.keySet() ) {
279280
oos.writeObject( unresolvedAction );
@@ -297,7 +298,7 @@ public static UnresolvedEntityInsertActions deserialize(
297298
final var rtn = new UnresolvedEntityInsertActions();
298299

299300
final int queueSize = ois.readInt();
300-
LOG.tracev( "Starting deserialization of [{0}] unresolved insert entries", queueSize );
301+
log.tracev( "Starting deserialization of [{0}] unresolved insert entries", queueSize );
301302
for ( int i = 0; i < queueSize; i++ ) {
302303
final var unresolvedAction = (AbstractEntityInsertAction) ois.readObject();
303304
unresolvedAction.afterDeserialize( session );

‎hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
* @since 5.0
6767
*/
6868
public class MetadataSources implements Serializable {
69-
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( MetadataSources.class );
69+
70+
private static final CoreMessageLogger log = CoreLogging.messageLogger( MetadataSources.class );
7071

7172
private final ServiceRegistry serviceRegistry;
7273
private final ClassLoaderService classLoaderService;
@@ -106,8 +107,8 @@ public MetadataSources(ServiceRegistry serviceRegistry) {
106107
public MetadataSources(ServiceRegistry serviceRegistry, XmlMappingBinderAccess xmlMappingBinderAccess) {
107108
// service registry really should be either BootstrapServiceRegistry or StandardServiceRegistry type...
108109
if ( !isExpectedServiceRegistryType( serviceRegistry ) ) {
109-
if ( LOG.isDebugEnabled() ) {
110-
LOG.debugf(
110+
if ( log.isDebugEnabled() ) {
111+
log.debugf(
111112
"Unexpected ServiceRegistry type [%s] encountered during building of MetadataSources; may cause " +
112113
"problems later attempting to construct MetadataBuilder",
113114
serviceRegistry.getClass().getName()

‎hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ public class BeanValidationEventListener
4949
implements PreInsertEventListener, PreUpdateEventListener, PreDeleteEventListener, PreUpsertEventListener, PreCollectionUpdateEventListener,
5050
SessionFactoryObserver {
5151

52-
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
52+
private static final CoreMessageLogger log = Logger.getMessageLogger(
5353
MethodHandles.lookup(),
5454
CoreMessageLogger.class,
5555
BeanValidationEventListener.class.getName()
5656
);
5757

58-
private HibernateTraversableResolver traversableResolver;
59-
private Validator validator;
60-
private GroupsPerOperation groupsPerOperation;
58+
private final HibernateTraversableResolver traversableResolver;
59+
private final Validator validator;
60+
private final GroupsPerOperation groupsPerOperation;
6161

6262
public BeanValidationEventListener(
6363
ValidatorFactory factory, Map<String, Object> settings, ClassLoaderService classLoaderService) {
@@ -143,7 +143,7 @@ private <T> void validate(
143143
final Set<ConstraintViolation<?>> propagatedViolations = setOfSize( constraintViolations.size() );
144144
final Set<String> classNames = new HashSet<>();
145145
for ( ConstraintViolation<?> violation : constraintViolations ) {
146-
LOG.trace( violation );
146+
log.trace( violation );
147147
propagatedViolations.add( violation );
148148
classNames.add( violation.getLeafBean().getClass().getName() );
149149
}

‎hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
* @author Steve Ebersole
2929
*/
3030
public class BeanValidationIntegrator implements Integrator {
31-
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
31+
32+
private static final CoreMessageLogger log = Logger.getMessageLogger(
3233
MethodHandles.lookup(),
3334
CoreMessageLogger.class,
3435
BeanValidationIntegrator.class.getName()
@@ -98,7 +99,7 @@ public void integrate(
9899
}
99100
final Set<ValidationMode> modes = ValidationMode.getModes( modeSetting );
100101
if ( modes.size() > 1 ) {
101-
LOG.multipleValidationModes( ValidationMode.loggable( modes ) );
102+
log.multipleValidationModes( ValidationMode.loggable( modes ) );
102103
}
103104
if ( modes.size() == 1 && modes.contains( ValidationMode.NONE ) ) {
104105
// we have nothing to do; just return

0 commit comments

Comments
 (0)