Minor cosmetic issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/a5bfae41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/a5bfae41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/a5bfae41 Branch: refs/heads/REEF-395 Commit: a5bfae41171a68211b64d8dc505f3a8f180c2a9e Parents: a86ca06 Author: Yunseong Lee <[email protected]> Authored: Tue Jun 23 00:52:34 2015 +0900 Committer: Yunseong Lee <[email protected]> Committed: Tue Jun 23 00:52:34 2015 +0900 ---------------------------------------------------------------------- .../src/main/java/org/apache/reef/tang/ClassHierarchy.java | 2 -- .../apache/reef/tang/formats/AvroClassHierarchySerializer.java | 5 +---- .../org/apache/reef/tang/formats/ClassHierarchySerializer.java | 6 +++++- .../reef/tang/implementation/java/AvroClassHierarchy.java | 5 +++-- .../apache/reef/tang/formats/TestClassHierarchyRoundTrip.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5bfae41/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/ClassHierarchy.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/ClassHierarchy.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/ClassHierarchy.java index 0a8a3e2..9f89471 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/ClassHierarchy.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/ClassHierarchy.java @@ -18,7 +18,6 @@ */ package org.apache.reef.tang; -import org.apache.reef.tang.exceptions.ClassHierarchyException; import org.apache.reef.tang.exceptions.NameResolutionException; import org.apache.reef.tang.types.ClassNode; import org.apache.reef.tang.types.Node; @@ -43,7 +42,6 @@ public interface ClassHierarchy { * @param fullName The full name of the class that will be looked up. * @return A non-null reference to a ClassNode or a NamedParameterNode. * @throws NameResolutionException If the class is not found. - * @throws ClassHierarchyException If the class does not pass Tang's static analysis. */ Node getNode(String fullName) throws NameResolutionException; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5bfae41/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroClassHierarchySerializer.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroClassHierarchySerializer.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroClassHierarchySerializer.java index 07804e4..6c95498 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroClassHierarchySerializer.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroClassHierarchySerializer.java @@ -17,16 +17,13 @@ import java.util.Arrays; import java.util.List; /** - * (De-)Serializing ClassHierarchy to and from AvroClassHierarchy. - * <p/> + * Serialize and Deserialize ClassHierarchy to and from AvroClassHierarchy. * This class is stateless and is therefore safe to reuse. */ public class AvroClassHierarchySerializer implements ClassHierarchySerializer { /** * The Charset used for the JSON encoding. - * <p/> - * Copied from <code>org.apache.avro.io.JsonDecoder.CHARSET</code> */ private static final String JSON_CHARSET = "ISO-8859-1"; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5bfae41/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ClassHierarchySerializer.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ClassHierarchySerializer.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ClassHierarchySerializer.java index c5a77ae..4b7c357 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ClassHierarchySerializer.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ClassHierarchySerializer.java @@ -39,7 +39,7 @@ public interface ClassHierarchySerializer { /** * Serializes a ClassHierarchy as a String. - * @param classHierarchy + * * @param classHierarchy the ClassHierarchy to store * @throws IOException if there is an error in the process */ @@ -47,6 +47,7 @@ public interface ClassHierarchySerializer { /** * Loads a ClassHierarchy from a file created with toFile(). + * * @param file the File to read from * @throws IOException if the File can't be read or parsed */ @@ -54,6 +55,7 @@ public interface ClassHierarchySerializer { /** * Loads a ClassHierarchy from a text file created with toTextFile(). + * * @param file the File to read from * @throws IOException if the File can't be read or parsed */ @@ -61,6 +63,7 @@ public interface ClassHierarchySerializer { /** * Deserializes a ClassHierarchy from a byte[] created with toByteArray(). + * * @param theBytes the byte[] to deserialize * @throws IOException if the byte[] can't be read or parsed */ @@ -68,6 +71,7 @@ public interface ClassHierarchySerializer { /** * Deserializes a ClassHierarchy from a String created with toString(). + * * @param theString the String to deserialize * @throws IOException if the String can't be read or parsed */ http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5bfae41/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/AvroClassHierarchy.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/AvroClassHierarchy.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/AvroClassHierarchy.java index f4f22f0..761fa5d 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/AvroClassHierarchy.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/AvroClassHierarchy.java @@ -29,14 +29,15 @@ public class AvroClassHierarchy implements ClassHierarchy { parseSubHierarchy(namespace, child); } buildLookupTable(namespace); - // Now, register the implementations + + // Register the implementations for (final AvroNode child : root.getChildren()) { wireUpInheritanceRelationships(child); } } /** - * Build a table that matches the name and the corresponding Node recursively. + * Build a table that maps the name to the corresponding Node recursively. */ private void buildLookupTable(final Node n) { for(final Node child : n.getChildren()) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5bfae41/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestClassHierarchyRoundTrip.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestClassHierarchyRoundTrip.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestClassHierarchyRoundTrip.java index b49de46..4029f6c 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestClassHierarchyRoundTrip.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestClassHierarchyRoundTrip.java @@ -32,7 +32,7 @@ import java.io.IOException; public class TestClassHierarchyRoundTrip extends TestClassHierarchy { final ClassHierarchySerializer serializer = new AvroClassHierarchySerializer(); - // The original ClassHierarchy + // The default ClassHierarchy private void setup0() { TangImpl.reset(); ns = Tang.Factory.getTang().getDefaultClassHierarchy();
