http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java index 1eba8a1..e1e489e 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java @@ -73,13 +73,13 @@ public class Tint { this(new URL[0]); } - public Tint(URL[] jars) { + public Tint(final URL[] jars) { this(jars, false); } @SuppressWarnings("unchecked") - public Tint(URL[] jars, boolean checkTang) { - Object[] args = new Object[jars.length + 6]; + public Tint(final URL[] jars, final boolean checkTang) { + final Object[] args = new Object[jars.length + 6]; for (int i = 0; i < jars.length; i++) { args[i] = jars[i]; } @@ -89,31 +89,31 @@ public class Tint { args[args.length - 4] = new MethodParameterScanner(); args[args.length - 5] = "com.microsoft"; args[args.length - 6] = "org.apache"; - Reflections r = new Reflections(args); + final Reflections r = new Reflections(args); // Set<Class<?>> classes = new MonotonicSet<>(); - Set<String> strings = new TreeSet<>(); - Set<String> moduleBuilders = new MonotonicSet<>(); + final Set<String> strings = new TreeSet<>(); + final Set<String> moduleBuilders = new MonotonicSet<>(); // Workaround bug in Reflections by keeping things stringly typed, and using Tang to parse them. // Set<Constructor<?>> injectConstructors = (Set<Constructor<?>>)(Set)r.getMethodsAnnotatedWith(Inject.class); // for(Constructor<?> c : injectConstructors) { // classes.add(c.getDeclaringClass()); // } - Set<String> injectConstructors = + final Set<String> injectConstructors = r.getStore().getConstructorsAnnotatedWith(ReflectionUtilities.getFullName(Inject.class)); - for (String s : injectConstructors) { + for (final String s : injectConstructors) { strings.add(s.replaceAll("\\.<.+$", "")); } - Set<String> parameterConstructors = + final Set<String> parameterConstructors = r.getStore().get(MethodParameterScanner.class, ReflectionUtilities.getFullName(Parameter.class)); - for (String s : parameterConstructors) { + for (final String s : parameterConstructors) { strings.add(s.replaceAll("\\.<.+$", "")); } // Set<Class> r.getConstructorsWithAnyParamAnnotated(Parameter.class); // for(Constructor<?> c : parameterConstructors) { // classes.add(c.getDeclaringClass()); // } - Set<String> defaultStrings = + final Set<String> defaultStrings = r.getStore().get(TypeAnnotationsScanner.class, ReflectionUtilities.getFullName(DefaultImplementation.class)); strings.addAll(defaultStrings); strings.addAll(r.getStore().get(TypeAnnotationsScanner.class, @@ -141,7 +141,7 @@ public class Tint { // } // } - for (String s : strings) { + for (final String s : strings) { if (classFilter(checkTang, s)) { try { ch.getNode(s); @@ -150,7 +150,7 @@ public class Tint { } } } - for (String s : moduleBuilders) { + for (final String s : moduleBuilders) { if (classFilter(checkTang, s)) { try { ch.getNode(s); @@ -160,12 +160,12 @@ public class Tint { } } - NodeVisitor<Node> v = new AbstractClassHierarchyNodeVisitor() { + final NodeVisitor<Node> v = new AbstractClassHierarchyNodeVisitor() { @Override - public boolean visit(NamedParameterNode<?> node) { - String nodeS = node.getFullName(); - for (String s : node.getDefaultInstanceAsStrings()) { + public boolean visit(final NamedParameterNode<?> node) { + final String nodeS = node.getFullName(); + for (final String s : node.getDefaultInstanceAsStrings()) { if (!usages.contains(s, nodeS)) { usages.put(s, nodeS); } @@ -174,15 +174,15 @@ public class Tint { } @Override - public boolean visit(PackageNode node) { + public boolean visit(final PackageNode node) { return true; } @Override - public boolean visit(ClassNode<?> node) { - String nodeS = node.getFullName(); - for (ConstructorDef<?> d : node.getInjectableConstructors()) { - for (ConstructorArg a : d.getArgs()) { + public boolean visit(final ClassNode<?> node) { + final String nodeS = node.getFullName(); + for (final ConstructorDef<?> d : node.getInjectableConstructors()) { + for (final ConstructorArg a : d.getArgs()) { if (a.getNamedParameterName() != null && !usages.contains(a.getNamedParameterName(), nodeS)) { usages.put(a.getNamedParameterName(), nodeS); @@ -201,25 +201,25 @@ public class Tint { Walk.preorder(v, null, ch.getNamespace()); - for (ClassNode<?> cn : knownClasses) { + for (final ClassNode<?> cn : knownClasses) { try { - String s = cn.getFullName(); + final String s = cn.getFullName(); if (classFilter(checkTang, s)) { - Class<?> c = ch.classForName(s); + final Class<?> c = ch.classForName(s); processDefaultAnnotation(c); processConfigurationModules(c); } - } catch (ClassNotFoundException e) { + } catch (final ClassNotFoundException e) { e.printStackTrace(); } } - for (Field f : modules.keySet()) { - ConfigurationModule m = modules.get(f); - String fS = ReflectionUtilities.getFullName(f); - Set<NamedParameterNode<?>> nps = m.getBoundNamedParameters(); - for (NamedParameterNode<?> np : nps) { - String npS = np.getFullName(); + for (final Field f : modules.keySet()) { + final ConfigurationModule m = modules.get(f); + final String fS = ReflectionUtilities.getFullName(f); + final Set<NamedParameterNode<?>> nps = m.getBoundNamedParameters(); + for (final NamedParameterNode<?> np : nps) { + final String npS = np.getFullName(); if (!setters.contains(npS, fS)) { setters.put(npS, fS); } @@ -229,17 +229,17 @@ public class Tint { } - public static String stripCommonPrefixes(String s) { + public static String stripCommonPrefixes(final String s) { return stripPrefixHelper2( stripPrefixHelper2(s, "java.lang"), "java.util"); } - public static String stripPrefixHelper2(String s, String prefix) { - String[] pretok = prefix.split("\\."); - String[] stok = s.split("\\."); - StringBuffer sb = new StringBuffer(); + public static String stripPrefixHelper2(final String s, final String prefix) { + final String[] pretok = prefix.split("\\."); + final String[] stok = s.split("\\."); + final StringBuffer sb = new StringBuffer(); int i; for (i = 0; i < pretok.length && i < stok.length; i++) { if (pretok[i].equals(stok[i])) { @@ -272,7 +272,7 @@ public class Tint { return s; } }*/ - public static String stripPrefix(String s, String prefix) { + public static String stripPrefix(final String s, final String prefix) { return stripPrefixHelper2(stripPrefixHelper2(stripPrefixHelper2( stripCommonPrefixes(stripPrefixHelper2(s, prefix)), "org.apache.reef"), "org.apache.reef"), "org.apache.reef.wake"); @@ -283,7 +283,7 @@ public class Tint { * @throws FileNotFoundException * @throws MalformedURLException */ - public static void main(String[] args) throws FileNotFoundException, MalformedURLException { + public static void main(final String[] args) throws FileNotFoundException, MalformedURLException { int i = 0; String doc = null; String jar = null; @@ -338,9 +338,9 @@ public class Tint { String currentPackage = ""; for (final Node n : t.getNamesUsedAndSet()) { - String fullName = n.getFullName(); - String[] tok = fullName.split("\\."); - StringBuffer sb = new StringBuffer(tok[0]); + final String fullName = n.getFullName(); + final String[] tok = fullName.split("\\."); + final StringBuffer sb = new StringBuffer(tok[0]); for (int j = 1; j < tok.length; j++) { if (tok[j].matches("^[A-Z].*") || j > 4) { break; @@ -348,7 +348,7 @@ public class Tint { sb.append("." + tok[j]); } } - String pack = sb.toString(); + final String pack = sb.toString(); if (!currentPackage.equals(pack)) { currentPackage = pack; out.println(t.endPackage()); @@ -366,13 +366,13 @@ public class Tint { out.println(t.endPackage()); out.println("<div class='package'>Module definitions</div>"); for (final Field f : t.modules.keySet()) { - String moduleName = ReflectionUtilities.getFullName(f); + final String moduleName = ReflectionUtilities.getFullName(f); // String declaringClassName = ReflectionUtilities.getFullName(f.getDeclaringClass()); out.println("<div class='module-margin' id='" + moduleName + "'><div class='decl'><span class='fullName'>" + moduleName + "</span>"); out.println("<pre>"); - String conf = t.modules.get(f).toPrettyString(); - String[] tok = conf.split("\n"); + final String conf = t.modules.get(f).toPrettyString(); + final String[] tok = conf.split("\n"); for (final String line : tok) { out.println(stripPrefix(line, "no.such.prefix")); //t.modules.get(f).toPrettyString()); } @@ -392,16 +392,16 @@ public class Tint { Class<?> clz = null; try { clz = t.ch.classForName(c.getFullName()); - } catch (ClassNotFoundException e) { + } catch (final ClassNotFoundException e) { // TODO Auto-generated catch block e.printStackTrace(); } - String typ = clz.isInterface() ? "interface" : "class"; + final String typ = clz.isInterface() ? "interface" : "class"; out.println("<div class='module-margin' id='" + c.getFullName() + "'><div class='decl'>" + "<span class='fullName'>" + typ + " " + c.getFullName() + "</span>"); - for (ConstructorDef<?> d : c.getInjectableConstructors()) { + for (final ConstructorDef<?> d : c.getInjectableConstructors()) { out.println("<div class='uses'>" + c.getFullName() + "("); - for (ConstructorArg a : d.getArgs()) { + for (final ConstructorArg a : d.getArgs()) { if (a.getNamedParameterName() != null) { out.print("<div class='constructorArg'><a href='#" + a.getType() + "'>" + stripPrefix(a.getType(), "xxx") + "</a> <a href='#" + a.getNamedParameterName() + "'>" + @@ -429,17 +429,17 @@ public class Tint { } } - private boolean classFilter(boolean checkTang, String s) { + private boolean classFilter(final boolean checkTang, final String s) { return (checkTang || !s.startsWith("org.apache.reef.tang")); } - private void processDefaultAnnotation(Class<?> cmb) { - DefaultImplementation di = cmb.getAnnotation(DefaultImplementation.class); + private void processDefaultAnnotation(final Class<?> cmb) { + final DefaultImplementation di = cmb.getAnnotation(DefaultImplementation.class); // XXX hack: move to helper method + unify with rest of Tang! if (di != null) { - String diName = di.value() == Void.class ? di.name() : ReflectionUtilities.getFullName(di.value()); - ClassNode<?> cn = (ClassNode<?>) ch.getNode(cmb); - String cnS = cn.getFullName(); + final String diName = di.value() == Void.class ? di.name() : ReflectionUtilities.getFullName(di.value()); + final ClassNode<?> cn = (ClassNode<?>) ch.getNode(cmb); + final String cnS = cn.getFullName(); if (!usages.contains(diName, cnS)) { usages.put(diName, cnS); if (!knownClasses.contains(cn)) { @@ -449,10 +449,10 @@ public class Tint { } } - private void processConfigurationModules(Class<?> cmb) { - for (Field f : cmb.getFields()) { + private void processConfigurationModules(final Class<?> cmb) { + for (final Field f : cmb.getFields()) { if (ReflectionUtilities.isCoercable(ConfigurationModule.class, f.getType())) { - int mod = f.getModifiers(); + final int mod = f.getModifiers(); boolean ok = true; if (Modifier.isPrivate(mod)) { System.err.println("Found private ConfigurationModule " + f); @@ -470,52 +470,52 @@ public class Tint { // System.err.println("OK: " + f); try { f.setAccessible(true); - String fS = ReflectionUtilities.getFullName(f); + final String fS = ReflectionUtilities.getFullName(f); if (!modules.containsKey(f)) { modules.put(f, (ConfigurationModule) (f.get(null))); try { modules.get(f).assertStaticClean(); - } catch (ClassHierarchyException e) { + } catch (final ClassHierarchyException e) { System.err.println(fS + ": " + e.getMessage()); } - for (Entry<String, String> e : modules.get(f).toStringPairs()) { + for (final Entry<String, String> e : modules.get(f).toStringPairs()) { //System.err.println("e: " + e.getKey() + "=" + e.getValue()); try { - Node n = ch.getNode(e.getKey()); + final Node n = ch.getNode(e.getKey()); if (!setters.contains(e.getKey(), fS)) { setters.put(e.getKey(), fS); } if (n instanceof ClassNode) { - ClassNode<?> cn = (ClassNode<?>) n; + final ClassNode<?> cn = (ClassNode<?>) n; if (!knownClasses.contains(cn)) { knownClasses.add(cn); } } - } catch (NameResolutionException ex) { + } catch (final NameResolutionException ex) { // } try { - String s = e.getValue(); - Node n = ch.getNode(s); + final String s = e.getValue(); + final Node n = ch.getNode(s); if (!usages.contains(ReflectionUtilities.getFullName(f), s)) { // System.err.println("Added usage: " + ReflectionUtilities.getFullName(f) + "=" + s); usages.put(s, ReflectionUtilities.getFullName(f)); } if (n instanceof ClassNode) { - ClassNode<?> cn = (ClassNode<?>) n; + final ClassNode<?> cn = (ClassNode<?>) n; if (!knownClasses.contains(cn)) { System.err.println("Added " + cn + " to known classes"); knownClasses.add(cn); } } - } catch (NameResolutionException ex) { + } catch (final NameResolutionException ex) { // } } } - } catch (ExceptionInInitializerError e) { + } catch (final ExceptionInInitializerError e) { System.err.println("Field " + ReflectionUtilities.getFullName(f) + ": " + e.getCause().getMessage()); - } catch (IllegalAccessException e) { + } catch (final IllegalAccessException e) { throw new RuntimeException(e); } } @@ -525,21 +525,21 @@ public class Tint { public Set<NamedParameterNode<?>> getNames() { final Set<NamedParameterNode<?>> names = new MonotonicSet<>(); - NodeVisitor<Node> v = new AbstractClassHierarchyNodeVisitor() { + final NodeVisitor<Node> v = new AbstractClassHierarchyNodeVisitor() { @Override - public boolean visit(NamedParameterNode<?> node) { + public boolean visit(final NamedParameterNode<?> node) { names.add(node); return true; } @Override - public boolean visit(PackageNode node) { + public boolean visit(final PackageNode node) { return true; } @Override - public boolean visit(ClassNode<?> node) { + public boolean visit(final ClassNode<?> node) { return true; } }; @@ -552,22 +552,22 @@ public class Tint { final Set<String> userKeys = usages.keySet(); final Set<String> usedKeys = usages.values(); final Set<String> setterKeys = setters.keySet(); - NodeVisitor<Node> v = new AbstractClassHierarchyNodeVisitor() { + final NodeVisitor<Node> v = new AbstractClassHierarchyNodeVisitor() { @Override - public boolean visit(NamedParameterNode<?> node) { + public boolean visit(final NamedParameterNode<?> node) { names.add(node); return true; } @Override - public boolean visit(PackageNode node) { + public boolean visit(final PackageNode node) { return true; } @Override - public boolean visit(ClassNode<?> node) { - String nodeS = node.getFullName(); + public boolean visit(final ClassNode<?> node) { + final String nodeS = node.getFullName(); if (userKeys.contains(nodeS)) { names.add(node); } @@ -596,9 +596,9 @@ public class Tint { return setters.getValuesForKey(name.getFullName()); } - public String toString(NamedParameterNode<?> n) { - StringBuilder sb = new StringBuilder("Name: " + n.getSimpleArgName() + " " + n.getFullName()); - String[] instances = n.getDefaultInstanceAsStrings(); + public String toString(final NamedParameterNode<?> n) { + final StringBuilder sb = new StringBuilder("Name: " + n.getSimpleArgName() + " " + n.getFullName()); + final String[] instances = n.getDefaultInstanceAsStrings(); if (instances.length != 0) { sb.append(" = "); sb.append(join(",", instances)); @@ -609,9 +609,9 @@ public class Tint { return sb.toString(); } - private String join(String sep, String[] s) { + private String join(final String sep, final String[] s) { if (s.length > 0) { - StringBuffer sb = new StringBuffer(s[0]); + final StringBuffer sb = new StringBuffer(s[0]); for (int i = 1; i < s.length; i++) { sb.append(sep); sb.append(s[i]); @@ -622,34 +622,35 @@ public class Tint { } } - public String cell(String s, String clazz) { - if (clazz.equals(USES) && s.length() > 0) { - s = "<em>Used by:</em><br>" + s; + public String cell(final String s, final String clazz) { + String str = s; + if (clazz.equals(USES) && str.length() > 0) { + str = "<em>Used by:</em><br>" + str; } - if (clazz.equals(SETTERS) && s.length() > 0) { - s = "<em>Set by:</em><br>" + s; + if (clazz.equals(SETTERS) && str.length() > 0) { + str = "<em>Set by:</em><br>" + str; } if (clazz.equals(FULLNAME)) { - s = " " + s; + str = " " + str; } if (divs.contains(clazz)) { - return "<div class=\"" + clazz + "\">" + s + "</div>"; + return "<div class=\"" + clazz + "\">" + str + "</div>"; } else { - return "<span class=\"" + clazz + "\">" + s + "</span>"; + return "<span class=\"" + clazz + "\">" + str + "</span>"; } } - public String cell(StringBuffer sb, String clazz) { + public String cell(final StringBuffer sb, final String clazz) { return cell(sb.toString(), clazz); } - public String row(StringBuffer sb) { + public String row(final StringBuffer sb) { return sb.toString(); } - public String toHtmlString(NamedParameterNode<?> n, String pack) { - String fullName = stripPrefix(n.getFullName(), pack); - StringBuffer sb = new StringBuffer(); + public String toHtmlString(final NamedParameterNode<?> n, final String pack) { + final String fullName = stripPrefix(n.getFullName(), pack); + final StringBuffer sb = new StringBuffer(); sb.append("<div id='" + n.getFullName() + "' class='decl-margin'>"); sb.append("<div class='decl'>"); @@ -658,7 +659,7 @@ public class Tint { final String instance; final String[] instances = n.getDefaultInstanceAsStrings(); if (instances.length != 0) { - StringBuffer sb2 = new StringBuffer(" = " + stripPrefix(instances[0], pack)); + final StringBuffer sb2 = new StringBuffer(" = " + stripPrefix(instances[0], pack)); for (int i = 1; i < instances.length; i++) { sb2.append("," + stripPrefix(instances[i], pack)); } @@ -667,18 +668,18 @@ public class Tint { instance = ""; } sb.append(cell(instance, "instance")); - StringBuffer doc = new StringBuffer(); + final StringBuffer doc = new StringBuffer(); if (!n.getDocumentation().equals("")) { doc.append(n.getDocumentation()); } sb.append(cell(doc, "doc")); - StringBuffer uses = new StringBuffer(); - for (String u : getUsesOf(n)) { + final StringBuffer uses = new StringBuffer(); + for (final String u : getUsesOf(n)) { uses.append("<a href='#" + u + "'>" + stripPrefix(u, pack) + "</a> "); } sb.append(cell(uses, USES)); - StringBuffer settersStr = new StringBuffer(); - for (String f : getSettersOf(n)) { + final StringBuffer settersStr = new StringBuffer(); + for (final String f : getSettersOf(n)) { settersStr.append("<a href='#" + f + "'>" + stripPrefix(f, pack) + "</a> "); } sb.append(cell(settersStr, SETTERS)); @@ -687,8 +688,8 @@ public class Tint { return row(sb); } - public String toHtmlString(ClassNode<?> n, String pack) { - String fullName = stripPrefix(n.getFullName(), pack); + public String toHtmlString(final ClassNode<?> n, final String pack) { + final String fullName = stripPrefix(n.getFullName(), pack); final String type; try { @@ -697,10 +698,10 @@ public class Tint { } else { type = "class"; } - } catch (ClassNotFoundException e) { + } catch (final ClassNotFoundException e) { throw new RuntimeException(e); } - StringBuffer sb = new StringBuffer(); + final StringBuffer sb = new StringBuffer(); sb.append("<div class='decl-margin' id='" + n.getFullName() + "'>"); sb.append("<div class='decl'>"); @@ -713,13 +714,13 @@ public class Tint { } sb.append(cell(instance, "simpleName")); sb.append(cell("", "fullName")); // TODO: Documentation string? - StringBuffer uses = new StringBuffer(); - for (String u : getUsesOf(n)) { + final StringBuffer uses = new StringBuffer(); + for (final String u : getUsesOf(n)) { uses.append("<a href='#" + u + "'>" + stripPrefix(u, pack) + "</a> "); } sb.append(cell(uses, USES)); - StringBuffer settersStr = new StringBuffer(); - for (String f : getSettersOf(n)) { + final StringBuffer settersStr = new StringBuffer(); + for (final String f : getSettersOf(n)) { settersStr.append("<a href='#" + f + "'>" + stripPrefix(f, pack) + "</a> "); } sb.append(cell(settersStr, SETTERS)); @@ -728,7 +729,7 @@ public class Tint { return row(sb); } - public String startPackage(String pack) { + public String startPackage(final String pack) { return "<div class=\"package\">" + pack + "</div>"; // return "<tr><td colspan='6'><br><b>" + pack + "</b></td></tr>"; }
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java index 1fb87e3..e46808d 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/TracingMonotonicTreeMap.java @@ -34,12 +34,12 @@ public final class TracingMonotonicTreeMap<K, V> implements TracingMonotonicMap< } @Override - public boolean containsKey(Object key) { + public boolean containsKey(final Object key) { return innerMap.containsKey(key); } @Override - public boolean containsValue(Object value) { + public boolean containsValue(final Object value) { throw new UnsupportedOperationException(); } @@ -49,8 +49,8 @@ public final class TracingMonotonicTreeMap<K, V> implements TracingMonotonicMap< } @Override - public V get(Object key) { - EntryImpl ret = innerMap.get(key); + public V get(final Object key) { + final EntryImpl ret = innerMap.get(key); return ret != null ? ret.getKey() : null; } @@ -65,18 +65,18 @@ public final class TracingMonotonicTreeMap<K, V> implements TracingMonotonicMap< } @Override - public V put(K key, V value) { - EntryImpl ret = innerMap.put(key, new EntryImpl(value, new StackBindLocation())); + public V put(final K key, final V value) { + final EntryImpl ret = innerMap.put(key, new EntryImpl(value, new StackBindLocation())); return ret != null ? ret.getKey() : null; } @Override - public void putAll(Map<? extends K, ? extends V> m) { + public void putAll(final Map<? extends K, ? extends V> m) { throw new UnsupportedOperationException(); } @Override - public V remove(Object key) { + public V remove(final Object key) { throw new UnsupportedOperationException(); } @@ -91,7 +91,7 @@ public final class TracingMonotonicTreeMap<K, V> implements TracingMonotonicMap< } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } @@ -117,7 +117,7 @@ public final class TracingMonotonicTreeMap<K, V> implements TracingMonotonicMap< private final V key; private final BindLocation value; - EntryImpl(V key, BindLocation value) { + EntryImpl(final V key, final BindLocation value) { this.key = key; this.value = value; } @@ -134,7 +134,7 @@ public final class TracingMonotonicTreeMap<K, V> implements TracingMonotonicMap< @Override @SuppressWarnings("checkstyle:hiddenfield") - public BindLocation setValue(BindLocation value) { + public BindLocation setValue(final BindLocation value) { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ValidateConfiguration.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ValidateConfiguration.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ValidateConfiguration.java index a50a9eb..331f384 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ValidateConfiguration.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ValidateConfiguration.java @@ -47,9 +47,9 @@ public class ValidateConfiguration { @Inject public ValidateConfiguration( - @Parameter(ClassHierarchyIn.class) File ch, - @Parameter(ConfigurationIn.class) File inConfig, - @Parameter(ConfigurationOut.class) File outConfig) { + @Parameter(ClassHierarchyIn.class) final File ch, + @Parameter(ConfigurationIn.class) final File inConfig, + @Parameter(ConfigurationOut.class) final File outConfig) { this.target = null; this.ch = ch; this.inConfig = inConfig; @@ -59,27 +59,27 @@ public class ValidateConfiguration { @Inject public ValidateConfiguration( - @Parameter(Target.class) String injectedClass, - @Parameter(ClassHierarchyIn.class) File ch, - @Parameter(ConfigurationIn.class) File inConfig, - @Parameter(ConfigurationOut.class) File outConfig) { + @Parameter(Target.class) final String injectedClass, + @Parameter(ClassHierarchyIn.class) final File ch, + @Parameter(ConfigurationIn.class) final File inConfig, + @Parameter(ConfigurationOut.class) final File outConfig) { this.target = injectedClass; this.ch = ch; this.inConfig = inConfig; this.outConfig = outConfig; } - public static void main(String[] argv) throws IOException, BindException, InjectionException { - @SuppressWarnings("unchecked") - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder( + public static void main(final String[] argv) throws IOException, BindException, InjectionException { + @SuppressWarnings("unchecked") final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder( (Class<? extends ExternalConstructor<?>>[]) new Class[]{FileParser.class}); - CommandLine cl = new CommandLine(cb); + final CommandLine cl = new CommandLine(cb); cl.processCommandLine(argv, Target.class, ClassHierarchyIn.class, ConfigurationIn.class, ConfigurationOut.class); - ValidateConfiguration bip = Tang.Factory.getTang().newInjector(cb.build()).getInstance(ValidateConfiguration.class); + final ValidateConfiguration bip = + Tang.Factory.getTang().newInjector(cb.build()).getInstance(ValidateConfiguration.class); bip.validatePlan(); } @@ -123,7 +123,7 @@ public class ValidateConfiguration { private final File f; @Inject - FileParser(String name) { + FileParser(final String name) { f = new File(name); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/walk/graphviz/GraphvizConfigVisitor.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/walk/graphviz/GraphvizConfigVisitor.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/walk/graphviz/GraphvizConfigVisitor.java index 835fa92..f6655f2 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/walk/graphviz/GraphvizConfigVisitor.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/walk/graphviz/GraphvizConfigVisitor.java @@ -206,13 +206,13 @@ public final class GraphvizConfigVisitor return true; } - private String instancesToString(String[] s) { + private String instancesToString(final String[] s) { if (s.length == 0) { return "null"; } else if (s.length == 1) { return s[0]; } else { - StringBuffer sb = new StringBuffer("[" + s[0]); + final StringBuffer sb = new StringBuffer("[" + s[0]); for (int i = 1; i < s.length; i++) { sb.append(","); sb.append(s[i]); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/ClassHierarchyDeserializationTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/ClassHierarchyDeserializationTest.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/ClassHierarchyDeserializationTest.java index de9522d..2a39b3d 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/ClassHierarchyDeserializationTest.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/ClassHierarchyDeserializationTest.java @@ -52,12 +52,12 @@ public class ClassHierarchyDeserializationTest { // TODO: Use AvroClassHierarchySerializer instead (REEF-400) final ClassHierarchyProto.Node root = ClassHierarchyProto.Node.parseFrom(chin); final ClassHierarchy ch = new ProtocolBufferClassHierarchy(root); - Node n1 = ch.getNode("Org.Apache.REEF.Examples.Tasks.StreamingTasks.StreamTask1, " + + final Node n1 = ch.getNode("Org.Apache.REEF.Examples.Tasks.StreamingTasks.StreamTask1, " + "Org.Apache.REEF.Examples.Tasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"); Assert.assertTrue(n1.getFullName().equals("Org.Apache.REEF.Examples.Tasks.StreamingTasks.StreamTask1, " + "Org.Apache.REEF.Examples.Tasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null")); - Node n2 = ch.getNode("Org.Apache.REEF.Examples.Tasks.HelloTask.HelloTask, " + + final Node n2 = ch.getNode("Org.Apache.REEF.Examples.Tasks.HelloTask.HelloTask, " + "Org.Apache.REEF.Examples.Tasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"); Assert.assertTrue(n2.getFullName().equals("Org.Apache.REEF.Examples.Tasks.HelloTask.HelloTask, " + "Org.Apache.REEF.Examples.Tasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null")); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java index 23e6b5b..e1e611b 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java @@ -85,8 +85,8 @@ public class TestBindSingleton { @Test public void testLateBoundVolatileInstanceWithSingletonX() throws BindException, InjectionException { - Tang tang = Tang.Factory.getTang(); - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final Tang tang = Tang.Factory.getTang(); + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); cb.bindImplementation(LateBoundVolatile.A.class, LateBoundVolatile.B.class); final Injector i = tang.newInjector(cb.build()); @@ -117,9 +117,9 @@ public class TestBindSingleton { @Test public void testLateBoundVolatileInstanceWithSingletonY() throws BindException, InjectionException { - Tang tang = Tang.Factory.getTang(); - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); - Injector i = tang.newInjector(cb.build()); + final Tang tang = Tang.Factory.getTang(); + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final Injector i = tang.newInjector(cb.build()); i.bindVolatileInstance(LateBoundVolatile.C.class, new LateBoundVolatile.C()); i.getInstance(LateBoundVolatile.C.class); } @@ -127,79 +127,79 @@ public class TestBindSingleton { @Test public void testLateBoundVolatileInstanceWithSingletonZ() throws BindException, InjectionException { - Tang tang = Tang.Factory.getTang(); - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final Tang tang = Tang.Factory.getTang(); + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); cb.bindImplementation(LateBoundVolatile.B.class, LateBoundVolatile.B.class); - Injector i = tang.newInjector(cb.build()); + final Injector i = tang.newInjector(cb.build()); i.bindVolatileInstance(LateBoundVolatile.C.class, new LateBoundVolatile.C()); i.getInstance(LateBoundVolatile.B.class); } @Test public void testInbredSingletons() throws BindException, InjectionException { - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder b = t.newConfigurationBuilder(); + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder b = t.newConfigurationBuilder(); b.bindImplementation(InbredSingletons.A.class, InbredSingletons.A.class); b.bindImplementation(InbredSingletons.B.class, InbredSingletons.B.class); b.bindImplementation(InbredSingletons.C.class, InbredSingletons.C.class); - Injector i = t.newInjector(b.build()); + final Injector i = t.newInjector(b.build()); i.getInstance(InbredSingletons.A.class); } @Test public void testIncestuousSingletons() throws BindException, InjectionException { - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder b = t.newConfigurationBuilder(); + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder b = t.newConfigurationBuilder(); b.bindImplementation(IncestuousSingletons.A.class, IncestuousSingletons.A.class); b.bindImplementation(IncestuousSingletons.B.class, IncestuousSingletons.B.class); b.bindImplementation(IncestuousSingletons.C.class, IncestuousSingletons.C.class); - Injector i = t.newInjector(b.build()); + final Injector i = t.newInjector(b.build()); i.getInstance(IncestuousSingletons.A.class); } @Test public void testIncestuousSingletons2() throws BindException, InjectionException { - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder b = t.newConfigurationBuilder(); + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder b = t.newConfigurationBuilder(); b.bindImplementation(IncestuousSingletons.A.class, IncestuousSingletons.A.class); b.bindImplementation(IncestuousSingletons.B.class, IncestuousSingletons.BN.class); b.bindImplementation(IncestuousSingletons.C.class, IncestuousSingletons.C.class); - Injector i = t.newInjector(b.build()); + final Injector i = t.newInjector(b.build()); i.getInstance(IncestuousSingletons.A.class); } @Test public void testIncestuousInterfaceSingletons() throws BindException, InjectionException { - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder b = t.newConfigurationBuilder(); + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder b = t.newConfigurationBuilder(); b.bindImplementation(IncestuousInterfaceSingletons.AI.class, IncestuousInterfaceSingletons.A.class); b.bindImplementation(IncestuousInterfaceSingletons.BI.class, IncestuousInterfaceSingletons.BN.class); b.bindImplementation(IncestuousInterfaceSingletons.CI.class, IncestuousInterfaceSingletons.C.class); - Injector i = t.newInjector(b.build()); + final Injector i = t.newInjector(b.build()); i.getInstance(IncestuousInterfaceSingletons.AI.class); } @Test public void testIncestuousInterfaceSingletons2() throws BindException, InjectionException { - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder b = t.newConfigurationBuilder(); + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder b = t.newConfigurationBuilder(); b.bindImplementation(IncestuousInterfaceSingletons.AI.class, IncestuousInterfaceSingletons.A.class); b.bindImplementation(IncestuousInterfaceSingletons.BI.class, @@ -209,14 +209,14 @@ public class TestBindSingleton { IncestuousInterfaceSingletons.B.class); b.bindImplementation(IncestuousInterfaceSingletons.CI.class, IncestuousInterfaceSingletons.C.class); - Injector i = t.newInjector(b.build()); + final Injector i = t.newInjector(b.build()); i.getInstance(IncestuousInterfaceSingletons.AI.class); } @Test public void testIsBrokenClassInjectable() throws BindException { - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder b = t.newConfigurationBuilder(); + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder b = t.newConfigurationBuilder(); b.bind(IsBrokenClassInjectable.class, IsBrokenClassInjectable.class); Assert.assertTrue(t.newInjector(b.build()).isInjectable( IsBrokenClassInjectable.class)); @@ -224,8 +224,8 @@ public class TestBindSingleton { @Test public void testIsBrokenSingletonClassInjectable() throws BindException { - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder b = t.newConfigurationBuilder(); + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder b = t.newConfigurationBuilder(); b.bindImplementation(IsBrokenClassInjectable.class, IsBrokenClassInjectable.class); Assert.assertTrue(t.newInjector(b.build()).isInjectable( @@ -234,8 +234,8 @@ public class TestBindSingleton { @Test(expected = InjectionException.class) public void testBrokenSingletonClassCantInject() throws BindException, InjectionException { - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder b = t.newConfigurationBuilder(); + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder b = t.newConfigurationBuilder(); b.bindImplementation(IsBrokenClassInjectable.class, IsBrokenClassInjectable.class); Assert.assertTrue(t.newInjector(b.build()).isInjectable( @@ -273,7 +273,7 @@ class LateBoundVolatile { static class B extends A { @Inject - B(C c) { + B(final C c) { } } @@ -286,7 +286,7 @@ class InbredSingletons { static int count = 0; @Inject - A(B b) { + A(final B b) { Assert.assertEquals(0, count); count++; } @@ -296,7 +296,7 @@ class InbredSingletons { static int count = 0; @Inject - B(C c) { + B(final C c) { Assert.assertEquals(0, count); count++; } @@ -318,7 +318,7 @@ class IncestuousSingletons { static int count = 0; @Inject - A(C c, B b) { + A(final C c, final B b) { Assert.assertEquals(0, count); count++; } @@ -331,7 +331,7 @@ class IncestuousSingletons { } @Inject - B(C c) { + B(final C c) { Assert.assertEquals(0, count); count++; } @@ -341,7 +341,7 @@ class IncestuousSingletons { static int count = 0; @Inject - BN(C c) { + BN(final C c) { super(); Assert.assertEquals(0, count); count++; @@ -373,7 +373,7 @@ class IncestuousInterfaceSingletons { static int count = 0; @Inject - A(CI c, BI b) { + A(final CI c, final BI b) { Assert.assertEquals(0, count); count++; } @@ -386,7 +386,7 @@ class IncestuousInterfaceSingletons { } @Inject - B(CI c) { + B(final CI c) { Assert.assertEquals(0, count); count++; } @@ -396,7 +396,7 @@ class IncestuousInterfaceSingletons { static int count = 0; @Inject - BN(CI c) { + BN(final CI c) { super(); Assert.assertEquals(0, count); count++; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestClassLoaders.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestClassLoaders.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestClassLoaders.java index f352853..1df1efc 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestClassLoaders.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestClassLoaders.java @@ -43,12 +43,12 @@ public class TestClassLoaders { // @Test public void testTwoJars() throws MalformedURLException, ClassNotFoundException, BindException, InjectionException, NameResolutionException { - Tang t = Tang.Factory.getTang(); + final Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder cbA = t.newConfigurationBuilder(new File( + final JavaConfigurationBuilder cbA = t.newConfigurationBuilder(new File( "../tang-test-jarA/target/tang-test-jarA-1.0-SNAPSHOT.jar").toURI() .toURL()); - JavaConfigurationBuilder cbB = t.newConfigurationBuilder(new File( + final JavaConfigurationBuilder cbB = t.newConfigurationBuilder(new File( "../tang-test-jarB/target/tang-test-jarB-1.0-SNAPSHOT.jar").toURI() .toURL()); cbA.addConfiguration(cbB.build()); @@ -62,11 +62,11 @@ public class TestClassLoaders { // @Test public void testTwoClasses() throws MalformedURLException, ClassNotFoundException, BindException, InjectionException, NameResolutionException { - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder cbA = t.newConfigurationBuilder(new File( + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder cbA = t.newConfigurationBuilder(new File( "../tang-test-jarAB/target/tang-test-jarAB-1.0-SNAPSHOT.jar").toURI() .toURL()); - JavaConfigurationBuilder cbB = t.newConfigurationBuilder(new File( + final JavaConfigurationBuilder cbB = t.newConfigurationBuilder(new File( "../tang-test-jarAB/target/tang-test-jarAB-1.0-SNAPSHOT.jar").toURI() .toURL()); cbA.addConfiguration(cbB.build()); @@ -81,20 +81,20 @@ public class TestClassLoaders { public void aliasingNameSameDifferentTypes() throws MalformedURLException, InjectionException, BindException, ClassNotFoundException, NameResolutionException { - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder cbA1 = t.newConfigurationBuilder(new File( + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder cbA1 = t.newConfigurationBuilder(new File( "../tang-test-jarAB/target/tang-test-jarAB-1.0-SNAPSHOT.jar").toURI() .toURL()); - JavaConfigurationBuilder cbA2 = t.newConfigurationBuilder(new File( + final JavaConfigurationBuilder cbA2 = t.newConfigurationBuilder(new File( "../tang-test-jarAB/target/tang-test-jarAB-1.0-SNAPSHOT.jar").toURI() .toURL()); cbA1.getClassHierarchy().getNode("org.apache.reef.tang.examples.A"); cbA1.bind("org.apache.reef.tang.examples.A", "org.apache.reef.tang.examples.B"); cbA2.bind("org.apache.reef.tang.examples.A", "org.apache.reef.tang.examples.B"); - Object o = t.newInjector(cbA1.build()).getInstance("org.apache.reef.tang.examples.A"); - Object p = t.newInjector(cbA2.build()).getInstance("org.apache.reef.tang.examples.A"); + final Object o = t.newInjector(cbA1.build()).getInstance("org.apache.reef.tang.examples.A"); + final Object p = t.newInjector(cbA2.build()).getInstance("org.apache.reef.tang.examples.A"); Assert.assertSame(o.getClass(), p.getClass()); - JavaConfigurationBuilder cbAother = t.newConfigurationBuilder(new File( + final JavaConfigurationBuilder cbAother = t.newConfigurationBuilder(new File( "../tang-test-jarA/target/tang-test-jarA-1.0-SNAPSHOT.jar").toURI() .toURL()); @@ -109,8 +109,8 @@ public class TestClassLoaders { public void testOneClassOneJar() throws MalformedURLException, InjectionException, BindException, ClassNotFoundException, NameResolutionException { - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder cbA1 = t.newConfigurationBuilder(new File( + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder cbA1 = t.newConfigurationBuilder(new File( "../tang-test-jarAB/target/tang-test-jarAB-1.0-SNAPSHOT.jar").toURI() .toURL()); cbA1.bind("org.apache.reef.tang.examples.A", "org.apache.reef.tang.examples.B"); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestConfFileParser.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestConfFileParser.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestConfFileParser.java index cf648f7..d11a98e 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestConfFileParser.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestConfFileParser.java @@ -46,11 +46,11 @@ public class TestConfFileParser { // TODO: This likely only passes on windows, as it relies on newlines // being \r\n, and on java.lang.Object having a lower hash code than // org.apache.reef.tang.TestConfFileParser - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder cb = t.newConfigurationBuilder(); - String in = "org.apache.reef.tang.TestConfFileParser=org.apache.reef.tang.TestConfFileParser\n"; + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder cb = t.newConfigurationBuilder(); + final String in = "org.apache.reef.tang.TestConfFileParser=org.apache.reef.tang.TestConfFileParser\n"; ConfigurationFile.addConfiguration(cb, in); - String out = ConfigurationFile.toConfigurationString(cb.build()); + final String out = ConfigurationFile.toConfigurationString(cb.build()); Assert.assertEquals(in, out); } @@ -59,20 +59,20 @@ public class TestConfFileParser { // TODO: This likely only passes on windows, as it relies on newlines // being \r\n, and on java.lang.Object having a lower hash code than // org.apache.reef.tang.TestConfFileParser - Tang t = Tang.Factory.getTang(); - JavaConfigurationBuilder cb = t.newConfigurationBuilder(); + final Tang t = Tang.Factory.getTang(); + final JavaConfigurationBuilder cb = t.newConfigurationBuilder(); cb.bindImplementation(SingleTest.A.class, SingleTest.B.class); - String out = ConfigurationFile.toConfigurationString(cb.build()); - String in = "org.apache.reef.tang.SingleTest$A=org.apache.reef.tang.SingleTest$B\n"; + final String out = ConfigurationFile.toConfigurationString(cb.build()); + final String in = "org.apache.reef.tang.SingleTest$A=org.apache.reef.tang.SingleTest$B\n"; Assert.assertEquals(in, out); } @Test public void testNamedParameter() throws BindException { - Tang t = Tang.Factory.getTang(); - String conf = "org.apache.reef.tang.TestConfFileParser$Foo=woot"; - ConfigurationBuilder cb = t.newConfigurationBuilder(); + final Tang t = Tang.Factory.getTang(); + final String conf = "org.apache.reef.tang.TestConfFileParser$Foo=woot"; + final ConfigurationBuilder cb = t.newConfigurationBuilder(); ConfigurationFile.addConfiguration(cb, conf); Assert.assertTrue(t.newInjector(cb.build()).isParameterSet(Foo.class)); } @@ -88,7 +88,7 @@ public class TestConfFileParser { fout.write(line.getBytes()); } - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); ConfigurationFile.addConfiguration(cb, tmp); final Injector i = Tang.Factory.getTang().newInjector(cb.build()); Assert.assertEquals(value, i.getNamedInstance(RemoteIdentifier.class)); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestImplicitConversions.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestImplicitConversions.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestImplicitConversions.java index b62570d..f39a1cb 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestImplicitConversions.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestImplicitConversions.java @@ -34,19 +34,19 @@ public class TestImplicitConversions { @SuppressWarnings("unchecked") @Test public void testBindFromString() throws BindException, InjectionException { - JavaConfigurationBuilder b = Tang.Factory.getTang().newConfigurationBuilder(IdentifierParser.class); + final JavaConfigurationBuilder b = Tang.Factory.getTang().newConfigurationBuilder(IdentifierParser.class); b.bindNamedParameter(IdName.class, "b://b"); - Configuration c = b.build(); - String s = ConfigurationFile.toConfigurationString(c); + final Configuration c = b.build(); + final String s = ConfigurationFile.toConfigurationString(c); - JavaConfigurationBuilder b2 = Tang.Factory.getTang().newConfigurationBuilder(IdentifierParser.class); + final JavaConfigurationBuilder b2 = Tang.Factory.getTang().newConfigurationBuilder(IdentifierParser.class); ConfigurationFile.addConfiguration(b2, s); - Configuration c2 = b2.build(); + final Configuration c2 = b2.build(); Assert.assertEquals("b://b", c2.getNamedParameter( (NamedParameterNode<?>) c2.getClassHierarchy().getNode(ReflectionUtilities.getFullName(IdName.class)))); - Injector i = Tang.Factory.getTang().newInjector(c2); + final Injector i = Tang.Factory.getTang().newInjector(c2); Assert.assertEquals("b://b", i.getNamedInstance(IdName.class).toString()); Assert.assertTrue(i.getNamedInstance(IdName.class) instanceof BIdentifier); @@ -56,20 +56,20 @@ public class TestImplicitConversions { @SuppressWarnings("unchecked") @Test public void testBindSubclassFromString() throws BindException, InjectionException { - JavaConfigurationBuilder b = Tang.Factory.getTang().newConfigurationBuilder(IdentifierParser.class); + final JavaConfigurationBuilder b = Tang.Factory.getTang().newConfigurationBuilder(IdentifierParser.class); b.bindNamedParameter(AIdName.class, "a://a"); b.bindNamedParameter(BIdName.class, "b://b"); - Configuration c = b.build(); - String s = ConfigurationFile.toConfigurationString(c); + final Configuration c = b.build(); + final String s = ConfigurationFile.toConfigurationString(c); - JavaConfigurationBuilder b2 = Tang.Factory.getTang().newConfigurationBuilder(IdentifierParser.class); + final JavaConfigurationBuilder b2 = Tang.Factory.getTang().newConfigurationBuilder(IdentifierParser.class); ConfigurationFile.addConfiguration(b2, s); - Configuration c2 = b2.build(); + final Configuration c2 = b2.build(); Assert.assertEquals("b://b", c2.getNamedParameter( (NamedParameterNode<?>) c2.getClassHierarchy().getNode(ReflectionUtilities.getFullName(BIdName.class)))); - Injector i = Tang.Factory.getTang().newInjector(c2); + final Injector i = Tang.Factory.getTang().newInjector(c2); Assert.assertEquals("b://b", i.getNamedInstance(BIdName.class).toString()); Assert.assertTrue(i.getNamedInstance(BIdName.class) instanceof BIdentifier); @@ -80,14 +80,14 @@ public class TestImplicitConversions { @SuppressWarnings("unchecked") @Test(expected = ClassCastException.class) public void testBindWrongSubclassFromString() throws BindException, InjectionException { - JavaConfigurationBuilder b = Tang.Factory.getTang().newConfigurationBuilder(IdentifierParser.class); + final JavaConfigurationBuilder b = Tang.Factory.getTang().newConfigurationBuilder(IdentifierParser.class); b.bindNamedParameter(AIdName.class, "b://b"); } @Test(expected = InjectionException.class) public void testInjectUnboundParsable() throws BindException, InjectionException { - @SuppressWarnings("unchecked") - JavaConfigurationBuilder b = Tang.Factory.getTang().newConfigurationBuilder(IdentifierParser.class); + @SuppressWarnings("unchecked") final JavaConfigurationBuilder b = + Tang.Factory.getTang().newConfigurationBuilder(IdentifierParser.class); Tang.Factory.getTang().newInjector(b.build()).getNamedInstance(IdName.class); } @@ -107,7 +107,7 @@ public class TestImplicitConversions { private final String aString; @Inject - AIdentifierImpl(String aString) { + AIdentifierImpl(final String aString) { this.aString = aString; } @@ -121,7 +121,7 @@ public class TestImplicitConversions { private final String bString; @Inject - BIdentifierImpl(String bString) { + BIdentifierImpl(final String bString) { this.bString = bString; } @@ -135,7 +135,7 @@ public class TestImplicitConversions { private final Identifier id; @Inject - public IdentifierParser(String id) { + public IdentifierParser(final String id) { this.id = id.startsWith("a://") ? new AIdentifierImpl(id) : id.startsWith("b://") ? new BIdentifierImpl(id) : null; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestInjectionFuture.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestInjectionFuture.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestInjectionFuture.java index eb2a50b..c423a1b 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestInjectionFuture.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestInjectionFuture.java @@ -39,15 +39,15 @@ interface B extends A { public class TestInjectionFuture { @Test public void testFutures() throws InjectionException, BindException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); - Injector i = Tang.Factory.getTang().newInjector(cb.build()); - Injector i2 = Tang.Factory.getTang().newInjector(cb.build()); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final Injector i = Tang.Factory.getTang().newInjector(cb.build()); + final Injector i2 = Tang.Factory.getTang().newInjector(cb.build()); - Futurist f = i.getInstance(Futurist.class); + final Futurist f = i.getInstance(Futurist.class); Assert.assertTrue(f == f.getMyCar().getDriver()); Assert.assertTrue(f.getMyCar() == f.getMyCar().getDriver().getMyCar()); - Futurist f2 = i2.getInstance(Futurist.class); + final Futurist f2 = i2.getInstance(Futurist.class); Assert.assertTrue(f2 == f2.getMyCar().getDriver()); Assert.assertTrue(f2.getMyCar() == f2.getMyCar().getDriver().getMyCar()); @@ -58,15 +58,15 @@ public class TestInjectionFuture { @Test public void testFutures2() throws InjectionException, BindException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); - Injector i = Tang.Factory.getTang().newInjector(cb.build()); - Injector i2 = i.forkInjector(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final Injector i = Tang.Factory.getTang().newInjector(cb.build()); + final Injector i2 = i.forkInjector(); - FlyingCar c = i.getInstance(FlyingCar.class); + final FlyingCar c = i.getInstance(FlyingCar.class); Assert.assertTrue(c == c.getDriver().getMyCar()); Assert.assertTrue(c.getDriver() == c.getDriver().getMyCar().getDriver()); - FlyingCar c2 = i2.getInstance(FlyingCar.class); + final FlyingCar c2 = i2.getInstance(FlyingCar.class); Assert.assertTrue(c2 == c2.getDriver().getMyCar()); Assert.assertTrue(c2.getDriver() == c2.getDriver().getMyCar().getDriver()); @@ -77,43 +77,41 @@ public class TestInjectionFuture { @Test public void testNamedParameterInjectionFuture() throws InjectionException, BindException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindImplementation(FlyingCar.class, FlyingCar.class); - Injector i = Tang.Factory.getTang().newInjector(cb.build()); - PickyFuturist f = i.getInstance(PickyFuturist.class); + final Injector i = Tang.Factory.getTang().newInjector(cb.build()); + final PickyFuturist f = i.getInstance(PickyFuturist.class); Assert.assertNotNull(f.getMyCar()); } @Test public void testNamedParameterInjectionFutureDefaultImpl() throws InjectionException, BindException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); - Injector i = Tang.Factory.getTang().newInjector(cb.build()); - PickyFuturist f = i.getInstance(PickyFuturist.class); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final Injector i = Tang.Factory.getTang().newInjector(cb.build()); + final PickyFuturist f = i.getInstance(PickyFuturist.class); Assert.assertNotNull(f.getMyCar()); } @Test public void testNamedParameterInjectionFutureBindImpl() throws InjectionException, BindException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindImplementation(Futurist.class, PickyFuturist.class); cb.bindNamedParameter(MyFlyingCar.class, BigFlyingCar.class); - Injector i = Tang.Factory.getTang().newInjector(cb.build()); - PickyFuturist f = i.getInstance(PickyFuturist.class); + final Injector i = Tang.Factory.getTang().newInjector(cb.build()); + final PickyFuturist f = i.getInstance(PickyFuturist.class); Assert.assertNotNull((BigFlyingCar) f.getMyCar()); } @Test public void testNamedParameterBoundToDelegatingInterface() throws InjectionException, BindException { - Injector i = Tang.Factory.getTang().newInjector(); - @SuppressWarnings("unused") - C c = (C) i.getNamedInstance(AName.class); + final Injector i = Tang.Factory.getTang().newInjector(); + @SuppressWarnings("unused") final C c = (C) i.getNamedInstance(AName.class); } @Test public void testBoundToDelegatingInterface() throws InjectionException, BindException { - Injector i = Tang.Factory.getTang().newInjector(); - @SuppressWarnings("unused") - C c = (C) i.getInstance(B.class); + final Injector i = Tang.Factory.getTang().newInjector(); + @SuppressWarnings("unused") final C c = (C) i.getInstance(B.class); } @@ -122,12 +120,12 @@ public class TestInjectionFuture { private final InjectionFuture<FlyingCar> fCar; @Inject - public Futurist(InjectionFuture<FlyingCar> car) { + public Futurist(final InjectionFuture<FlyingCar> car) { this.fCar = car; } public FlyingCar getMyCar() { - FlyingCar c = fCar.get(); + final FlyingCar c = fCar.get(); return c; } } @@ -136,13 +134,13 @@ public class TestInjectionFuture { private final InjectionFuture<FlyingCar> fCar; @Inject - public PickyFuturist(@Parameter(MyFlyingCar.class) InjectionFuture<FlyingCar> myFlyingCar) { + public PickyFuturist(@Parameter(MyFlyingCar.class) final InjectionFuture<FlyingCar> myFlyingCar) { super(myFlyingCar); fCar = myFlyingCar; } public FlyingCar getMyCar() { - FlyingCar c = fCar.get(); + final FlyingCar c = fCar.get(); return c; } } @@ -153,7 +151,7 @@ public class TestInjectionFuture { private final Futurist driver; @Inject - FlyingCar(@Parameter(Color.class) String color, Futurist driver) { + FlyingCar(@Parameter(Color.class) final String color, final Futurist driver) { this.color = color; this.driver = driver; } @@ -173,7 +171,7 @@ public class TestInjectionFuture { public static class BigFlyingCar extends FlyingCar { @Inject - BigFlyingCar(@Parameter(Color.class) String color, Futurist driver) { + BigFlyingCar(@Parameter(Color.class) final String color, final Futurist driver) { super(color, driver); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java index 81fbdfb..8594005 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java @@ -46,8 +46,8 @@ public class TestListInjection { */ @Test public void testStringInjectDefault() throws InjectionException { - List<String> actual = Tang.Factory.getTang().newInjector().getInstance(StringClass.class).stringList; - List<String> expected = new ArrayList<>(); + final List<String> actual = Tang.Factory.getTang().newInjector().getInstance(StringClass.class).stringList; + final List<String> expected = new ArrayList<>(); expected.add("bye"); expected.add("hello"); expected.add("hi"); @@ -61,8 +61,8 @@ public class TestListInjection { */ @Test public void testIntegerInjectDefault() throws InjectionException { - List<Integer> actual = Tang.Factory.getTang().newInjector().getInstance(IntegerClass.class).integerList; - List<Integer> expected = new ArrayList<>(); + final List<Integer> actual = Tang.Factory.getTang().newInjector().getInstance(IntegerClass.class).integerList; + final List<Integer> expected = new ArrayList<>(); expected.add(1); expected.add(2); expected.add(3); @@ -76,14 +76,14 @@ public class TestListInjection { */ @Test public void testObjectInjectDefault() throws InjectionException { - Integer integer = 1; - Float ffloat = 1.001f; + final Integer integer = 1; + final Float ffloat = 1.001f; - Injector injector = Tang.Factory.getTang().newInjector(); + final Injector injector = Tang.Factory.getTang().newInjector(); injector.bindVolatileInstance(Integer.class, integer); injector.bindVolatileInstance(Float.class, ffloat); - List<Number> actual = injector.getInstance(NumberClass.class).numberList; - List<Number> expected = new ArrayList<>(); + final List<Number> actual = injector.getInstance(NumberClass.class).numberList; + final List<Number> expected = new ArrayList<>(); expected.add(integer); expected.add(ffloat); Assert.assertEquals(expected, actual); @@ -96,14 +96,15 @@ public class TestListInjection { */ @Test public void testStringInjectBound() throws InjectionException { - List<String> injected = new ArrayList<>(); + final List<String> injected = new ArrayList<>(); injected.add("hi"); injected.add("hello"); injected.add("bye"); - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindList(StringList.class, injected); - List<String> actual = Tang.Factory.getTang().newInjector(cb.build()).getInstance(StringClass.class).stringList; - List<String> expected = new ArrayList<>(); + final List<String> actual = + Tang.Factory.getTang().newInjector(cb.build()).getInstance(StringClass.class).stringList; + final List<String> expected = new ArrayList<>(); expected.add("hi"); expected.add("hello"); expected.add("bye"); @@ -117,15 +118,16 @@ public class TestListInjection { */ @Test public void testIntegerInjectBound() throws InjectionException { - List<String> injected = new ArrayList<>(); + final List<String> injected = new ArrayList<>(); injected.add("1"); injected.add("2"); injected.add("3"); - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindList(IntegerList.class, injected); - List<Integer> actual = Tang.Factory.getTang().newInjector(cb.build()).getInstance(IntegerClass.class).integerList; - List<Integer> expected = new ArrayList<>(); + final List<Integer> actual = + Tang.Factory.getTang().newInjector(cb.build()).getInstance(IntegerClass.class).integerList; + final List<Integer> expected = new ArrayList<>(); expected.add(1); expected.add(2); expected.add(3); @@ -139,32 +141,32 @@ public class TestListInjection { */ @Test public void testObjectInjectBound() throws InjectionException { - Integer integer = 1; - Float ffloat = 1.001f; + final Integer integer = 1; + final Float ffloat = 1.001f; // Inject implementations via class object - List<Class> injected1 = new ArrayList<>(); + final List<Class> injected1 = new ArrayList<>(); injected1.add(Integer.class); injected1.add(Float.class); - JavaConfigurationBuilder cb1 = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb1 = Tang.Factory.getTang().newConfigurationBuilder(); cb1.bindList(NumberList.class, injected1); - Injector injector1 = Tang.Factory.getTang().newInjector(cb1.build()); + final Injector injector1 = Tang.Factory.getTang().newInjector(cb1.build()); injector1.bindVolatileInstance(Integer.class, integer); injector1.bindVolatileInstance(Float.class, ffloat); - List<Number> actual1 = injector1.getInstance(NumberClass.class).numberList; + final List<Number> actual1 = injector1.getInstance(NumberClass.class).numberList; // Inject implementations via class name - List<String> injected2 = new ArrayList<>(); + final List<String> injected2 = new ArrayList<>(); injected2.add("java.lang.Integer"); injected2.add("java.lang.Float"); - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindList(NumberList.class, injected2); - Injector injector2 = Tang.Factory.getTang().newInjector(cb.build()); + final Injector injector2 = Tang.Factory.getTang().newInjector(cb.build()); injector2.bindVolatileInstance(Integer.class, integer); injector2.bindVolatileInstance(Float.class, ffloat); - List<Number> actual2 = injector2.getInstance(NumberClass.class).numberList; + final List<Number> actual2 = injector2.getInstance(NumberClass.class).numberList; - List<Number> expected = new ArrayList<>(); + final List<Number> expected = new ArrayList<>(); expected.add(integer); expected.add(ffloat); Assert.assertEquals(expected, actual1); @@ -181,19 +183,19 @@ public class TestListInjection { @Test public void testInjectSelectiveConstructor() throws InjectionException { // Test injection without list binding - List<String> actual1 = Tang.Factory.getTang().newInjector().getInstance(SelectiveConsructorClass.class).list; - List<String> expected1 = new ArrayList<>(); + final List<String> actual1 = Tang.Factory.getTang().newInjector().getInstance(SelectiveConsructorClass.class).list; + final List<String> expected1 = new ArrayList<>(); Assert.assertEquals(expected1, actual1); // Test injection with list binding - List<String> injected = new ArrayList<>(); + final List<String> injected = new ArrayList<>(); injected.add("hi"); injected.add("hello"); injected.add("bye"); - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindList(SelectiveInjectTestList.class, injected); - List<String> actual2 = Tang.Factory.getTang().newInjector(cb.build()).getInstance(SelectiveConsructorClass.class) - .list; - List<String> expected2 = new ArrayList<>(); + final List<String> actual2 = + Tang.Factory.getTang().newInjector(cb.build()).getInstance(SelectiveConsructorClass.class).list; + final List<String> expected2 = new ArrayList<>(); expected2.add("hi"); expected2.add("hello"); expected2.add("bye"); @@ -207,17 +209,18 @@ public class TestListInjection { */ @Test public void testStringInjectConfigurationBuilder() throws InjectionException { - JavaClassHierarchy namespace = Tang.Factory.getTang().getDefaultClassHierarchy(); - NamedParameterNode<List<String>> np = (NamedParameterNode) namespace.getNode(StringList.class); - List<String> injected = new ArrayList<>(); + final JavaClassHierarchy namespace = Tang.Factory.getTang().getDefaultClassHierarchy(); + final NamedParameterNode<List<String>> np = (NamedParameterNode) namespace.getNode(StringList.class); + final List<String> injected = new ArrayList<>(); injected.add("hi"); injected.add("hello"); injected.add("bye"); - ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindList(np, injected); - List<String> actual = Tang.Factory.getTang().newInjector(cb.build()).getInstance(StringClass.class).stringList; - List<String> expected = new ArrayList<>(); + final List<String> actual = + Tang.Factory.getTang().newInjector(cb.build()).getInstance(StringClass.class).stringList; + final List<String> expected = new ArrayList<>(); expected.add("hi"); expected.add("hello"); expected.add("bye"); @@ -231,23 +234,23 @@ public class TestListInjection { */ @Test public void testObjectInjectConfigurationBuilder() throws InjectionException { - Integer integer = 1; - Float ffloat = 1.001f; + final Integer integer = 1; + final Float ffloat = 1.001f; - JavaClassHierarchy namespace = Tang.Factory.getTang().getDefaultClassHierarchy(); - NamedParameterNode<List<Class>> np = (NamedParameterNode) namespace.getNode(NumberList.class); - List<ClassNode> injected = new ArrayList<>(); + final JavaClassHierarchy namespace = Tang.Factory.getTang().getDefaultClassHierarchy(); + final NamedParameterNode<List<Class>> np = (NamedParameterNode) namespace.getNode(NumberList.class); + final List<ClassNode> injected = new ArrayList<>(); injected.add((ClassNode) namespace.getNode(Integer.class)); injected.add((ClassNode) namespace.getNode(Float.class)); - ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindList(np, injected); - Injector injector = Tang.Factory.getTang().newInjector(cb.build()); + final Injector injector = Tang.Factory.getTang().newInjector(cb.build()); injector.bindVolatileInstance(Integer.class, integer); injector.bindVolatileInstance(Float.class, ffloat); - List<Number> actual = injector.getInstance(NumberClass.class).numberList; - List<Number> expected = new ArrayList<>(); + final List<Number> actual = injector.getInstance(NumberClass.class).numberList; + final List<Number> expected = new ArrayList<>(); expected.add(integer); expected.add(ffloat); Assert.assertEquals(expected, actual); @@ -260,15 +263,15 @@ public class TestListInjection { */ @Test public void testInjectConfigurationModule() throws InjectionException { - List<String> injected = new ArrayList<>(); + final List<String> injected = new ArrayList<>(); injected.add("hi"); injected.add("hello"); injected.add("bye"); - Configuration conf = StringClassConfiguration.CONF + final Configuration conf = StringClassConfiguration.CONF .set(StringClassConfiguration.STRING_LIST, injected) .build(); - List<String> actual = Tang.Factory.getTang().newInjector(conf).getInstance(StringClass.class).stringList; - List<String> expected = new ArrayList<>(); + final List<String> actual = Tang.Factory.getTang().newInjector(conf).getInstance(StringClass.class).stringList; + final List<String> expected = new ArrayList<>(); expected.add("hi"); expected.add("hello"); expected.add("bye"); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestNamedParameterRoundTrip.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestNamedParameterRoundTrip.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestNamedParameterRoundTrip.java index e6f62e9..f3706ec 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestNamedParameterRoundTrip.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestNamedParameterRoundTrip.java @@ -47,7 +47,7 @@ public class TestNamedParameterRoundTrip { assertEquals(d, readD1); - JavaConfigurationBuilder roundTrip2 = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder roundTrip2 = Tang.Factory.getTang().newConfigurationBuilder(); ConfigurationFile.addConfiguration(roundTrip2, ConfigurationFile.toConfigurationString(conf)); final Injector i2 = Tang.Factory.getTang().newInjector(roundTrip2.build()); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestSetInjection.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestSetInjection.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestSetInjection.java index f221447..5c02c41 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestSetInjection.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestSetInjection.java @@ -36,9 +36,9 @@ import java.util.Set; public class TestSetInjection { @Test public void testStringInjectDefault() throws InjectionException { - Set<String> actual = Tang.Factory.getTang().newInjector().getInstance(Box.class).strings; + final Set<String> actual = Tang.Factory.getTang().newInjector().getInstance(Box.class).strings; - Set<String> expected = new HashSet<>(); + final Set<String> expected = new HashSet<>(); expected.add("one"); expected.add("two"); expected.add("three"); @@ -48,11 +48,11 @@ public class TestSetInjection { @Test public void testObjectInjectDefault() throws InjectionException, BindException { - Injector i = Tang.Factory.getTang().newInjector(); + final Injector i = Tang.Factory.getTang().newInjector(); i.bindVolatileInstance(Integer.class, 42); i.bindVolatileInstance(Float.class, 42.0001f); - Set<Number> actual = i.getInstance(Pool.class).numbers; - Set<Number> expected = new HashSet<>(); + final Set<Number> actual = i.getInstance(Pool.class).numbers; + final Set<Number> expected = new HashSet<>(); expected.add(42); expected.add(42.0001f); Assert.assertEquals(expected, actual); @@ -60,13 +60,13 @@ public class TestSetInjection { @Test public void testStringInjectBound() throws InjectionException, BindException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindSetEntry(SetOfStrings.class, "four"); cb.bindSetEntry(SetOfStrings.class, "five"); cb.bindSetEntry(SetOfStrings.class, "six"); - Set<String> actual = Tang.Factory.getTang().newInjector(cb.build()).getInstance(Box.class).strings; + final Set<String> actual = Tang.Factory.getTang().newInjector(cb.build()).getInstance(Box.class).strings; - Set<String> expected = new HashSet<>(); + final Set<String> expected = new HashSet<>(); expected.add("four"); expected.add("five"); expected.add("six"); @@ -76,15 +76,15 @@ public class TestSetInjection { @Test public void testObjectInjectBound() throws InjectionException, BindException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindSetEntry(SetOfClasses.class, Short.class); cb.bindSetEntry(SetOfClasses.class, Float.class); - Injector i = Tang.Factory.getTang().newInjector(cb.build()); + final Injector i = Tang.Factory.getTang().newInjector(cb.build()); i.bindVolatileInstance(Short.class, (short) 4); i.bindVolatileInstance(Float.class, 42.0001f); - Set<Number> actual = i.getInstance(Pool.class).numbers; - Set<Number> expected = new HashSet<>(); + final Set<Number> actual = i.getInstance(Pool.class).numbers; + final Set<Number> expected = new HashSet<>(); expected.add((short) 4); expected.add(42.0001f); Assert.assertEquals(expected, actual); @@ -92,21 +92,21 @@ public class TestSetInjection { @Test public void testStringInjectRoundTrip() throws InjectionException, BindException, IOException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindSetEntry(SetOfStrings.class, "four"); cb.bindSetEntry(SetOfStrings.class, "five"); cb.bindSetEntry(SetOfStrings.class, "six"); - ConfigurationSerializer serializer = new AvroConfigurationSerializer(); + final ConfigurationSerializer serializer = new AvroConfigurationSerializer(); - String s = serializer.toString(cb.build()); - JavaConfigurationBuilder cb2 = Tang.Factory.getTang().newConfigurationBuilder(); - Configuration conf = serializer.fromString(s); + final String s = serializer.toString(cb.build()); + final JavaConfigurationBuilder cb2 = Tang.Factory.getTang().newConfigurationBuilder(); + final Configuration conf = serializer.fromString(s); cb2.addConfiguration(conf); - Set<String> actual = Tang.Factory.getTang().newInjector(cb2.build()).getInstance(Box.class).strings; + final Set<String> actual = Tang.Factory.getTang().newInjector(cb2.build()).getInstance(Box.class).strings; - Set<String> expected = new HashSet<>(); + final Set<String> expected = new HashSet<>(); expected.add("four"); expected.add("five"); expected.add("six"); @@ -116,22 +116,22 @@ public class TestSetInjection { @Test public void testObjectInjectRoundTrip() throws InjectionException, BindException, IOException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindSetEntry(SetOfClasses.class, Short.class); cb.bindSetEntry(SetOfClasses.class, Float.class); - ConfigurationSerializer serializer = new AvroConfigurationSerializer(); + final ConfigurationSerializer serializer = new AvroConfigurationSerializer(); - String s = serializer.toString(cb.build()); - JavaConfigurationBuilder cb2 = Tang.Factory.getTang().newConfigurationBuilder(); - Configuration conf = serializer.fromString(s); + final String s = serializer.toString(cb.build()); + final JavaConfigurationBuilder cb2 = Tang.Factory.getTang().newConfigurationBuilder(); + final Configuration conf = serializer.fromString(s); cb2.addConfiguration(conf); - Injector i = Tang.Factory.getTang().newInjector(cb2.build()); + final Injector i = Tang.Factory.getTang().newInjector(cb2.build()); i.bindVolatileInstance(Short.class, (short) 4); i.bindVolatileInstance(Float.class, 42.0001f); - Set<Number> actual = i.getInstance(Pool.class).numbers; - Set<Number> expected = new HashSet<>(); + final Set<Number> actual = i.getInstance(Pool.class).numbers; + final Set<Number> expected = new HashSet<>(); expected.add((short) 4); expected.add(42.0001f); Assert.assertEquals(expected, actual); @@ -139,11 +139,11 @@ public class TestSetInjection { @Test public void testDefaultAsClass() throws InjectionException, BindException { - Injector i = Tang.Factory.getTang().newInjector(); + final Injector i = Tang.Factory.getTang().newInjector(); i.bindVolatileInstance(Integer.class, 1); i.bindVolatileInstance(Float.class, 2f); - Set<Number> actual = i.getNamedInstance(SetOfClassesDefaultClass.class); - Set<Number> expected = new HashSet<>(); + final Set<Number> actual = i.getNamedInstance(SetOfClassesDefaultClass.class); + final Set<Number> expected = new HashSet<>(); expected.add(1); Assert.assertEquals(expected, actual); } @@ -158,7 +158,7 @@ class Box { public final Set<String> strings; @Inject - Box(@Parameter(SetOfStrings.class) Set<String> strings) { + Box(@Parameter(SetOfStrings.class) final Set<String> strings) { this.strings = strings; } } @@ -171,7 +171,7 @@ class Pool { public final Set<Number> numbers; @Inject - Pool(@Parameter(SetOfClasses.class) Set<Number> numbers) { + Pool(@Parameter(SetOfClasses.class) final Set<Number> numbers) { this.numbers = numbers; } }
