Skip to content

Commit

Permalink
HHH-8741 - More checkstyle cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebersole
sebersole committed Nov 24, 2013
1 parent 7b69aaa commit 4c91944
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 26 deletions.
11 changes: 3 additions & 8 deletions hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java
View file
Expand Up @@ -38,8 +38,6 @@
import org.hibernate.engine.jndi.JndiNameException;
import org.hibernate.engine.jndi.spi.JndiService;

import org.jboss.logging.Logger;

/**
* A registry of all {@link SessionFactory} instances for the same classloader as this class.
*
Expand All @@ -48,10 +46,7 @@
* @author Steve Ebersole
*/
public class SessionFactoryRegistry {
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
CoreMessageLogger.class,
SessionFactoryRegistry.class.getName()
);
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SessionFactoryRegistry.class );

/**
* Singleton access
Expand Down Expand Up @@ -108,7 +103,7 @@ public void addSessionFactory(
jndiService.bind( name, instance );
LOG.factoryBoundToJndiName( name );
try {
jndiService.addListener( name, LISTENER );
jndiService.addListener( name, listener );
}
catch (Exception e) {
LOG.couldNotBindJndiListener();
Expand Down Expand Up @@ -205,7 +200,7 @@ public void clearRegistrations() {
* Implementation of {@literal JNDI} {@link javax.naming.event.NamespaceChangeListener} contract to listener for context events
* and react accordingly if necessary
*/
private final NamespaceChangeListener LISTENER = new NamespaceChangeListener() {
private final NamespaceChangeListener listener = new NamespaceChangeListener() {
@Override
public void objectAdded(NamingEvent evt) {
LOG.debugf("A factory was successfully bound to name: %s", evt.getNewBinding().getName());
Expand Down
31 changes: 15 additions & 16 deletions ...te-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/AttributeFactory.java
View file
Expand Up @@ -37,6 +37,7 @@

import org.hibernate.annotations.common.AssertionFailure;
import org.hibernate.jpa.internal.EntityManagerMessageLogger;
import org.hibernate.jpa.internal.HEMLogging;
import org.hibernate.mapping.Collection;
import org.hibernate.mapping.Component;
import org.hibernate.mapping.Map;
Expand All @@ -51,8 +52,6 @@
import org.hibernate.type.EmbeddedComponentType;
import org.hibernate.type.EntityType;

import org.jboss.logging.Logger;

/**
* A factory for building {@link Attribute} instances. Exposes 3 main services for building<ol>
* <li>{@link #buildAttribute normal attributes}</li>
Expand All @@ -64,9 +63,7 @@
* @author Emmanuel Bernard
*/
public class AttributeFactory {

private static final EntityManagerMessageLogger LOG = Logger.getMessageLogger(EntityManagerMessageLogger.class,
AttributeFactory.class.getName());
private static final EntityManagerMessageLogger LOG = HEMLogging.messageLogger( AttributeFactory.class );

private final MetadataContext context;

Expand Down Expand Up @@ -97,7 +94,7 @@ public <X, Y> AttributeImplementor<X, Y> buildAttribute(AbstractManagedType<X> o
LOG.trace("Building attribute [" + ownerType.getTypeName() + "." + property.getName() + "]");
final AttributeContext<X> attributeContext = wrap( ownerType, property );
final AttributeMetadata<X,Y> attributeMetadata =
determineAttributeMetadata( attributeContext, NORMAL_MEMBER_RESOLVER );
determineAttributeMetadata( attributeContext, normalMemberResolver );
if (attributeMetadata == null) {
return null;
}
Expand Down Expand Up @@ -145,7 +142,9 @@ public <X, Y> SingularAttributeImpl<X, Y> buildIdAttribute(AbstractIdentifiableT
LOG.trace("Building identifier attribute [" + ownerType.getTypeName() + "." + property.getName() + "]");
final AttributeContext<X> attributeContext = wrap( ownerType, property );
final SingularAttributeMetadata<X,Y> attributeMetadata =
(SingularAttributeMetadata<X, Y>) determineAttributeMetadata( attributeContext, IDENTIFIER_MEMBER_RESOLVER );
(SingularAttributeMetadata<X, Y>) determineAttributeMetadata( attributeContext,
identifierMemberResolver
);
final Type<Y> metaModelType = getMetaModelType( attributeMetadata.getValueContext() );
return new SingularAttributeImpl.Identifier(
property.getName(),
Expand All @@ -171,7 +170,7 @@ public <X, Y> SingularAttributeImpl<X, Y> buildVersionAttribute(AbstractIdentifi
LOG.trace("Building version attribute [ownerType.getTypeName()" + "." + "property.getName()]");
final AttributeContext<X> attributeContext = wrap( ownerType, property );
final SingularAttributeMetadata<X,Y> attributeMetadata =
(SingularAttributeMetadata<X, Y>) determineAttributeMetadata( attributeContext, VERSION_MEMBER_RESOLVER );
(SingularAttributeMetadata<X, Y>) determineAttributeMetadata( attributeContext, versionMemberResolver );
final Type<Y> metaModelType = getMetaModelType( attributeMetadata.getValueContext() );
return new SingularAttributeImpl.Version(
property.getName(),
Expand Down Expand Up @@ -912,7 +911,7 @@ else if ( Method.class.isInstance( member ) ) {
return false;
}

private final MemberResolver EMBEDDED_MEMBER_RESOLVER = new MemberResolver() {
private final MemberResolver embeddedMemberResolver = new MemberResolver() {
@Override
public Member resolveMember(AttributeContext attributeContext) {
final EmbeddableTypeImpl embeddableType = ( EmbeddableTypeImpl<?> ) attributeContext.getOwnerType();
Expand All @@ -928,7 +927,7 @@ public Member resolveMember(AttributeContext attributeContext) {
};


private final MemberResolver VIRTUAL_IDENTIFIER_MEMBER_RESOLVER = new MemberResolver() {
private final MemberResolver virtualIdentifierMemberResolver = new MemberResolver() {
@Override
public Member resolveMember(AttributeContext attributeContext) {
final AbstractIdentifiableType identifiableType = (AbstractIdentifiableType) attributeContext.getOwnerType();
Expand Down Expand Up @@ -956,14 +955,14 @@ public Member resolveMember(AttributeContext attributeContext) {
/**
* A {@link Member} resolver for normal attributes.
*/
private final MemberResolver NORMAL_MEMBER_RESOLVER = new MemberResolver() {
private final MemberResolver normalMemberResolver = new MemberResolver() {
@Override
public Member resolveMember(AttributeContext attributeContext) {
final AbstractManagedType ownerType = attributeContext.getOwnerType();
final Property property = attributeContext.getPropertyMapping();
final Type.PersistenceType persistenceType = ownerType.getPersistenceType();
if ( Type.PersistenceType.EMBEDDABLE == persistenceType ) {
return EMBEDDED_MEMBER_RESOLVER.resolveMember( attributeContext );
return embeddedMemberResolver.resolveMember( attributeContext );
}
else if ( Type.PersistenceType.ENTITY == persistenceType
|| Type.PersistenceType.MAPPED_SUPERCLASS == persistenceType ) {
Expand All @@ -973,7 +972,7 @@ else if ( Type.PersistenceType.ENTITY == persistenceType
final Integer index = entityMetamodel.getPropertyIndexOrNull( propertyName );
if ( index == null ) {
// just like in #determineIdentifierJavaMember , this *should* indicate we have an IdClass mapping
return VIRTUAL_IDENTIFIER_MEMBER_RESOLVER.resolveMember( attributeContext );
return virtualIdentifierMemberResolver.resolveMember( attributeContext );
}
else {
final Getter getter = entityMetamodel.getTuplizer().getGetter( index );
Expand All @@ -988,15 +987,15 @@ else if ( Type.PersistenceType.ENTITY == persistenceType
}
};

private final MemberResolver IDENTIFIER_MEMBER_RESOLVER = new MemberResolver() {
private final MemberResolver identifierMemberResolver = new MemberResolver() {
@Override
public Member resolveMember(AttributeContext attributeContext) {
final AbstractIdentifiableType identifiableType = (AbstractIdentifiableType) attributeContext.getOwnerType();
final EntityMetamodel entityMetamodel = getDeclarerEntityMetamodel( identifiableType );
if ( ! attributeContext.getPropertyMapping().getName()
.equals( entityMetamodel.getIdentifierProperty().getName() ) ) {
// this *should* indicate processing part of an IdClass...
return VIRTUAL_IDENTIFIER_MEMBER_RESOLVER.resolveMember( attributeContext );
return virtualIdentifierMemberResolver.resolveMember( attributeContext );
}
final Getter getter = entityMetamodel.getTuplizer().getIdentifierGetter();
return MapAccessor.MapGetter.class.isInstance( getter )
Expand All @@ -1008,7 +1007,7 @@ public Member resolveMember(AttributeContext attributeContext) {
}
};

private final MemberResolver VERSION_MEMBER_RESOLVER = new MemberResolver() {
private final MemberResolver versionMemberResolver = new MemberResolver() {
@Override
public Member resolveMember(AttributeContext attributeContext) {
final AbstractIdentifiableType identifiableType = (AbstractIdentifiableType) attributeContext.getOwnerType();
Expand Down
5 changes: 3 additions & 2 deletions shared/config/checkstyle/checkstyle.xml
View file
Expand Up @@ -176,10 +176,11 @@
<!-- Some classes in o.h.metamodel on master violate this -->
<property name="severity" value="warning" />
</module>
<module name="LocalFinalVariableName" >
<module name="LocalFinalVariableName" />
<module name="LocalVariableName">
<!-- Some classes in o.h.metamodel on master violate this -->
<property name="severity" value="warning" />
</module>
<module name="LocalVariableName" />
<module name="MemberName" />
<!--
The org.hibernate.engine.spi.ManagedEntity method names (prefixed with '&&_') muck with this
Expand Down

0 comments on commit 4c91944

Please sign in to comment.