Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-9593 Remove superfluous references to enclosing class 

Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
	hibernate-core/src/main/java/org/hibernate/service/internal/JaxbProcessor.java
This commit is contained in:
Kamil Szymanski 2015-02-03 23:28:29 +01:00 committed by Brett Meyer
parent 78b6d31848
commit 5f5e5f82c4
10 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java
View File

@ -6,12 +6,16 @@
*/
package org.hibernate.boot.cfgxml.internal;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.hibernate.HibernateException;
import org.hibernate.boot.jaxb.Origin;
import org.hibernate.boot.jaxb.cfg.spi.JaxbCfgHibernateConfiguration;
import org.hibernate.boot.jaxb.internal.stax.LocalXmlResourceResolver;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.internal.util.config.ConfigurationException;
import org.hibernate.internal.util.xml.XsdException;
import org.jboss.logging.Logger;
import org.xml.sax.SAXException;
import javax.xml.XMLConstants;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@ -31,18 +35,12 @@ import javax.xml.stream.util.EventReaderDelegate;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import org.hibernate.HibernateException;
import org.hibernate.boot.jaxb.Origin;
import org.hibernate.boot.jaxb.cfg.spi.JaxbCfgHibernateConfiguration;
import org.hibernate.boot.jaxb.internal.stax.LocalXmlResourceResolver;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.internal.util.config.ConfigurationException;
import org.hibernate.internal.util.xml.XsdException;
import org.jboss.logging.Logger;
import org.xml.sax.SAXException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
/**
* @author Steve Ebersole
@ -213,7 +211,7 @@ public class JaxbCfgProcessor {
}
}
public class NamespaceAddingEventReader extends EventReaderDelegate {
public static class NamespaceAddingEventReader extends EventReaderDelegate {
private final XMLEventFactory xmlEventFactory;
private final String namespaceUri;

2
hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/BytecodeProviderImpl.java
View File

@ -111,7 +111,7 @@ public class BytecodeProviderImpl implements BytecodeProvider {
return new EntityInstrumentationMetadataImpl( entityClass );
}
private class EntityInstrumentationMetadataImpl implements EntityInstrumentationMetadata {
private static class EntityInstrumentationMetadataImpl implements EntityInstrumentationMetadata {
private final Class entityClass;
private final boolean isInstrumented;

4
hibernate-core/src/main/java/org/hibernate/hql/internal/ast/SqlGenerator.java
View File

@ -235,7 +235,7 @@ public class SqlGenerator extends SqlGeneratorBase implements ErrorReporter {
* SQL function processing code redirects generated SQL output to an instance of this class
* which catches function arguments.
*/
class StandardFunctionArguments implements FunctionArgumentsCollectingWriter {
static class StandardFunctionArguments implements FunctionArgumentsCollectingWriter {
private int argInd;
private final List<String> args = new ArrayList<String>( 3 );
@ -263,7 +263,7 @@ public class SqlGenerator extends SqlGeneratorBase implements ErrorReporter {
* SQL function processing code redirects generated SQL output to an instance of this class
* which catches function arguments.
*/
class CastFunctionArguments implements FunctionArgumentsCollectingWriter {
static class CastFunctionArguments implements FunctionArgumentsCollectingWriter {
private String castExpression;
private String castTargetType;

4
hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
View File

@ -380,7 +380,7 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
}
}
private class RootReturnBuilder implements RootReturn, ReturnBuilder {
private static class RootReturnBuilder implements RootReturn, ReturnBuilder {
private final String alias;
private final String entityName;
private LockMode lockMode = LockMode.READ;
@ -433,7 +433,7 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
}
}
private class FetchReturnBuilder implements FetchReturn, ReturnBuilder {
private static class FetchReturnBuilder implements FetchReturn, ReturnBuilder {
private final String alias;
private String ownerTableAlias;
private final String joinedPropertyName;

2
hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedIterable.java
View File

@ -36,7 +36,7 @@ public class JoinedIterable<T> implements Iterable<T> {
return iterator;
}
private class TypeSafeJoinedIterator<T> implements Iterator<T> {
private static class TypeSafeJoinedIterator<T> implements Iterator<T> {
// wrapped iterators
private List<Iterable<T>> iterables;

2
hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
View File

@ -592,7 +592,7 @@ public class SimpleValue implements KeyValue {
}
}
private final class ParameterTypeImpl implements DynamicParameterizedType.ParameterType {
private static final class ParameterTypeImpl implements DynamicParameterizedType.ParameterType {
private final Class returnedClass;
private final Annotation[] annotationsMethod;

2
hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/CriteriaUpdateImpl.java
View File

@ -135,7 +135,7 @@ public class CriteriaUpdateImpl<T> extends AbstractManipulationCriteriaQuery<T>
}
}
private class Assignment<A> {
private static class Assignment<A> {
private final SingularAttributePath<A> attributePath;
private final ExpressionImplementor<? extends A> value;

2
hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractToOneMapper.java
View File

@ -112,7 +112,7 @@ public abstract class AbstractToOneMapper implements PropertyMapper {
/**
* Simple descriptor of an entity.
*/
protected class EntityInfo {
protected static class EntityInfo {
private final Class entityClass;
private final String entityName;
private final boolean audited;

2
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
View File

@ -386,7 +386,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
session = null;
}
public class RollbackWork implements Work {
public static class RollbackWork implements Work {
public void execute(Connection connection) throws SQLException {
connection.rollback();
}

2
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java
View File

@ -274,7 +274,7 @@ public class JPAMetaModelEntityProcessor extends AbstractProcessor {
}
class ContainsAttributeTypeVisitor extends SimpleTypeVisitor6<Boolean, Element> {
static class ContainsAttributeTypeVisitor extends SimpleTypeVisitor6<Boolean, Element> {
private Context context;
private TypeElement type;