Repository: incubator-juneau Updated Branches: refs/heads/master 4f26c8814 -> 8e6e5a042
Comments. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/8e6e5a04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/8e6e5a04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/8e6e5a04 Branch: refs/heads/master Commit: 8e6e5a0423bb5c7ce807d065e3cf34b28eb7a761 Parents: 4f26c88 Author: JamesBognar <[email protected]> Authored: Mon Mar 27 22:42:52 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Mon Mar 27 22:42:52 2017 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/juneau/utils/AList.java | 5 ++++- juneau-core/src/main/java/org/apache/juneau/utils/AMap.java | 5 ++++- juneau-core/src/main/java/org/apache/juneau/utils/ASet.java | 5 ++++- .../java/org/apache/juneau/rest/test/InterfaceProxy.java | 9 +++++++++ .../src/test/java/org/apache/juneau/rest/test/DTOs.java | 3 +-- 5 files changed, 22 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8e6e5a04/juneau-core/src/main/java/org/apache/juneau/utils/AList.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/AList.java b/juneau-core/src/main/java/org/apache/juneau/utils/AList.java index b4873b9..64e6661 100644 --- a/juneau-core/src/main/java/org/apache/juneau/utils/AList.java +++ b/juneau-core/src/main/java/org/apache/juneau/utils/AList.java @@ -16,10 +16,13 @@ import java.util.*; /** * An extension of {@link LinkedList} with a convenience {@link #append(Object)} method. + * <p> + * Primarily used for testing purposes for quickly creating populated lists. + * * @param <T> The entry type. */ @SuppressWarnings("serial") -public class AList<T> extends LinkedList<T> { +public final class AList<T> extends LinkedList<T> { /** * Adds an entry to this list. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8e6e5a04/juneau-core/src/main/java/org/apache/juneau/utils/AMap.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/AMap.java b/juneau-core/src/main/java/org/apache/juneau/utils/AMap.java index 059ef80..0d2e6b7 100644 --- a/juneau-core/src/main/java/org/apache/juneau/utils/AMap.java +++ b/juneau-core/src/main/java/org/apache/juneau/utils/AMap.java @@ -16,11 +16,14 @@ import java.util.*; /** * An extension of {@link LinkedHashMap} with a convenience {@link #append(Object,Object)} method. + * <p> + * Primarily used for testing purposes for quickly creating populated maps. + * * @param <K> The key type. * @param <V> The value type. */ @SuppressWarnings("serial") -public class AMap<K,V> extends LinkedHashMap<K,V> { +public final class AMap<K,V> extends LinkedHashMap<K,V> { /** * Adds an entry to this map. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8e6e5a04/juneau-core/src/main/java/org/apache/juneau/utils/ASet.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/ASet.java b/juneau-core/src/main/java/org/apache/juneau/utils/ASet.java index 64647f3..3795e86 100644 --- a/juneau-core/src/main/java/org/apache/juneau/utils/ASet.java +++ b/juneau-core/src/main/java/org/apache/juneau/utils/ASet.java @@ -16,10 +16,13 @@ import java.util.*; /** * An extension of {@link LinkedHashSet} with a convenience {@link #append(Object)} method. + * <p> + * Primarily used for testing purposes for quickly creating populated sets. + * * @param <T> The entry type. */ @SuppressWarnings("serial") -public class ASet<T> extends LinkedHashSet<T> { +public final class ASet<T> extends LinkedHashSet<T> { /** * Adds an entry to this set. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8e6e5a04/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxy.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxy.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxy.java index f138488..2391dc0 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxy.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InterfaceProxy.java @@ -19,6 +19,9 @@ import java.util.*; */ public interface InterfaceProxy { + //-------------------------------------------------------------------------------- + // Test return types. + //-------------------------------------------------------------------------------- void returnVoid(); int returnInt(); Integer returnInteger(); @@ -53,9 +56,15 @@ public interface InterfaceProxy { Map<String,List<Bean>> returnBeanListMap(); Map<Integer,List<Bean>> returnBeanListMapIntegerKeys(); + //-------------------------------------------------------------------------------- + // Test server-side exception serialization. + //-------------------------------------------------------------------------------- void throwException1() throws InterfaceProxyException1; void throwException2() throws InterfaceProxyException2; + //-------------------------------------------------------------------------------- + // Test 1-arg parameters + //-------------------------------------------------------------------------------- void setNothing(); void setInt(int x); void setInteger(Integer x); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8e6e5a04/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/DTOs.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/DTOs.java b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/DTOs.java index 578c939..69a925e 100644 --- a/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/DTOs.java +++ b/juneau-rest-test/src/test/java/org/apache/juneau/rest/test/DTOs.java @@ -110,7 +110,6 @@ public class DTOs { @UrlEncoding(expandedParams=true) public static class C extends B { - @SuppressWarnings("serial") static C create() { C t = new C(); t.f01 = new String[]{"a","b"}; @@ -130,7 +129,7 @@ public class DTOs { t.setF15(new String[][]{{"e","f"},{"g","h"}}); t.setF16(new AList<String[]>().append(new String[]{"i","j"}).append(new String[]{"k","l"})); t.setF17(new A[]{A.create(),A.create()}); - t.setF18(new AList<A>(){{add(A.create());add(A.create());}}); + t.setF18(new AList<A>().append(A.create()).append(A.create())); t.setF19(new A[][]{{A.create()},{A.create()}}); t.setF20(new AList<List<A>>().append(Arrays.asList(A.create())).append(Arrays.asList(A.create()))); return t;
