Permalink
Browse files

HHH-8741 - More checkstyle cleanups

  • Loading branch information...
1 parent 77c8535 commit b103b2a0ad3af744f72b05bf22ade807f058a125 @sebersole sebersole committed Nov 24, 2013
View
3 hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java
@@ -306,7 +306,6 @@ public AbstractHANADialect() {
getDefaultProperties().setProperty( AvailableSettings.NON_CONTEXTUAL_LOB_CREATION, "true" );
}
- @Deprecated
@Override
public boolean bindLimitParametersInReverseOrder() {
return true;
@@ -431,7 +430,6 @@ public String getForUpdateString(final String aliases, final LockOptions lockOpt
return getForUpdateString( lockMode ) + " of " + aliases;
}
- @Deprecated
@Override
public String getLimitString(final String sql, final boolean hasOffset) {
return new StringBuilder( sql.length() + 20 ).append( sql )
@@ -606,7 +604,6 @@ public boolean supportsExpectedLobUsagePattern() {
return false;
}
- @Deprecated
@Override
public boolean supportsLimit() {
return true;
View
2 hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java
@@ -45,7 +45,9 @@
*
* @deprecated temporary solution
*/
+ @Deprecated
public IdentifierGeneratorFactory getIdentifierGeneratorFactory();
+
public Type getIdentifierType(String className) throws MappingException;
public String getIdentifierPropertyName(String className) throws MappingException;
public Type getReferencedPropertyType(String className, String propertyName) throws MappingException;
View
4 hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java
@@ -52,6 +52,10 @@ public Integer initialize() {
}
);
}
+
+ /**
+ * @deprecated explicit entity mode support is deprecated
+ */
@Deprecated
public TypedValue(Type type, Object value, EntityMode entityMode) {
this(type, value);
View
2 hibernate-core/src/main/java/org/hibernate/event/spi/AbstractPreDatabaseOperationEvent.java
@@ -97,8 +97,10 @@ public EntityPersister getPersister() {
* {@link AbstractEvent}.
*
* @return Value for property 'source'.
+ *
* @deprecated Use {@link #getSession} instead
*/
+ @Deprecated
public EventSource getSource() {
return getSession();
}
View
4 hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ParameterContainer.java
@@ -38,9 +38,11 @@
* In the interim, this allows us to at least treat these "hidden" parameters properly which is
* the most pressing need.
*
- * @deprecated
+ * @deprecated See entire discussion above
+ *
* @author Steve Ebersole
*/
+@Deprecated
public interface ParameterContainer {
/**
* Set the renderable text of this node.
View
3 hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTUtil.java
@@ -46,6 +46,7 @@
*
* @deprecated (tellclovertoignorethis)
*/
+ @Deprecated
private ASTUtil() {
}
@@ -62,6 +63,7 @@ private ASTUtil() {
*
* @deprecated silly
*/
+ @Deprecated
public static AST create(ASTFactory astFactory, int type, String text) {
return astFactory.create( type, text );
}
@@ -409,6 +411,7 @@ public static Map generateTokenNameCache(Class tokenTypeInterface) {
*
* @deprecated Use #getTokenTypeName instead
*/
+ @Deprecated
public static String getConstantName(Class owner, int value) {
return getTokenTypeName( owner, value );
}
View
1 hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ColumnHelper.java
@@ -41,6 +41,7 @@
/**
* @deprecated (tell clover to filter this out)
*/
+ @Deprecated
private ColumnHelper() {
}
View
2 hibernate-core/src/main/java/org/hibernate/id/factory/IdentifierGeneratorFactory.java
@@ -46,9 +46,11 @@
* Allow injection of the dialect to use.
*
* @param dialect The dialect
+ *
* @deprecated The intention is that Dialect should be required to be specified up-front and it would then get
* ctor injected.
*/
+ @Deprecated
public void setDialect(Dialect dialect);
/**
View
15 hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java
@@ -43,11 +43,20 @@
public static final int MINIMUM_INITIAL_CAPACITY = 16;
public static final float LOAD_FACTOR = 0.75f;
- @Deprecated // use java.util.Collections.EMPTY_LIST instead
+ /**
+ * @deprecated use {@link java.util.Collections#EMPTY_LIST} or {@link java.util.Collections#emptyList()} instead
+ */
+ @Deprecated
public static final List EMPTY_LIST = Collections.EMPTY_LIST;
- @Deprecated // use java.util.Collections.EMPTY_LIST instead
+ /**
+ * @deprecated use {@link java.util.Collections#EMPTY_LIST} or {@link java.util.Collections#emptyList()} instead
+ */
+ @Deprecated
public static final Collection EMPTY_COLLECTION = Collections.EMPTY_LIST;
- @Deprecated // use java.util.Collections.EMPTY_MAP instead
+ /**
+ * @deprecated use {@link java.util.Collections#EMPTY_MAP} or {@link java.util.Collections#emptyMap()} instead
+ */
+ @Deprecated
public static final Map EMPTY_MAP = Collections.EMPTY_MAP;
private CollectionHelper() {
View
4 shared/config/checkstyle/checkstyle.xml
@@ -186,7 +186,9 @@
The org.hibernate.engine.spi.ManagedEntity method names (prefixed with '&&_') muck with this
<module name="MethodName" />
-->
- <module name="MethodTypeParameterName" />
+ <module name="MethodTypeParameterName">
+ <property name="format" value="^[A-Z][A-Z0-9]*$" />
+ </module>
<module name="PackageName" />
<module name="ParameterName" />
<module name="StaticVariableName" />

0 comments on commit b103b2a

Please sign in to comment.