Automated code cleanups by internal tool.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=69390543
diff --git a/core/src/com/google/inject/internal/Errors.java b/core/src/com/google/inject/internal/Errors.java
index d8dd43c..f684e39 100644
--- a/core/src/com/google/inject/internal/Errors.java
+++ b/core/src/com/google/inject/internal/Errors.java
@@ -19,6 +19,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
+import com.google.common.collect.Ordering;
import com.google.inject.ConfigurationException;
import com.google.inject.CreationException;
import com.google.inject.Key;
@@ -49,8 +50,6 @@
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Formatter;
import java.util.List;
import java.util.Set;
@@ -544,14 +543,12 @@
return ImmutableList.of();
}
- List<Message> result = Lists.newArrayList(root.errors);
- Collections.sort(result, new Comparator<Message>() {
+ return new Ordering<Message>() {
+ @Override
public int compare(Message a, Message b) {
return a.getSource().compareTo(b.getSource());
}
- });
-
- return result;
+ }.sortedCopy(root.errors);
}
/** Returns the formatted message for an exception with the specified messages. */
diff --git a/core/src/com/google/inject/internal/InjectorImpl.java b/core/src/com/google/inject/internal/InjectorImpl.java
index 4c5c45c..00839f6 100644
--- a/core/src/com/google/inject/internal/InjectorImpl.java
+++ b/core/src/com/google/inject/internal/InjectorImpl.java
@@ -309,7 +309,7 @@
/** Returns true if the key type is MembersInjector (but not a subclass of MembersInjector). */
private static boolean isMembersInjector(Key<?> key) {
return key.getTypeLiteral().getRawType().equals(MembersInjector.class)
- && !(key.getAnnotationType() != null);
+ && key.getAnnotationType() == null;
}
private <T> BindingImpl<MembersInjector<T>> createMembersInjectorBinding(
diff --git a/core/src/com/google/inject/internal/InjectorShell.java b/core/src/com/google/inject/internal/InjectorShell.java
index 39d6f3c..6100879 100644
--- a/core/src/com/google/inject/internal/InjectorShell.java
+++ b/core/src/com/google/inject/internal/InjectorShell.java
@@ -16,7 +16,6 @@
package com.google.inject.internal;
-import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.inject.Scopes.SINGLETON;
diff --git a/core/src/com/google/inject/internal/ProviderMethod.java b/core/src/com/google/inject/internal/ProviderMethod.java
index 8746ae1..728d9a9 100644
--- a/core/src/com/google/inject/internal/ProviderMethod.java
+++ b/core/src/com/google/inject/internal/ProviderMethod.java
@@ -171,7 +171,7 @@
}
@Override public String toString() {
- return "@Provides " + StackTraceElements.forMember(method).toString();
+ return "@Provides " + StackTraceElements.forMember(method);
}
@Override
diff --git a/core/src/com/google/inject/internal/util/SourceProvider.java b/core/src/com/google/inject/internal/util/SourceProvider.java
index b36cea8..9d4b9f9 100644
--- a/core/src/com/google/inject/internal/util/SourceProvider.java
+++ b/core/src/com/google/inject/internal/util/SourceProvider.java
@@ -61,11 +61,8 @@
/** Returns true if the className should be skipped. */
private boolean shouldBeSkipped(String className) {
- if ((parent != null && parent.shouldBeSkipped(className))
- || classNamesToSkip.contains(className)) {
- return true;
- }
- return false;
+ return (parent != null && parent.shouldBeSkipped(className))
+ || classNamesToSkip.contains(className);
}
/** Returns the class names as Strings */
diff --git a/core/src/com/google/inject/matcher/Matchers.java b/core/src/com/google/inject/matcher/Matchers.java
index 872c957..1bebcdb 100644
--- a/core/src/com/google/inject/matcher/Matchers.java
+++ b/core/src/com/google/inject/matcher/Matchers.java
@@ -97,7 +97,7 @@
Class<? extends Annotation> annotationType) {
Retention retention = annotationType.getAnnotation(Retention.class);
checkArgument(retention != null && retention.value() == RetentionPolicy.RUNTIME,
- "Annotation " + annotationType.getSimpleName() + " is missing RUNTIME retention");
+ "Annotation %s is missing RUNTIME retention", annotationType.getSimpleName());
}
/**
@@ -119,7 +119,7 @@
}
public boolean matches(AnnotatedElement element) {
- return element.getAnnotation(annotationType) != null;
+ return element.isAnnotationPresent(annotationType);
}
@Override public boolean equals(Object other) {
diff --git a/core/test/com/google/inject/Asserts.java b/core/test/com/google/inject/Asserts.java
index d46a1ff..363e161 100644
--- a/core/test/com/google/inject/Asserts.java
+++ b/core/test/com/google/inject/Asserts.java
@@ -92,8 +92,8 @@
public static void assertEqualsBothWays(Object expected, Object actual) {
assertNotNull(expected);
assertNotNull(actual);
- assertTrue("expected.equals(actual)", expected.equals(actual));
- assertTrue("actual.equals(expected)", actual.equals(expected));
+ assertEquals("expected.equals(actual)", actual, expected);
+ assertEquals("actual.equals(expected)", expected, actual);
assertEquals("hashCode", expected.hashCode(), actual.hashCode());
}
diff --git a/core/test/com/google/inject/BinderTestSuite.java b/core/test/com/google/inject/BinderTestSuite.java
index 0897f67..b34cfe0 100644
--- a/core/test/com/google/inject/BinderTestSuite.java
+++ b/core/test/com/google/inject/BinderTestSuite.java
@@ -35,7 +35,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@@ -348,14 +348,14 @@
}
private Builder scoper(Scoper scoper) {
- name(name + " in " + scoper.toString());
+ name(name + " in " + scoper);
scoper.apply(this);
return this;
}
private <T> Builder expectedValues(T... values) {
this.expectedValues.clear();
- this.expectedValues.addAll(Arrays.asList(values));
+ Collections.addAll(this.expectedValues, values);
return this;
}
diff --git a/core/test/com/google/inject/BindingTest.java b/core/test/com/google/inject/BindingTest.java
index df91c44..7da597d 100644
--- a/core/test/com/google/inject/BindingTest.java
+++ b/core/test/com/google/inject/BindingTest.java
@@ -21,6 +21,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.Runnables;
import com.google.inject.matcher.Matchers;
import com.google.inject.spi.InjectionPoint;
import com.google.inject.spi.TypeEncounter;
@@ -73,9 +74,7 @@
bind(Object.class).to(Runnable.class).in(Scopes.SINGLETON);
// Instance.
- bind(Runnable.class).toInstance(new Runnable() {
- public void run() {}
- });
+ bind(Runnable.class).toInstance(Runnables.doNothing());
// Provider instance.
bind(Foo.class).toProvider(new Provider<Foo>() {
diff --git a/core/test/com/google/inject/MethodInterceptionTest.java b/core/test/com/google/inject/MethodInterceptionTest.java
index ac6d7d9..de39bd9 100644
--- a/core/test/com/google/inject/MethodInterceptionTest.java
+++ b/core/test/com/google/inject/MethodInterceptionTest.java
@@ -218,7 +218,7 @@
break;
}
}
- assertTrue(Arrays.asList(interceptable.lastElements).toString(), cglibFound);
+ assertTrue(Arrays.toString(interceptable.lastElements), cglibFound);
cglibFound = false;
interceptable.bar();
@@ -228,7 +228,7 @@
break;
}
}
- assertFalse(Arrays.asList(interceptable.lastElements).toString(), cglibFound);
+ assertFalse(Arrays.toString(interceptable.lastElements), cglibFound);
}
static class Foo {}
diff --git a/core/test/com/google/inject/ProvisionListenerTest.java b/core/test/com/google/inject/ProvisionListenerTest.java
index a66d346..f70ada5 100644
--- a/core/test/com/google/inject/ProvisionListenerTest.java
+++ b/core/test/com/google/inject/ProvisionListenerTest.java
@@ -587,7 +587,7 @@
assertEquals(notifyType, provision.getBinding().getKey().getRawType());
assertEquals(2, provision.getDependencyChain().size());
- assertEquals(null, provision.getDependencyChain().get(0).getDependency());
+ assertNull(provision.getDependencyChain().get(0).getDependency());
assertContains(provision.getDependencyChain().get(0).getBindingSource(), firstSource);
assertEquals(notifyType,
diff --git a/core/test/com/google/inject/internal/RehashableKeysTest.java b/core/test/com/google/inject/internal/RehashableKeysTest.java
index 96ee93c..f47ff29 100644
--- a/core/test/com/google/inject/internal/RehashableKeysTest.java
+++ b/core/test/com/google/inject/internal/RehashableKeysTest.java
@@ -76,21 +76,21 @@
MutableTestAnnotation annotation = new MutableTestAnnotation(100);
Key<?> key = Key.get(Integer.class, annotation);
Key<?> keyCopy = rehash(key);
- assertTrue(key.equals(keyCopy));
- assertTrue(key.hashCode() == keyCopy.hashCode());
- assertTrue(key.toString().equals(keyCopy.toString()));
+ assertEquals(keyCopy, key);
+ assertEquals(keyCopy.hashCode(), key.hashCode());
+ assertEquals(keyCopy.toString(), key.toString());
annotation.setValue(101);
Key<?> keyCopy2 = rehash(key);
- assertTrue(key.equals(keyCopy2));
+ assertEquals(keyCopy2, key);
assertFalse(key.hashCode() == keyCopy2.hashCode());
assertFalse(key.toString().equals(keyCopy2.toString()));
annotation.setValue(100);
Key<?> keyCopy3 = rehash(keyCopy2);
- assertTrue(key.equals(keyCopy3));
- assertTrue(key.hashCode() == keyCopy3.hashCode());
- assertTrue(keyCopy2.equals(keyCopy3));
+ assertEquals(keyCopy3, key);
+ assertEquals(keyCopy3.hashCode(), key.hashCode());
+ assertEquals(keyCopy3, keyCopy2);
assertFalse(keyCopy2.hashCode() == keyCopy3.hashCode());
assertFalse(keyCopy2.toString().equals(keyCopy3.toString()));
}
diff --git a/core/test/com/google/inject/spi/ElementsTest.java b/core/test/com/google/inject/spi/ElementsTest.java
index 778f37e..6043fac 100644
--- a/core/test/com/google/inject/spi/ElementsTest.java
+++ b/core/test/com/google/inject/spi/ElementsTest.java
@@ -1290,7 +1290,7 @@
Element element = elements.get(i);
if (!(element instanceof Message)) {
ElementSource source = (ElementSource) element.getSource();
- assertTrue(source.getModuleClassNames().size() > 0);
+ assertFalse(source.getModuleClassNames().isEmpty());
if (isIncludeStackTraceComplete()) {
assertTrue(source.getStackTrace().length > 0);
} else {
diff --git a/core/test/com/google/inject/spi/InjectionPointTest.java b/core/test/com/google/inject/spi/InjectionPointTest.java
index ab3eae5..2ba4f5b 100644
--- a/core/test/com/google/inject/spi/InjectionPointTest.java
+++ b/core/test/com/google/inject/spi/InjectionPointTest.java
@@ -33,17 +33,14 @@
import com.google.inject.name.Named;
import com.google.inject.spi.InjectionPoint.Signature;
-import junit.framework.Assert;
import junit.framework.TestCase;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashSet;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -75,8 +72,8 @@
+ getClass().getName() + ".foo", dependency.toString());
assertEquals(fooField, dependency.getInjectionPoint().getMember());
assertEquals(-1, dependency.getParameterIndex());
- Assert.assertEquals(Key.get(String.class, named("a")), dependency.getKey());
- assertEquals(false, dependency.isNullable());
+ assertEquals(Key.get(String.class, named("a")), dependency.getKey());
+ assertFalse(dependency.isNullable());
assertNotSerializable(dependency);
assertEqualsBothWays(dependency,
getOnlyElement(new InjectionPoint(typeLiteral, fooField, false).getDependencies()));
@@ -99,7 +96,7 @@
assertEquals(barMethod, dependency.getInjectionPoint().getMember());
assertEquals(0, dependency.getParameterIndex());
assertEquals(Key.get(String.class, named("b")), dependency.getKey());
- assertEquals(false, dependency.isNullable());
+ assertFalse(dependency.isNullable());
assertNotSerializable(dependency);
assertEqualsBothWays(dependency,
getOnlyElement(new InjectionPoint(typeLiteral, barMethod, false).getDependencies()));
@@ -123,7 +120,7 @@
assertEquals(constructor, dependency.getInjectionPoint().getMember());
assertEquals(0, dependency.getParameterIndex());
assertEquals(Key.get(String.class, named("c")), dependency.getKey());
- assertEquals(false, dependency.isNullable());
+ assertFalse(dependency.isNullable());
assertNotSerializable(dependency);
assertEqualsBothWays(dependency,
getOnlyElement(new InjectionPoint(typeLiteral, constructor).getDependencies()));
@@ -136,7 +133,7 @@
assertNull(dependency.getInjectionPoint());
assertEquals(-1, dependency.getParameterIndex());
assertEquals(Key.get(String.class, named("d")), dependency.getKey());
- assertEquals(true, dependency.isNullable());
+ assertTrue(dependency.isNullable());
assertNotSerializable(dependency);
assertEqualsBothWays(dependency, Dependency.get(Key.get(String.class, named("d"))));
}
diff --git a/core/test/com/google/inject/spi/ProviderMethodsTest.java b/core/test/com/google/inject/spi/ProviderMethodsTest.java
index 5312413..e02988d 100644
--- a/core/test/com/google/inject/spi/ProviderMethodsTest.java
+++ b/core/test/com/google/inject/spi/ProviderMethodsTest.java
@@ -34,7 +34,6 @@
import com.google.inject.Provides;
import com.google.inject.Singleton;
import com.google.inject.Stage;
-import com.google.inject.internal.InternalFlags;
import com.google.inject.internal.ProviderMethod;
import com.google.inject.internal.ProviderMethodsModule;
import com.google.inject.name.Named;
@@ -358,7 +357,7 @@
ProviderInstanceBinding binding = (ProviderInstanceBinding) element;
javax.inject.Provider provider = binding.getUserSuppliedProvider();
- assertTrue(ProviderMethod.class.isAssignableFrom(provider.getClass()));
+ assertTrue(provider instanceof ProviderMethod);
assertEquals(methodsObject, ((ProviderMethod) provider).getInstance());
assertSame(provider, binding.getProviderInstance());
}
diff --git a/core/test/com/google/inject/spi/SpiBindingsTest.java b/core/test/com/google/inject/spi/SpiBindingsTest.java
index b470d61..82e969e 100644
--- a/core/test/com/google/inject/spi/SpiBindingsTest.java
+++ b/core/test/com/google/inject/spi/SpiBindingsTest.java
@@ -411,7 +411,7 @@
public void checkBindingSource(Binding binding) {
assertContains(binding.getSource().toString(), getDeclaringSourcePart(getClass()));
ElementSource source = (ElementSource) binding.getSource();
- assertTrue(source.getModuleClassNames().size() > 0);
+ assertFalse(source.getModuleClassNames().isEmpty());
if (isIncludeStackTraceComplete()) {
assertTrue(source.getStackTrace().length > 0);
} else {
diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java b/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java
index 39e167c..b9619e3 100644
--- a/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java
+++ b/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java
@@ -254,7 +254,7 @@
List<AssistedConstructor<?>> constructors = Lists.newArrayList();
for (Constructor<?> constructor : implementationType.getRawType().getDeclaredConstructors()) {
- if (constructor.getAnnotation(AssistedInject.class) != null) {
+ if (constructor.isAnnotationPresent(AssistedInject.class)) {
AssistedConstructor<?> assistedConstructor = AssistedConstructor.create(
constructor, implementationType.getParameterTypes(constructor));
constructors.add(assistedConstructor);
diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java b/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java
index 971f252..6ec0cd4 100644
--- a/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java
+++ b/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java
@@ -99,8 +99,7 @@
}
@Override public boolean equals(Object o) {
- return o instanceof Assisted
- && ((Assisted) o).value().equals("");
+ return o instanceof Assisted && ((Assisted) o).value().isEmpty();
}
@Override public int hashCode() {
diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java b/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java
index c3afd0c..bde7427 100644
--- a/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java
+++ b/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java
@@ -62,15 +62,12 @@
public String toString() {
StringBuilder result = new StringBuilder();
if (isAssisted) {
- result.append("@Assisted");
- result.append(" ");
+ result.append("@Assisted ");
}
if (bindingAnnotation != null) {
- result.append(bindingAnnotation.toString());
- result.append(" ");
+ result.append(bindingAnnotation).append(" ");
}
- result.append(type.toString());
- return result.toString();
+ return result.append(type).toString();
}
private boolean hasAssistedAnnotation(Annotation[] annotations) {
diff --git a/extensions/assistedinject/test/com/google/inject/assistedinject/ManyConstructorsTest.java b/extensions/assistedinject/test/com/google/inject/assistedinject/ManyConstructorsTest.java
index 8c071dc..f360f06 100644
--- a/extensions/assistedinject/test/com/google/inject/assistedinject/ManyConstructorsTest.java
+++ b/extensions/assistedinject/test/com/google/inject/assistedinject/ManyConstructorsTest.java
@@ -39,7 +39,7 @@
Factory factory = injector.getInstance(Factory.class);
Foo noIndex = factory.create("no index");
assertEquals("no index", noIndex.name);
- assertEquals(null, noIndex.index);
+ assertNull(noIndex.index);
Foo index = factory.create("index", 1);
assertEquals("index", index.name);
assertEquals(1, index.index.intValue());
@@ -55,7 +55,7 @@
OtherFactory factory = injector.getInstance(OtherFactory.class);
Foo noIndex = factory.create("no index");
assertEquals("no index", noIndex.name);
- assertEquals(null, noIndex.index);
+ assertNull(noIndex.index);
Foo index = factory.create(1, "index");
assertEquals("index", index.name);
assertEquals(1, index.index.intValue());
@@ -76,7 +76,7 @@
BarFactory factory = injector.getInstance(BarFactory.class);
Bar noIndex = factory.create("no index");
assertEquals("no index", noIndex.getName());
- assertEquals(null, noIndex.getIndex());
+ assertNull(noIndex.getIndex());
Bar index = factory.create("index", 1);
assertEquals("index", index.getName());
assertEquals(1, index.getIndex().intValue());
@@ -92,7 +92,7 @@
SimpleFactory factory = injector.getInstance(SimpleFactory.class);
Foo noIndex = factory.create("no index");
assertEquals("no index", noIndex.name);
- assertEquals(null, noIndex.index);
+ assertNull(noIndex.index);
injector = Guice.createInjector(new AbstractModule() {
@Override
@@ -274,4 +274,4 @@
public static class Cow {}
public static class Dog {}
-}
\ No newline at end of file
+}
diff --git a/extensions/jmx/src/com/google/inject/tools/jmx/Manager.java b/extensions/jmx/src/com/google/inject/tools/jmx/Manager.java
index b881050..03cbdb8 100644
--- a/extensions/jmx/src/com/google/inject/tools/jmx/Manager.java
+++ b/extensions/jmx/src/com/google/inject/tools/jmx/Manager.java
@@ -77,8 +77,7 @@
new ObjectName(name.toString()));
}
catch (MalformedObjectNameException e) {
- throw new RuntimeException("Bad object name: "
- + name.toString(), e);
+ throw new RuntimeException("Bad object name: " + name, e);
}
catch (Exception e) {
throw new RuntimeException(e);
diff --git a/extensions/mini/src/com/google/inject/mini/MiniGuice.java b/extensions/mini/src/com/google/inject/mini/MiniGuice.java
index e1d7c31..4dd242d 100644
--- a/extensions/mini/src/com/google/inject/mini/MiniGuice.java
+++ b/extensions/mini/src/com/google/inject/mini/MiniGuice.java
@@ -132,7 +132,7 @@
boolean hasProvidesMethods = false;
for (Class<?> c = module.getClass(); c != Object.class; c = c.getSuperclass()) {
for (Method method : c.getDeclaredMethods()) {
- if (method.getAnnotation(com.google.inject.Provides.class) != null) {
+ if (method.isAnnotationPresent(com.google.inject.Provides.class)) {
Key key = key(method, method.getGenericReturnType(), method.getAnnotations());
addProviderMethodBinding(key, module, method);
hasProvidesMethods = true;
@@ -161,7 +161,7 @@
}
};
- boolean singleton = method.getAnnotation(javax.inject.Singleton.class) != null;
+ boolean singleton = method.isAnnotationPresent(javax.inject.Singleton.class);
putBinding(key, unscoped, singleton);
}
@@ -189,7 +189,7 @@
List<Object> fieldKeysList = new ArrayList<Object>();
for (Class<?> c = type; c != Object.class; c = c.getSuperclass()) {
for (Field field : c.getDeclaredFields()) {
- if (field.getAnnotation(javax.inject.Inject.class) == null) {
+ if (!field.isAnnotationPresent(javax.inject.Inject.class)) {
continue;
}
field.setAccessible(true);
@@ -207,7 +207,7 @@
*/
Constructor<?> injectedConstructor = null;
for (Constructor<?> constructor : type.getDeclaredConstructors()) {
- if (constructor.getAnnotation(javax.inject.Inject.class) == null) {
+ if (!constructor.isAnnotationPresent(javax.inject.Inject.class)) {
continue;
}
if (injectedConstructor != null) {
@@ -255,7 +255,7 @@
}
};
- boolean singleton = type.getAnnotation(javax.inject.Singleton.class) != null;
+ boolean singleton = type.isAnnotationPresent(javax.inject.Singleton.class);
putBinding(new Key(type, null), unscoped, singleton);
}
@@ -300,7 +300,7 @@
public Key key(Object subject, Type type, Annotation[] annotations) {
Annotation bindingAnnotation = null;
for (Annotation a : annotations) {
- if (a.annotationType().getAnnotation(javax.inject.Qualifier.class) == null) {
+ if (!a.annotationType().isAnnotationPresent(javax.inject.Qualifier.class)) {
continue;
}
if (bindingAnnotation != null) {
diff --git a/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java b/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java
index 937ac23..6104cf6 100644
--- a/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java
+++ b/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java
@@ -391,13 +391,7 @@
}
@Override public String toString() {
- return new StringBuilder()
- .append(setName)
- .append(setName.length() > 0 ? " " : "")
- .append("Multibinder<")
- .append(elementType)
- .append(">")
- .toString();
+ return (setName.isEmpty() ? "" : setName + " ") + "Multibinder<" + elementType + ">";
}
}
diff --git a/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java b/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java
index 70be342..36e2f9c 100644
--- a/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java
+++ b/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java
@@ -897,7 +897,7 @@
MapBinderBinding<?> map2Binding = collector.mapbinding;
List<Binding<String>> bindings = injector.findBindingsByType(stringType);
- assertEquals("should have two elements: " + bindings.toString(), 2, bindings.size());
+ assertEquals("should have two elements: " + bindings, 2, bindings.size());
Binding<String> a = bindings.get(0);
Binding<String> b = bindings.get(1);
assertEquals("a", ((InstanceBinding<String>) a).getInstance());
diff --git a/extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java b/extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java
index 81eddb8..76d2c3d 100644
--- a/extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java
+++ b/extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java
@@ -73,7 +73,6 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.lang.reflect.Method;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -599,7 +598,7 @@
private <T> Set<T> setOf(T... elements) {
Set<T> result = Sets.newHashSet();
- result.addAll(Arrays.asList(elements));
+ Collections.addAll(result, elements);
return result;
}
diff --git a/extensions/persist/test/com/google/inject/persist/jpa/DynamicFinderTest.java b/extensions/persist/test/com/google/inject/persist/jpa/DynamicFinderTest.java
index 2fd40a4..825d244 100644
--- a/extensions/persist/test/com/google/inject/persist/jpa/DynamicFinderTest.java
+++ b/extensions/persist/test/com/google/inject/persist/jpa/DynamicFinderTest.java
@@ -59,7 +59,7 @@
//obtain same em again (bound to txn)
JpaTestEntity te = new JpaTestEntity();
- te.setText("HIAjsOKAOSD" + new Date() + UUID.randomUUID().toString());
+ te.setText("HIAjsOKAOSD" + new Date() + UUID.randomUUID());
dao.persist(te);
diff --git a/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerFactoryProvisionTest.java b/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerFactoryProvisionTest.java
index d2ec925..1a61e41 100644
--- a/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerFactoryProvisionTest.java
+++ b/extensions/persist/test/com/google/inject/persist/jpa/EntityManagerFactoryProvisionTest.java
@@ -44,9 +44,8 @@
public void testSessionCreateOnInjection() {
- assertTrue("SINGLETON VIOLATION " + UnitOfWork.class.getName(),
- injector.getInstance(UnitOfWork.class)
- .equals(injector.getInstance(UnitOfWork.class)));
+ assertEquals("SINGLETON VIOLATION " + UnitOfWork.class.getName(),
+ injector.getInstance(UnitOfWork.class), injector.getInstance(UnitOfWork.class));
//startup persistence
injector.getInstance(PersistService.class).start();
diff --git a/extensions/service/src/com/google/inject/service/AsyncService.java b/extensions/service/src/com/google/inject/service/AsyncService.java
index 73a2526..8efef12 100644
--- a/extensions/service/src/com/google/inject/service/AsyncService.java
+++ b/extensions/service/src/com/google/inject/service/AsyncService.java
@@ -17,6 +17,7 @@
package com.google.inject.service;
import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.Runnables;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
@@ -32,13 +33,6 @@
public abstract class AsyncService implements Service {
private final ExecutorService executor;
- /**
- * A runnable that does nothing.
- */
- private static final Runnable NOOP = new Runnable() {
- public void run() { }
- };
-
private volatile State state;
public AsyncService(ExecutorService executor) {
@@ -51,7 +45,7 @@
// Starts are idempotent.
if (state == State.STARTED) {
- return new FutureTask<State>(NOOP, State.STARTED);
+ return new FutureTask<State>(Runnables.doNothing(), State.STARTED);
}
return executor.submit(new Callable<State>() {
@@ -76,7 +70,7 @@
// Likewise, stops are idempotent.
if (state == State.STOPPED) {
- return new FutureTask<State>(NOOP, State.STOPPED);
+ return new FutureTask<State>(Runnables.doNothing(), State.STOPPED);
}
return executor.submit(new Callable<State>() {
diff --git a/extensions/servlet/src/com/google/inject/servlet/ManagedFilterPipeline.java b/extensions/servlet/src/com/google/inject/servlet/ManagedFilterPipeline.java
index 9e5b849..538e10a 100644
--- a/extensions/servlet/src/com/google/inject/servlet/ManagedFilterPipeline.java
+++ b/extensions/servlet/src/com/google/inject/servlet/ManagedFilterPipeline.java
@@ -16,7 +16,6 @@
package com.google.inject.servlet;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.inject.Binding;
import com.google.inject.Inject;
@@ -94,7 +93,7 @@
return;
// Used to prevent duplicate initialization.
- Set<Filter> initializedSoFar = Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap());
+ Set<Filter> initializedSoFar = Sets.newIdentityHashSet();
for (FilterDefinition filterDefinition : filterDefinitions) {
filterDefinition.init(servletContext, injector, initializedSoFar);
@@ -162,7 +161,7 @@
servletPipeline.destroy();
//go down chain and destroy all our filters
- Set<Filter> destroyedSoFar = Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap());
+ Set<Filter> destroyedSoFar = Sets.newIdentityHashSet();
for (FilterDefinition filterDefinition : filterDefinitions) {
filterDefinition.destroy(destroyedSoFar);
}
diff --git a/extensions/servlet/src/com/google/inject/servlet/ManagedServletPipeline.java b/extensions/servlet/src/com/google/inject/servlet/ManagedServletPipeline.java
index e3e35df..4ca0f2e 100644
--- a/extensions/servlet/src/com/google/inject/servlet/ManagedServletPipeline.java
+++ b/extensions/servlet/src/com/google/inject/servlet/ManagedServletPipeline.java
@@ -17,7 +17,6 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.inject.Binding;
import com.google.inject.Inject;
@@ -77,8 +76,7 @@
}
public void init(ServletContext servletContext, Injector injector) throws ServletException {
- Set<HttpServlet> initializedSoFar
- = Sets.newSetFromMap(Maps.<HttpServlet, Boolean>newIdentityHashMap());
+ Set<HttpServlet> initializedSoFar = Sets.newIdentityHashSet();
for (ServletDefinition servletDefinition : servletDefinitions) {
servletDefinition.init(servletContext, injector, initializedSoFar);
@@ -100,8 +98,7 @@
}
public void destroy() {
- Set<HttpServlet> destroyedSoFar
- = Sets.newSetFromMap(Maps.<HttpServlet, Boolean>newIdentityHashMap());
+ Set<HttpServlet> destroyedSoFar = Sets.newIdentityHashSet();
for (ServletDefinition servletDefinition : servletDefinitions) {
servletDefinition.destroy(destroyedSoFar);
}
diff --git a/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java b/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java
index 5dcecbb..02a2acd 100644
--- a/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java
+++ b/extensions/servlet/src/com/google/inject/servlet/ServletDefinition.java
@@ -231,13 +231,11 @@
// NOTE(iqshum): I don't think this is possible, since the dispatcher-sent request would
// perform its own wrapping.
private boolean isPathInfoComputed() {
- return pathInfoComputed
- && !(null != servletRequest.getAttribute(REQUEST_DISPATCHER_REQUEST));
+ return pathInfoComputed && servletRequest.getAttribute(REQUEST_DISPATCHER_REQUEST) == null;
}
private boolean isPathComputed() {
- return pathComputed
- && !(null != servletRequest.getAttribute(REQUEST_DISPATCHER_REQUEST));
+ return pathComputed && servletRequest.getAttribute(REQUEST_DISPATCHER_REQUEST) == null;
}
@Override
diff --git a/extensions/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java b/extensions/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
index c151102..136a3cd 100644
--- a/extensions/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
+++ b/extensions/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
@@ -7,7 +7,6 @@
import static org.easymock.EasyMock.verify;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.inject.Binding;
import com.google.inject.Injector;
@@ -29,7 +28,6 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* Tests the lifecycle of the encapsulated {@link FilterDefinition} class.
@@ -71,21 +69,20 @@
String pattern = "/*";
final FilterDefinition filterDef = new FilterDefinition(pattern, Key.get(Filter.class),
UriPatternType.get(UriPatternType.SERVLET, pattern), initParams, null);
- filterDef.init(servletContext, injector,
- Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap()));
+ filterDef.init(servletContext, injector, Sets.<Filter>newIdentityHashSet());
assertTrue(filterDef.getFilter() instanceof MockFilter);
final FilterConfig filterConfig = mockFilter.getConfig();
assertTrue(null != filterConfig);
- assertTrue(contextName.equals(filterConfig.getServletContext().getServletContextName()));
- assertTrue(Key.get(Filter.class).toString().equals(filterConfig.getFilterName()));
+ assertEquals(filterConfig.getServletContext().getServletContextName(), contextName);
+ assertEquals(filterConfig.getFilterName(), Key.get(Filter.class).toString());
final Enumeration names = filterConfig.getInitParameterNames();
while (names.hasMoreElements()) {
String name = (String) names.nextElement();
assertTrue(initParams.containsKey(name));
- assertTrue(initParams.get(name).equals(filterConfig.getInitParameter(name)));
+ assertEquals(filterConfig.getInitParameter(name), initParams.get(name));
}
verify(binding, injector, servletContext);
@@ -119,8 +116,7 @@
UriPatternType.get(UriPatternType.SERVLET, pattern),
new HashMap<String, String>(), null);
//should fire on mockfilter now
- filterDef.init(createMock(ServletContext.class), injector,
- Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap()));
+ filterDef.init(createMock(ServletContext.class), injector, Sets.<Filter>newIdentityHashSet());
assertTrue(filterDef.getFilter() instanceof MockFilter);
assertTrue("Init did not fire", mockFilter.isInit());
@@ -138,7 +134,7 @@
assertTrue("Filter did not proceed down chain", proceed[0]);
- filterDef.destroy(Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap()));
+ filterDef.destroy(Sets.<Filter>newIdentityHashSet());
assertTrue("Destroy did not fire", mockFilter.isDestroy());
verify(injector, request);
@@ -181,8 +177,7 @@
UriPatternType.get(UriPatternType.SERVLET, pattern),
new HashMap<String, String>(), null);
//should fire on mockfilter now
- filterDef.init(createMock(ServletContext.class), injector,
- Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap()));
+ filterDef.init(createMock(ServletContext.class), injector, Sets.<Filter>newIdentityHashSet());
assertTrue(filterDef.getFilter() instanceof MockFilter);
@@ -199,9 +194,9 @@
}
});
- assertTrue("filter did not suppress chain", !proceed[0]);
+ assertFalse("filter did not suppress chain", proceed[0]);
- filterDef.destroy(Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap()));
+ filterDef.destroy(Sets.<Filter>newIdentityHashSet());
assertTrue("destroy did not fire", mockFilter.isDestroy());
verify(injector, request);
@@ -237,8 +232,7 @@
expect(servletRequest.getRequestURI()).andReturn("/a_context_path/test.html");
replay(servletRequest, binding, injector);
- filterDef.init(servletContext, injector,
- Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap()));
+ filterDef.init(servletContext, injector, Sets.<Filter>newIdentityHashSet());
Filter filter = filterDef.getFilterIfMatching(servletRequest);
assertSame(filter, mockFilter);
verify(servletRequest, binding, injector);
@@ -273,8 +267,7 @@
expect(servletRequest.getRequestURI()).andReturn("/test.html");
replay(servletRequest, binding, injector);
- filterDef.init(servletContext, injector,
- Sets.newSetFromMap(Maps.<Filter, Boolean>newIdentityHashMap()));
+ filterDef.init(servletContext, injector, Sets.<Filter>newIdentityHashSet());
Filter filter = filterDef.getFilterIfMatching(servletRequest);
assertNull(filter);
verify(servletRequest, binding, injector);
diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java b/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
index c1857e4..5509a6c 100644
--- a/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
+++ b/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionPathsTest.java
@@ -23,7 +23,6 @@
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.inject.Binding;
import com.google.inject.Injector;
@@ -99,8 +98,7 @@
ServletDefinition servletDefinition = new ServletDefinition(mapping, Key.get(HttpServlet.class),
UriPatternType.get(UriPatternType.SERVLET, mapping), new HashMap<String, String>(), null);
- servletDefinition.init(null, injector,
- Sets.newSetFromMap(Maps.<HttpServlet, Boolean>newIdentityHashMap()));
+ servletDefinition.init(null, injector, Sets.<HttpServlet>newIdentityHashSet());
servletDefinition.doService(request, response);
assertTrue("Servlet did not run!", run[0]);
@@ -196,8 +194,7 @@
ServletDefinition servletDefinition = new ServletDefinition(mapping, Key.get(HttpServlet.class),
UriPatternType.get(UriPatternType.SERVLET, mapping), new HashMap<String, String>(), null);
- servletDefinition.init(null, injector,
- Sets.newSetFromMap(Maps.<HttpServlet, Boolean>newIdentityHashMap()));
+ servletDefinition.init(null, injector, Sets.<HttpServlet>newIdentityHashSet());
servletDefinition.doService(request, response);
assertTrue("Servlet did not run!", run[0]);
@@ -292,8 +289,7 @@
ServletDefinition servletDefinition = new ServletDefinition(mapping, Key.get(HttpServlet.class),
UriPatternType.get(UriPatternType.REGEX, mapping), new HashMap<String, String>(), null);
- servletDefinition.init(null, injector,
- Sets.newSetFromMap(Maps.<HttpServlet, Boolean>newIdentityHashMap()));
+ servletDefinition.init(null, injector, Sets.<HttpServlet>newIdentityHashSet());
servletDefinition.doService(request, response);
assertTrue("Servlet did not run!", run[0]);
diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java b/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java
index 1a8224a..a6d52a2 100644
--- a/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java
+++ b/extensions/servlet/test/com/google/inject/servlet/ServletDefinitionTest.java
@@ -23,7 +23,6 @@
import static org.easymock.EasyMock.verify;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.inject.Binding;
import com.google.inject.Injector;
@@ -83,8 +82,7 @@
replay(servletContext);
- servletDefinition.init(servletContext, injector,
- Sets.newSetFromMap(Maps.<HttpServlet, Boolean>newIdentityHashMap()));
+ servletDefinition.init(servletContext, injector, Sets.<HttpServlet>newIdentityHashSet());
assertNotNull(mockServlet.getServletContext());
assertEquals(contextName, mockServlet.getServletContext().getServletContextName());
diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletDispatchIntegrationTest.java b/extensions/servlet/test/com/google/inject/servlet/ServletDispatchIntegrationTest.java
index 7282a14..03edc59 100644
--- a/extensions/servlet/test/com/google/inject/servlet/ServletDispatchIntegrationTest.java
+++ b/extensions/servlet/test/com/google/inject/servlet/ServletDispatchIntegrationTest.java
@@ -176,7 +176,7 @@
public void service(ServletRequest servletRequest, ServletResponse servletResponse)
throws IOException, ServletException {
- assertTrue("NeverServlet was fired, when it should not have been.", false);
+ fail("NeverServlet was fired, when it should not have been.");
}
public void destroy() {
diff --git a/extensions/servlet/test/com/google/inject/servlet/ServletPipelineRequestDispatcherTest.java b/extensions/servlet/test/com/google/inject/servlet/ServletPipelineRequestDispatcherTest.java
index 7c22d59..6343ac5 100644
--- a/extensions/servlet/test/com/google/inject/servlet/ServletPipelineRequestDispatcherTest.java
+++ b/extensions/servlet/test/com/google/inject/servlet/ServletPipelineRequestDispatcherTest.java
@@ -26,7 +26,6 @@
import static org.easymock.EasyMock.verify;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.inject.Binding;
import com.google.inject.Injector;
@@ -112,8 +111,7 @@
replay(injector, binding, requestMock, mockBinding);
// Have to init the Servlet before we can dispatch to it.
- servletDefinition.init(null, injector,
- Sets.newSetFromMap(Maps.<HttpServlet, Boolean>newIdentityHashMap()));
+ servletDefinition.init(null, injector, Sets.<HttpServlet>newIdentityHashSet());
final RequestDispatcher dispatcher = new ManagedServletPipeline(
injector)
@@ -183,8 +181,7 @@
replay(injector, binding, requestMock, mockResponse, mockBinding);
// Have to init the Servlet before we can dispatch to it.
- servletDefinition.init(null, injector,
- Sets.newSetFromMap(Maps.<HttpServlet, Boolean>newIdentityHashMap()));
+ servletDefinition.init(null, injector, Sets.<HttpServlet>newIdentityHashSet());
final RequestDispatcher dispatcher = new ManagedServletPipeline(injector)
.getRequestDispatcher(pattern);
@@ -256,8 +253,7 @@
replay(injector, binding, mockRequest, mockResponse, mockBinding);
// Have to init the Servlet before we can dispatch to it.
- servletDefinition.init(null, injector,
- Sets.newSetFromMap(Maps.<HttpServlet, Boolean>newIdentityHashMap()));
+ servletDefinition.init(null, injector, Sets.<HttpServlet>newIdentityHashSet());
final RequestDispatcher dispatcher = new ManagedServletPipeline(injector)
.getRequestDispatcher(pattern);
diff --git a/extensions/servlet/test/com/google/inject/servlet/VarargsServletDispatchIntegrationTest.java b/extensions/servlet/test/com/google/inject/servlet/VarargsServletDispatchIntegrationTest.java
index 84622b4..2309904 100644
--- a/extensions/servlet/test/com/google/inject/servlet/VarargsServletDispatchIntegrationTest.java
+++ b/extensions/servlet/test/com/google/inject/servlet/VarargsServletDispatchIntegrationTest.java
@@ -207,7 +207,7 @@
public void service(ServletRequest servletRequest, ServletResponse servletResponse)
throws IOException, ServletException {
- assertTrue("NeverServlet was fired, when it should not have been.", false);
+ fail("NeverServlet was fired, when it should not have been.");
}
public void destroy() {
diff --git a/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviderMethod.java b/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviderMethod.java
index 8d975ee..f65b6d2 100644
--- a/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviderMethod.java
+++ b/extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviderMethod.java
@@ -129,6 +129,6 @@
}
@Override public String toString() {
- return "@CheckedProvides " + StackTraceElements.forMember(method).toString();
+ return "@CheckedProvides " + StackTraceElements.forMember(method);
}
}
