Added @Override annotations to core module

This commit is contained in:
Arjen Poutsma 2008-10-27 23:25:04 +00:00
parent 34ab7832c8
commit c07477da9c
39 changed files with 97 additions and 0 deletions

View File

@ -84,6 +84,7 @@ public abstract class AttributeAccessorSupport implements AttributeAccessor, Ser
}
@Override
public boolean equals(Object other) {
if (this == other) {
return true;
@ -95,6 +96,7 @@ public abstract class AttributeAccessorSupport implements AttributeAccessor, Ser
return this.attributes.equals(that.attributes);
}
@Override
public int hashCode() {
return this.attributes.hashCode();
}

View File

@ -49,6 +49,7 @@ public class ConfigurableObjectInputStream extends ObjectInputStream {
}
@Override
protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
try {
if (this.classLoader != null) {
@ -65,6 +66,7 @@ public class ConfigurableObjectInputStream extends ObjectInputStream {
}
}
@Override
protected Class resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException {
if (this.classLoader != null) {
// Use the specified ClassLoader to resolve local proxy classes.

View File

@ -103,6 +103,7 @@ public abstract class ControlFlowFactory {
return stackTrace.indexOf(token) != -1;
}
@Override
public String toString() {
StringBuffer sb = new StringBuffer("Jdk14ControlFlow: ");
for (int i = 0; i < this.stack.length; i++) {

View File

@ -177,6 +177,7 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
this.descriptorToMatch = descriptor;
}
@Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
if (name.equals(this.methodNameToMatch) && desc.equals(this.descriptorToMatch)) {
return new LocalVariableTableVisitor(this, isStatic(access));
@ -253,6 +254,7 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
this.parameterNames = new String[memberVisitor.numParamsExpected];
}
@Override
public void visitLocalVariable(
String name, String description, String signature, Label start, Label end, int index) {
this.hasLvtInfo = true;
@ -264,6 +266,7 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
}
}
@Override
public void visitEnd() {
if (this.hasLvtInfo || (this.isStatic && this.parameterNames.length == 0)) {
// visitLocalVariable will never be called for static no args methods

View File

@ -40,6 +40,7 @@ public class NamedInheritableThreadLocal extends InheritableThreadLocal {
this.name = name;
}
@Override
public String toString() {
return this.name;
}

View File

@ -40,6 +40,7 @@ public class NamedThreadLocal extends ThreadLocal {
this.name = name;
}
@Override
public String toString() {
return this.name;
}

View File

@ -63,6 +63,7 @@ public abstract class NestedCheckedException extends Exception {
* Return the detail message, including the message from the nested exception
* if there is one.
*/
@Override
public String getMessage() {
return NestedExceptionUtils.buildMessage(super.getMessage(), getCause());
}

View File

@ -59,6 +59,7 @@ public class NestedIOException extends IOException {
* Return the detail message, including the message from the nested exception
* if there is one.
*/
@Override
public String getMessage() {
return NestedExceptionUtils.buildMessage(super.getMessage(), getCause());
}

View File

@ -63,6 +63,7 @@ public abstract class NestedRuntimeException extends RuntimeException {
* Return the detail message, including the message from the nested exception
* if there is one.
*/
@Override
public String getMessage() {
return NestedExceptionUtils.buildMessage(super.getMessage(), getCause());
}

View File

@ -54,6 +54,7 @@ public class OverridingClassLoader extends DecoratingClassLoader {
}
@Override
protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
Class result = null;
if (isEligibleForOverriding(name)) {

View File

@ -33,6 +33,7 @@ import org.springframework.core.Ordered;
*/
public class AnnotationAwareOrderComparator extends OrderComparator {
@Override
protected int getOrder(Object obj) {
if (obj instanceof Ordered) {
return ((Ordered) obj).getOrder();

View File

@ -48,6 +48,7 @@ public abstract class AbstractCachingLabeledEnumResolver implements LabeledEnumR
private final CachingMapDecorator labeledEnumCache = new CachingMapDecorator(true) {
@Override
protected Object create(Object key) {
Class enumType = (Class) key;
Set typeEnums = findLabeledEnums(enumType);
@ -64,6 +65,7 @@ public abstract class AbstractCachingLabeledEnumResolver implements LabeledEnumR
}
return Collections.unmodifiableMap(typeEnumMap);
}
@Override
protected boolean useWeakValue(Object key, Object value) {
Class enumType = (Class) key;
if (!ClassUtils.isCacheSafe(enumType, AbstractCachingLabeledEnumResolver.this.getClass().getClassLoader())) {

View File

@ -49,6 +49,7 @@ public abstract class AbstractLabeledEnum implements LabeledEnum {
return this.getCode().compareTo(that.getCode());
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@ -60,10 +61,12 @@ public abstract class AbstractLabeledEnum implements LabeledEnum {
return (this.getType().equals(other.getType()) && this.getCode().equals(other.getCode()));
}
@Override
public int hashCode() {
return (getType().hashCode() * 29 + getCode().hashCode());
}
@Override
public String toString() {
return getLabel();
}

View File

@ -50,6 +50,7 @@ public class StaticLabeledEnumResolver extends AbstractCachingLabeledEnumResolve
}
@Override
protected Set findLabeledEnums(Class type) {
Set typeEnums = new TreeSet();
Field[] fields = type.getFields();

View File

@ -153,6 +153,7 @@ public abstract class AbstractResource implements Resource {
* This implementation returns the description of this resource.
* @see #getDescription()
*/
@Override
public String toString() {
return getDescription();
}
@ -161,6 +162,7 @@ public abstract class AbstractResource implements Resource {
* This implementation compares description strings.
* @see #getDescription()
*/
@Override
public boolean equals(Object obj) {
return (obj == this ||
(obj instanceof Resource && ((Resource) obj).getDescription().equals(getDescription())));
@ -170,6 +172,7 @@ public abstract class AbstractResource implements Resource {
* This implementation returns the description's hash code.
* @see #getDescription()
*/
@Override
public int hashCode() {
return getDescription().hashCode();
}

View File

@ -75,6 +75,7 @@ public class ByteArrayResource extends AbstractResource {
/**
* This implementation always returns <code>true</code>.
*/
@Override
public boolean exists() {
return true;
}
@ -100,6 +101,7 @@ public class ByteArrayResource extends AbstractResource {
* This implementation compares the underlying byte array.
* @see java.util.Arrays#equals(byte[], byte[])
*/
@Override
public boolean equals(Object obj) {
return (obj == this ||
(obj instanceof ByteArrayResource && Arrays.equals(((ByteArrayResource) obj).byteArray, this.byteArray)));
@ -109,6 +111,7 @@ public class ByteArrayResource extends AbstractResource {
* This implementation returns the hash code based on the
* underlying byte array.
*/
@Override
public int hashCode() {
return (byte[].class.hashCode() * 29 * this.byteArray.length);
}

View File

@ -151,6 +151,7 @@ public class ClassPathResource extends AbstractResource {
* @see java.lang.ClassLoader#getResource(String)
* @see java.lang.Class#getResource(String)
*/
@Override
public URL getURL() throws IOException {
URL url = null;
if (this.clazz != null) {
@ -171,6 +172,7 @@ public class ClassPathResource extends AbstractResource {
* resource, provided that it refers to a file in the file system.
* @see org.springframework.util.ResourceUtils#getFile(java.net.URL, String)
*/
@Override
public File getFile() throws IOException {
return ResourceUtils.getFile(getURL(), getDescription());
}
@ -179,6 +181,7 @@ public class ClassPathResource extends AbstractResource {
* This implementation determines the underlying File
* (or jar file, in case of a resource in a jar/zip).
*/
@Override
protected File getFileForLastModifiedCheck() throws IOException {
URL url = getURL();
if (ResourceUtils.isJarURL(url)) {
@ -195,6 +198,7 @@ public class ClassPathResource extends AbstractResource {
* relative to the path of the underlying resource of this descriptor.
* @see org.springframework.util.StringUtils#applyRelativePath(String, String)
*/
@Override
public Resource createRelative(String relativePath) {
String pathToUse = StringUtils.applyRelativePath(this.path, relativePath);
return new ClassPathResource(pathToUse, this.classLoader, this.clazz);
@ -205,6 +209,7 @@ public class ClassPathResource extends AbstractResource {
* resource refers to.
* @see org.springframework.util.StringUtils#getFilename(String)
*/
@Override
public String getFilename() {
return StringUtils.getFilename(this.path);
}
@ -220,6 +225,7 @@ public class ClassPathResource extends AbstractResource {
/**
* This implementation compares the underlying class path locations.
*/
@Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@ -237,6 +243,7 @@ public class ClassPathResource extends AbstractResource {
* This implementation returns the hash code of the underlying
* class path location.
*/
@Override
public int hashCode() {
return this.path.hashCode();
}

View File

@ -134,6 +134,7 @@ public class DefaultResourceLoader implements ResourceLoader {
return getPath();
}
@Override
public Resource createRelative(String relativePath) {
String pathToUse = StringUtils.applyRelativePath(getPath(), relativePath);
return new ClassPathContextResource(pathToUse, getClassLoader());

View File

@ -44,10 +44,12 @@ public class DescriptiveResource extends AbstractResource {
}
@Override
public boolean exists() {
return false;
}
@Override
public boolean isReadable() {
return false;
}
@ -65,6 +67,7 @@ public class DescriptiveResource extends AbstractResource {
/**
* This implementation compares the underlying description String.
*/
@Override
public boolean equals(Object obj) {
return (obj == this ||
(obj instanceof DescriptiveResource && ((DescriptiveResource) obj).description.equals(this.description)));
@ -73,6 +76,7 @@ public class DescriptiveResource extends AbstractResource {
/**
* This implementation returns the hash code of the underlying description String.
*/
@Override
public int hashCode() {
return this.description.hashCode();
}

View File

@ -86,6 +86,7 @@ public class FileSystemResource extends AbstractResource {
* This implementation returns whether the underlying file exists.
* @see java.io.File#exists()
*/
@Override
public boolean exists() {
return this.file.exists();
}
@ -96,6 +97,7 @@ public class FileSystemResource extends AbstractResource {
* @see java.io.File#canRead()
* @see java.io.File#isDirectory()
*/
@Override
public boolean isReadable() {
return (this.file.canRead() && !this.file.isDirectory());
}
@ -112,6 +114,7 @@ public class FileSystemResource extends AbstractResource {
* This implementation returns a URL for the underlying file.
* @see java.io.File#toURI()
*/
@Override
public URL getURL() throws IOException {
return this.file.toURI().toURL();
}
@ -120,6 +123,7 @@ public class FileSystemResource extends AbstractResource {
* This implementation returns a URI for the underlying file.
* @see java.io.File#toURI()
*/
@Override
public URI getURI() throws IOException {
return this.file.toURI();
}
@ -127,6 +131,7 @@ public class FileSystemResource extends AbstractResource {
/**
* This implementation returns the underlying File reference.
*/
@Override
public File getFile() {
return this.file;
}
@ -136,6 +141,7 @@ public class FileSystemResource extends AbstractResource {
* relative to the path of the underlying file of this resource descriptor.
* @see org.springframework.util.StringUtils#applyRelativePath(String, String)
*/
@Override
public Resource createRelative(String relativePath) {
String pathToUse = StringUtils.applyRelativePath(this.path, relativePath);
return new FileSystemResource(pathToUse);
@ -145,6 +151,7 @@ public class FileSystemResource extends AbstractResource {
* This implementation returns the name of the file.
* @see java.io.File#getName()
*/
@Override
public String getFilename() {
return this.file.getName();
}
@ -162,6 +169,7 @@ public class FileSystemResource extends AbstractResource {
/**
* This implementation compares the underlying File references.
*/
@Override
public boolean equals(Object obj) {
return (obj == this ||
(obj instanceof FileSystemResource && this.path.equals(((FileSystemResource) obj).path)));
@ -170,6 +178,7 @@ public class FileSystemResource extends AbstractResource {
/**
* This implementation returns the hash code of the underlying File reference.
*/
@Override
public int hashCode() {
return this.path.hashCode();
}

View File

@ -46,6 +46,7 @@ public class FileSystemResourceLoader extends DefaultResourceLoader {
* @see FileSystemResource
* @see org.springframework.web.context.support.ServletContextResourceLoader#getResourceByPath
*/
@Override
protected Resource getResourceByPath(String path) {
if (path != null && path.startsWith("/")) {
path = path.substring(1);

View File

@ -71,6 +71,7 @@ public class InputStreamResource extends AbstractResource {
/**
* This implementation always returns <code>true</code>.
*/
@Override
public boolean exists() {
return true;
}
@ -78,6 +79,7 @@ public class InputStreamResource extends AbstractResource {
/**
* This implementation always returns <code>true</code>.
*/
@Override
public boolean isOpen() {
return true;
}
@ -106,6 +108,7 @@ public class InputStreamResource extends AbstractResource {
/**
* This implementation compares the underlying InputStream.
*/
@Override
public boolean equals(Object obj) {
return (obj == this ||
(obj instanceof InputStreamResource && ((InputStreamResource) obj).inputStream.equals(this.inputStream)));
@ -114,6 +117,7 @@ public class InputStreamResource extends AbstractResource {
/**
* This implementation returns the hash code of the underlying InputStream.
*/
@Override
public int hashCode() {
return this.inputStream.hashCode();
}

View File

@ -68,6 +68,7 @@ public class ResourceEditor extends PropertyEditorSupport {
}
@Override
public void setAsText(String text) {
if (StringUtils.hasText(text)) {
String locationToUse = resolvePath(text).trim();
@ -90,6 +91,7 @@ public class ResourceEditor extends PropertyEditorSupport {
}
@Override
public String getAsText() {
Resource value = (Resource) getValue();
try {

View File

@ -126,6 +126,7 @@ public class UrlResource extends AbstractResource {
/**
* This implementation returns the underlying URL reference.
*/
@Override
public URL getURL() throws IOException {
return this.url;
}
@ -134,6 +135,7 @@ public class UrlResource extends AbstractResource {
* This implementation returns the underlying URI directly,
* if possible.
*/
@Override
public URI getURI() throws IOException {
if (this.uri != null) {
return this.uri;
@ -148,6 +150,7 @@ public class UrlResource extends AbstractResource {
* provided that it refers to a file in the file system.
* @see org.springframework.util.ResourceUtils#getFile(java.net.URL, String)
*/
@Override
public File getFile() throws IOException {
if (this.uri != null) {
return ResourceUtils.getFile(this.uri, getDescription());
@ -161,6 +164,7 @@ public class UrlResource extends AbstractResource {
* This implementation determines the underlying File
* (or jar file, in case of a resource in a jar/zip).
*/
@Override
protected File getFileForLastModifiedCheck() throws IOException {
if (ResourceUtils.isJarURL(this.url)) {
URL actualUrl = ResourceUtils.extractJarFileURL(this.url);
@ -176,6 +180,7 @@ public class UrlResource extends AbstractResource {
* relative to the path of the underlying URL of this resource descriptor.
* @see java.net.URL#URL(java.net.URL, String)
*/
@Override
public Resource createRelative(String relativePath) throws MalformedURLException {
if (relativePath.startsWith("/")) {
relativePath = relativePath.substring(1);
@ -188,6 +193,7 @@ public class UrlResource extends AbstractResource {
* @see java.net.URL#getFile()
* @see java.io.File#getName()
*/
@Override
public String getFilename() {
return new File(this.url.getFile()).getName();
}
@ -203,6 +209,7 @@ public class UrlResource extends AbstractResource {
/**
* This implementation compares the underlying URL references.
*/
@Override
public boolean equals(Object obj) {
return (obj == this ||
(obj instanceof UrlResource && this.cleanedUrl.equals(((UrlResource) obj).cleanedUrl)));
@ -211,6 +218,7 @@ public class UrlResource extends AbstractResource {
/**
* This implementation returns the hash code of the underlying URL reference.
*/
@Override
public int hashCode() {
return this.cleanedUrl.hashCode();
}

View File

@ -94,6 +94,7 @@ public class EncodedResource {
}
@Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@ -106,10 +107,12 @@ public class EncodedResource {
return false;
}
@Override
public int hashCode() {
return this.resource.hashCode();
}
@Override
public String toString() {
return this.resource.toString();
}

View File

@ -74,6 +74,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport {
/**
* Treat the given text as location pattern and convert it to a Resource array.
*/
@Override
public void setAsText(String text) {
String pattern = resolvePath(text).trim();
try {
@ -89,6 +90,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport {
* Treat the given value as collection or array and convert it to a Resource array.
* Considers String elements as location patterns, and takes Resource elements as-is.
*/
@Override
public void setValue(Object value) throws IllegalArgumentException {
if (value instanceof Collection || (value instanceof Object[] && !(value instanceof Resource[]))) {
Collection input = (value instanceof Collection ? (Collection) value : Arrays.asList((Object[]) value));

View File

@ -180,6 +180,7 @@ public class ToStringCreator {
/**
* Return the String representation that this ToStringCreator built.
*/
@Override
public String toString() {
this.styler.styleEnd(this.buffer, this.object);
return this.buffer.toString();

View File

@ -166,10 +166,12 @@ public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator implement
*/
private static class ConcurrencyThrottleAdapter extends ConcurrencyThrottleSupport {
@Override
protected void beforeAccess() {
super.beforeAccess();
}
@Override
protected void afterAccess() {
super.afterAccess();
}

View File

@ -54,14 +54,17 @@ class AnnotationMetadataReadingVisitor extends ClassMetadataReadingVisitor imple
}
@Override
public AnnotationVisitor visitAnnotation(final String desc, boolean visible) {
final String className = Type.getType(desc).getClassName();
final Map<String, Object> attributes = new LinkedHashMap<String, Object>();
return new EmptyVisitor() {
@Override
public void visit(String name, Object value) {
// Explicitly defined annotation attribute value.
attributes.put(name, value);
}
@Override
public void visitEnd() {
try {
Class annotationClass = classLoader.loadClass(className);

View File

@ -61,6 +61,7 @@ public class CachingMetadataReaderFactory extends SimpleMetadataReaderFactory {
}
@Override
public MetadataReader getMetadataReader(Resource resource) throws IOException {
synchronized (this.classReaderCache) {
MetadataReader metadataReader = this.classReaderCache.get(resource);

View File

@ -50,6 +50,7 @@ class ClassMetadataReadingVisitor extends EmptyVisitor implements ClassMetadata
private String[] interfaces;
@Override
public void visit(int version, int access, String name, String signature, String supername, String[] interfaces) {
this.className = ClassUtils.convertResourcePathToClassName(name);
this.isInterface = ((access & Opcodes.ACC_INTERFACE) != 0);
@ -63,10 +64,12 @@ class ClassMetadataReadingVisitor extends EmptyVisitor implements ClassMetadata
}
}
@Override
public void visitOuterClass(String owner, String name, String desc) {
this.enclosingClassName = ClassUtils.convertResourcePathToClassName(owner);
}
@Override
public void visitInnerClass(String name, String outerName, String innerName, int access) {
if (outerName != null && this.className.equals(ClassUtils.convertResourcePathToClassName(name))) {
this.enclosingClassName = ClassUtils.convertResourcePathToClassName(outerName);

View File

@ -119,6 +119,7 @@ public class AutoPopulatingList implements List, Serializable {
return this.backingList.containsAll(c);
}
@Override
public boolean equals(Object o) {
return this.backingList.equals(o);
}
@ -148,6 +149,7 @@ public class AutoPopulatingList implements List, Serializable {
return element;
}
@Override
public int hashCode() {
return this.backingList.hashCode();
}

View File

@ -269,6 +269,7 @@ public class CachingMapDecorator implements Map, Serializable {
}
@Override
public String toString() {
return "CachingMapDecorator [" + getClass().getName() + "]:" + this.targetMap;
}

View File

@ -53,6 +53,7 @@ public class CommonsLogWriter extends Writer {
}
}
@Override
public void write(char[] buffer, int offset, int length) {
for (int i = 0; i < length; i++) {
char ch = buffer[offset + i];
@ -66,9 +67,11 @@ public class CommonsLogWriter extends Writer {
}
}
@Override
public void flush() {
}
@Override
public void close() {
}

View File

@ -232,6 +232,7 @@ public class StopWatch {
* Return an informative string describing all tasks performed
* For custom reporting, call <code>getTaskInfo()</code> and use the task info directly.
*/
@Override
public String toString() {
StringBuffer sb = new StringBuffer(shortSummary());
if (this.keepTaskList) {

View File

@ -64,6 +64,7 @@ public final class BooleanComparator implements Comparator, Serializable {
return (v1 ^ v2) ? ((v1 ^ this.trueLow) ? 1 : -1) : 0;
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@ -74,10 +75,12 @@ public final class BooleanComparator implements Comparator, Serializable {
return (this.trueLow == ((BooleanComparator) obj).trueLow);
}
@Override
public int hashCode() {
return (this.trueLow ? -1 : 1) * getClass().hashCode();
}
@Override
public String toString() {
return "BooleanComparator: " + (this.trueLow ? "true low" : "true high");
}

View File

@ -184,6 +184,7 @@ public class CompoundComparator implements Comparator, Serializable {
return 0;
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@ -195,10 +196,12 @@ public class CompoundComparator implements Comparator, Serializable {
return this.comparators.equals(other.comparators);
}
@Override
public int hashCode() {
return this.comparators.hashCode();
}
@Override
public String toString() {
return "CompoundComparator: " + this.comparators;
}

View File

@ -96,6 +96,7 @@ public class InvertibleComparator implements Comparator, Serializable {
return 0;
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@ -107,10 +108,12 @@ public class InvertibleComparator implements Comparator, Serializable {
return (this.comparator.equals(other.comparator) && this.ascending == other.ascending);
}
@Override
public int hashCode() {
return this.comparator.hashCode();
}
@Override
public String toString() {
return "InvertibleComparator: [" + this.comparator + "]; ascending=" + this.ascending;
}

View File

@ -96,6 +96,7 @@ public class NullSafeComparator implements Comparator {
return this.nonNullComparator.compare(o1, o2);
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@ -107,10 +108,12 @@ public class NullSafeComparator implements Comparator {
return (this.nonNullComparator.equals(other.nonNullComparator) && this.nullsLow == other.nullsLow);
}
@Override
public int hashCode() {
return (this.nullsLow ? -1 : 1) * this.nonNullComparator.hashCode();
}
@Override
public String toString() {
return "NullSafeComparator: non-null comparator [" + this.nonNullComparator + "]; " +
(this.nullsLow ? "nulls low" : "nulls high");