diff --git a/common/springext/src/main/java/com/alibaba/citrus/springext/export/SchemaExporter.java b/common/springext/src/main/java/com/alibaba/citrus/springext/export/SchemaExporter.java index 85bbab182..3bb3d3d50 100644 --- a/common/springext/src/main/java/com/alibaba/citrus/springext/export/SchemaExporter.java +++ b/common/springext/src/main/java/com/alibaba/citrus/springext/export/SchemaExporter.java @@ -34,8 +34,8 @@ import com.alibaba.citrus.springext.Schema; import com.alibaba.citrus.springext.Schema.Transformer; import com.alibaba.citrus.springext.Schemas; -import com.alibaba.citrus.springext.support.SpringExtSchemaSet; import com.alibaba.citrus.springext.support.SchemaSet; +import com.alibaba.citrus.springext.support.SpringExtSchemaSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -245,19 +245,19 @@ public String toString() { } } - private final class Entries extends HashMap { + private final class Entries extends HashMap { private static final long serialVersionUID = -4000525580274040823L; public Entries() { - super.put("", new Entry()); + super.put("", new SchemaExporter.Entry()); } - public Entry getRoot() { + public SchemaExporter.Entry getRoot() { return get(""); } @Override - public Entry put(String path, Entry entry) { + public SchemaExporter.Entry put(String path, SchemaExporter.Entry entry) { assertTrue(path.equals(entry.getPath())); if (path.endsWith("/")) { @@ -265,16 +265,16 @@ public Entry put(String path, Entry entry) { } String parentPath = path.substring(0, path.lastIndexOf("/") + 1); - Entry parentEntry = get(parentPath); + SchemaExporter.Entry parentEntry = get(parentPath); if (parentEntry == null) { - parentEntry = new Entry(parentPath); + parentEntry = new SchemaExporter.Entry(parentPath); this.put(parentPath, parentEntry); // recursively } parentEntry.subEntries.put(entry.getSortKey(), entry); - Entry old = super.put(entry.getPath(), entry); + SchemaExporter.Entry old = super.put(entry.getPath(), entry); log.trace("Added entry: {}", entry.getPath()); diff --git a/common/util/src/test/java/com/alibaba/citrus/util/CollectionUtilTests.java b/common/util/src/test/java/com/alibaba/citrus/util/CollectionUtilTests.java index 0bfef6dbe..485dfd98c 100644 --- a/common/util/src/test/java/com/alibaba/citrus/util/CollectionUtilTests.java +++ b/common/util/src/test/java/com/alibaba/citrus/util/CollectionUtilTests.java @@ -154,15 +154,7 @@ public void createHashMap_noArgs() { @Test public void createHashMap_capacity() { Map map = createHashMap(2); - assertTrue(map instanceof HashMap); - - map.put("a", 1); - map.put("b", 1); - map.put("c", 1); - map.put("d", 1); - map.put("e", 1); - - assertArrayNotEquals(new Object[] { "a", "b", "c", "d", "e" }, map.keySet().toArray()); + assertSame(HashMap.class, map.getClass()); } @Test diff --git a/pom.xml b/pom.xml index af0629405..cd7a33be6 100644 --- a/pom.xml +++ b/pom.xml @@ -723,20 +723,20 @@ maven-antrun-plugin - 1.6 + 1.7 maven-compiler-plugin - 2.3.2 + 3.1 maven-jar-plugin - 2.3.2 + 2.4 maven-deploy-plugin - 2.7 + 2.8.1 true @@ -744,23 +744,26 @@ maven-eclipse-plugin - 2.8 + 2.9 maven-shade-plugin - 1.4 + 2.2 maven-source-plugin - 2.1.2 + 2.2.1 maven-javadoc-plugin - 2.8 + 2.9.1 + + -Xdoclint:none + maven-surefire-plugin - 2.10 + 2.16 org.eclipse.jetty