Repository: incubator-juneau Updated Branches: refs/heads/master 23fe563dd -> b37d99bac
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java index d622593..475ef07 100644 --- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java +++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java @@ -24,7 +24,6 @@ import java.util.*; import javax.imageio.*; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.microservice.*; import org.apache.juneau.parser.*; import org.apache.juneau.rest.*; @@ -131,7 +130,6 @@ public class PhotosResource extends Resource { } /** Serializer for converting images to byte streams */ - @Produces("image/png,image/jpeg") public static class ImageSerializer extends OutputStreamSerializer { /** @@ -139,7 +137,7 @@ public class PhotosResource extends Resource { * @param propertyStore The property store containing all the settings for this object. */ public ImageSerializer(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, null, "image/png", "image/jpeg"); } @Override /* Serializer */ @@ -157,7 +155,6 @@ public class PhotosResource extends Resource { } /** Parser for converting byte streams to images */ - @Consumes("image/png,image/jpeg") public static class ImageParser extends InputStreamParser { /** @@ -165,7 +162,7 @@ public class PhotosResource extends Resource { * @param propertyStore The property store containing all the settings for this object. */ public ImageParser(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "image/png", "image/jpeg"); } @Override /* Parser */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java index 27add70..2281896 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java @@ -17,7 +17,6 @@ import static org.apache.juneau.rest.RestContext.*; import java.io.*; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.parser.*; import org.apache.juneau.plaintext.*; import org.apache.juneau.rest.*; @@ -54,11 +53,10 @@ public class AcceptCharsetResource extends RestServlet { return in; } - @Consumes("text/plain") public static class TestParser extends InputStreamParser { public TestParser(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/plain"); } @Override /* Parser */ @@ -74,11 +72,10 @@ public class AcceptCharsetResource extends RestServlet { } } - @Produces("text/plain") public static class TestSerializer extends OutputStreamSerializer { public TestSerializer(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/plain"); } @Override /* Serializer */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java index e9ed395..d9906f4 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/CharsetEncodingsResource.java @@ -15,7 +15,6 @@ package org.apache.juneau.rest.test; import static org.apache.juneau.internal.IOUtils.*; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.parser.*; import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; @@ -32,11 +31,10 @@ import org.apache.juneau.serializer.*; public class CharsetEncodingsResource extends RestServlet { private static final long serialVersionUID = 1L; - @Consumes("text/p") public static class CtParser extends ReaderParser { public CtParser(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/p"); } @Override /* Parser */ @@ -52,11 +50,10 @@ public class CharsetEncodingsResource extends RestServlet { } } - @Produces("text/s") public static class ASerializer extends WriterSerializer { public ASerializer(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/s"); } @Override /* Serializer */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java index 22fd963..dbd3d05 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/DefaultContentTypesResource.java @@ -15,7 +15,6 @@ package org.apache.juneau.rest.test; import static org.apache.juneau.rest.annotation.Inherit.*; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.parser.*; import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; @@ -33,23 +32,17 @@ import org.apache.juneau.serializer.*; public class DefaultContentTypesResource extends RestServlet { private static final long serialVersionUID = 1L; - @Consumes("text/p1") - public static class P1 extends DummyParser { public P1(PropertyStore ps) {super(ps, "p1");}} + public static class P1 extends DummyParser { public P1(PropertyStore ps) {super(ps, "p1", "text/p1");}} - @Consumes("text/p2") - public static class P2 extends DummyParser { public P2(PropertyStore ps) {super(ps, "p2");}} + public static class P2 extends DummyParser { public P2(PropertyStore ps) {super(ps, "p2", "text/p2");}} - @Consumes("text/p3") - public static class P3 extends DummyParser { public P3(PropertyStore ps) {super(ps, "p3");}} + public static class P3 extends DummyParser { public P3(PropertyStore ps) {super(ps, "p3", "text/p3");}} - @Produces("text/s1") - public static class S1 extends DummySerializer { public S1(PropertyStore ps) {super(ps, "s1");}} + public static class S1 extends DummySerializer { public S1(PropertyStore ps) {super(ps, "s1", "text/s1");}} - @Produces("text/s2") - public static class S2 extends DummySerializer { public S2(PropertyStore ps) {super(ps, "s2");}} + public static class S2 extends DummySerializer { public S2(PropertyStore ps) {super(ps, "s2", "text/s2");}} - @Produces("text/s3") - public static class S3 extends DummySerializer { public S3(PropertyStore ps) {super(ps, "s3");}} + public static class S3 extends DummySerializer { public S3(PropertyStore ps) {super(ps, "s3", "text/s3");}} /** * Test that default Accept and Content-Type headers on servlet annotation are picked up. @@ -107,8 +100,8 @@ public class DefaultContentTypesResource extends RestServlet { private String name; - private DummyParser(PropertyStore propertyStore, String name) { - super(propertyStore); + private DummyParser(PropertyStore propertyStore, String name, String...consumes) { + super(propertyStore, consumes); this.name = name; } @@ -129,8 +122,8 @@ public class DefaultContentTypesResource extends RestServlet { private String name; - private DummySerializer(PropertyStore propertyStore, String name) { - super(propertyStore); + private DummySerializer(PropertyStore propertyStore, String name, String produces) { + super(propertyStore, produces); this.name = name; } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java index acaa410..6bd6454 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/GroupsResource.java @@ -16,7 +16,6 @@ import static org.apache.juneau.internal.IOUtils.*; import static org.apache.juneau.rest.annotation.HookEvent.*; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.parser.*; import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; @@ -36,11 +35,10 @@ public class GroupsResource extends RestServlet { config.addSerializers(SSerializer.class).addParsers(PParser.class); } - @Produces("text/s1,text/s2") public static class SSerializer extends WriterSerializer { public SSerializer(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/s1", "text/s1", "text/s2"); } @Override /* Serializer */ @@ -55,11 +53,10 @@ public class GroupsResource extends RestServlet { } } - @Consumes("text/p1,text/p2") public static class PParser extends ReaderParser { public PParser(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/p1", "text/p2"); } @Override /* Parser */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/HeadersResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/HeadersResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/HeadersResource.java index 1949a96..8af0fd3 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/HeadersResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/HeadersResource.java @@ -13,7 +13,6 @@ package org.apache.juneau.rest.test; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.encoders.*; import org.apache.juneau.http.*; import org.apache.juneau.plaintext.*; @@ -171,17 +170,15 @@ public class HeadersResource extends RestServlet { } } - @Produces("*/*") public static class PlainTextAnythingSerializer extends PlainTextSerializer { public PlainTextAnythingSerializer(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/plain", "*/*"); } } - @Consumes("*/*") public static class PlainTextAnythingParser extends PlainTextParser { public PlainTextAnythingParser(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "*/*"); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java index 5b25414..72bb164 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/InheritanceResource.java @@ -18,7 +18,6 @@ import java.io.*; import java.util.*; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.encoders.*; import org.apache.juneau.json.*; import org.apache.juneau.parser.*; @@ -224,8 +223,8 @@ public class InheritanceResource extends RestServlet { public static class DummyParser extends ReaderParser { - public DummyParser() { - super(PropertyStore.create()); + public DummyParser(String...consumes) { + super(PropertyStore.create(), consumes); } @Override /* Parser */ @@ -242,8 +241,8 @@ public class InheritanceResource extends RestServlet { public static class DummySerializer extends WriterSerializer { - public DummySerializer() { - super(PropertyStore.create()); + public DummySerializer(String produces) { + super(PropertyStore.create(), produces); } @Override /* Serializer */ @@ -258,35 +257,25 @@ public class InheritanceResource extends RestServlet { } } - @Consumes("text/p1") - public static class P1 extends DummyParser{ public P1(PropertyStore ps) {super();} } + public static class P1 extends DummyParser{ public P1(PropertyStore ps) {super("text/p1");} } - @Consumes("text/p2") - public static class P2 extends DummyParser{ public P2(PropertyStore ps) {super();} } + public static class P2 extends DummyParser{ public P2(PropertyStore ps) {super("text/p2");} } - @Consumes("text/p3") - public static class P3 extends DummyParser{ public P3(PropertyStore ps) {super();} } + public static class P3 extends DummyParser{ public P3(PropertyStore ps) {super("text/p3");} } - @Consumes("text/p4") - public static class P4 extends DummyParser{ public P4(PropertyStore ps) {super();} } + public static class P4 extends DummyParser{ public P4(PropertyStore ps) {super("text/p4");} } - @Consumes("text/p5") - public static class P5 extends DummyParser{ public P5(PropertyStore ps) {super();} } + public static class P5 extends DummyParser{ public P5(PropertyStore ps) {super("text/p5");} } - @Produces("text/s1") - public static class S1 extends DummySerializer{ public S1(PropertyStore ps) {super();} } + public static class S1 extends DummySerializer{ public S1(PropertyStore ps) {super("text/s1");} } - @Produces("text/s2") - public static class S2 extends DummySerializer{ public S2(PropertyStore ps) {super();} } + public static class S2 extends DummySerializer{ public S2(PropertyStore ps) {super("text/s2");} } - @Produces("text/s3") - public static class S3 extends DummySerializer{ public S3(PropertyStore ps) {super();} } + public static class S3 extends DummySerializer{ public S3(PropertyStore ps) {super("text/s3");} } - @Produces("text/s4") - public static class S4 extends DummySerializer{ public S4(PropertyStore ps) {super();} } + public static class S4 extends DummySerializer{ public S4(PropertyStore ps) {super("text/s4");} } - @Produces("text/s5") - public static class S5 extends DummySerializer{ public S5(PropertyStore ps) {super();} } + public static class S5 extends DummySerializer{ public S5(PropertyStore ps) {super("text/s5");} } public static class E1 extends IdentityEncoder { @Override public String[] getCodings() { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java index 7c5f1b4..3472634 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java @@ -13,7 +13,6 @@ package org.apache.juneau.rest.test; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; import org.apache.juneau.serializer.*; @@ -52,11 +51,10 @@ public class NlsPropertyResource extends RestServlet { return null; } - @Produces("text/plain") public static class TestSerializer extends WriterSerializer { public TestSerializer(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/plain"); } @Override /* Serializer */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java index fb38931..a9414b0 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java @@ -17,7 +17,6 @@ import static org.apache.juneau.rest.annotation.HookEvent.*; import java.util.*; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; import org.apache.juneau.rest.annotation.Properties; @@ -41,11 +40,10 @@ import org.apache.juneau.utils.*; public class OnPostCallResource extends RestServlet { private static final long serialVersionUID = 1L; - @Produces("text/s1,text/s2,text/s3") public static class TestSerializer extends WriterSerializer { public TestSerializer(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "test/s1", "text/s1", "text/s2", "text/s3"); } @Override /* Serializer */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java index 9390051..9fa9469 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java @@ -15,7 +15,6 @@ package org.apache.juneau.rest.test; import static org.apache.juneau.rest.annotation.HookEvent.*; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.parser.*; import org.apache.juneau.plaintext.*; import org.apache.juneau.rest.*; @@ -39,11 +38,10 @@ import org.apache.juneau.rest.annotation.*; public class OnPreCallResource extends RestServlet { private static final long serialVersionUID = 1L; - @Consumes("text/a1,text/a2,text/a3") public static class TestParserA extends ReaderParser { public TestParserA(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/a1", "text/a2", "text/a3"); } @Override /* Parser */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java index 1142263..ad6e0b2 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/ParsersResource.java @@ -16,7 +16,6 @@ import static org.apache.juneau.internal.IOUtils.*; import static org.apache.juneau.rest.annotation.Inherit.*; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.parser.*; import org.apache.juneau.plaintext.*; import org.apache.juneau.rest.*; @@ -34,11 +33,10 @@ import org.apache.juneau.rest.annotation.*; public class ParsersResource extends RestServletDefault { private static final long serialVersionUID = 1L; - @Consumes("text/a") public static class TestParserA extends ReaderParser { public TestParserA(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/a"); } @Override /* Parser */ @@ -70,11 +68,10 @@ public class ParsersResource extends RestServletDefault { return in; } - @Consumes("text/b") public static class TestParserB extends ReaderParser { public TestParserB(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/b"); } @Override /* Parser */ @@ -98,11 +95,10 @@ public class ParsersResource extends RestServletDefault { return in; } - @Consumes("text/c") public static class TestParserC extends ReaderParser { public TestParserC(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/c"); } @Override /* Parser */ @@ -126,11 +122,10 @@ public class ParsersResource extends RestServletDefault { return in; } - @Consumes("text/a,text/d") public static class TestParserD extends ReaderParser { public TestParserD(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/a", "text/d"); } @Override /* Parser */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java index 2b47160..c608a68 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java @@ -15,7 +15,6 @@ package org.apache.juneau.rest.test; import static java.lang.String.*; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; import org.apache.juneau.serializer.*; @@ -59,11 +58,10 @@ public class PropertiesResource extends RestServletDefault { res.setOutput(null); } - @Produces("application/json,text/json") public static class PropertySerializer1 extends WriterSerializer { public PropertySerializer1(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "application/json", "*/json"); } @Override /* Serializer */ @@ -88,11 +86,10 @@ public class PropertiesResource extends RestServletDefault { res.setOutput(null); } - @Produces("application/json,text/json") public static class PropertySerializer2 extends WriterSerializer { public PropertySerializer2(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "application/json", "*/json"); } @Override /* Serializer */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java index c4578c2..21b1f37 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/SerializersResource.java @@ -15,7 +15,6 @@ package org.apache.juneau.rest.test; import static org.apache.juneau.rest.annotation.Inherit.*; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; import org.apache.juneau.serializer.*; @@ -30,11 +29,10 @@ import org.apache.juneau.serializer.*; public class SerializersResource extends RestServletDefault { private static final long serialVersionUID = 1L; - @Produces("text/a") public static class TestSerializerA extends WriterSerializer { public TestSerializerA(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/a"); } @Override /* Serializer */ @@ -49,11 +47,10 @@ public class SerializersResource extends RestServletDefault { } } - @Produces("text/b") public static class TestSerializerB extends WriterSerializer { public TestSerializerB(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/b"); } @Override /* Serializer */ @@ -92,11 +89,10 @@ public class SerializersResource extends RestServletDefault { return "test3"; } - @Produces("text/a") public static class TestSerializerC extends WriterSerializer { public TestSerializerC(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/a"); } @Override /* Serializer */ @@ -119,11 +115,10 @@ public class SerializersResource extends RestServletDefault { return "test4"; } - @Produces(value="text/a,text/d",contentType="text/d") public static class TestSerializerD extends WriterSerializer { public TestSerializerD(PropertyStore propertyStore) { - super(propertyStore); + super(propertyStore, "text/d", "text/a", "text/d"); } @Override /* Serializer */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest/src/main/java/org/apache/juneau/rest/package.html ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/package.html b/juneau-rest/src/main/java/org/apache/juneau/rest/package.html index 82b694f..73b8e68 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/package.html +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/package.html @@ -1517,8 +1517,7 @@ </p> <p> The servlet will pick which serializer to use by matching the request <l>Accept</l> header with the - media types defined through the {@link org.apache.juneau.serializer.Serializer#getMediaTypes()} method - (which itself usually comes from the {@link org.apache.juneau.annotation.Produces @Produces} annotation). + media types defined through the {@link org.apache.juneau.serializer.Serializer#getMediaTypes()} method. </p> <p> Serializers can be associated with REST servlets in the following ways: @@ -1587,8 +1586,7 @@ </p> <p> The servlet will pick which parser to use by matching the request <l>Content-Type</l> header with the - media types defined through the {@link org.apache.juneau.parser.Parser#getMediaTypes()} method (which itself - usually comes from the {@link org.apache.juneau.annotation.Consumes @Consumes} annotation). + media types defined through the {@link org.apache.juneau.parser.Parser#getMediaTypes()} method. </p> <p> Parsers can be associated with REST servlets in the following ways: http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b37d99ba/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java b/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java index aac9172..b5b16b5 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java @@ -18,7 +18,6 @@ import java.io.*; import java.util.*; import org.apache.juneau.*; -import org.apache.juneau.annotation.*; import org.apache.juneau.http.*; import org.apache.juneau.internal.*; import org.apache.juneau.rest.*; @@ -35,7 +34,7 @@ import org.apache.juneau.serializer.*; * * <p> * The <code>Content-Type</code> header is set to the mime-type defined on the selected serializer based on the - * {@link Produces#contentType() @Produces.contentType} annotation. + * <code>produces</code> value passed in through the constructor. */ public class DefaultHandler implements ResponseHandler {
