From 0a13e756c7e3d139ca3015e991bf7204d44b11af Mon Sep 17 00:00:00 2001 From: Nikolche Mihajlovski Date: Mon, 6 Nov 2017 10:32:07 +0100 Subject: [PATCH] Code formatting and clean-up. --- commons/rapidoid-commons/pom.xml | 5 +- .../src/main/java/org/rapidoid/data/XML.java | 65 ++++++++----------- .../java/org/rapidoid/http/HttpUtils.java | 3 +- .../http/customize/Customization.java | 29 +++++---- .../http/customize/XmlResponseRenderer.java | 6 +- .../java/org/rapidoid/http/impl/RespImpl.java | 18 ++--- .../src/main/java/org/rapidoid/setup/My.java | 7 +- .../main/java/org/rapidoid/setup/OnRoute.java | 14 ++-- .../src/test/java/HttpXmlAPITest.java | 23 ++----- 9 files changed, 71 insertions(+), 99 deletions(-) diff --git a/commons/rapidoid-commons/pom.xml b/commons/rapidoid-commons/pom.xml index dc79aae4c8..82efd8855f 100644 --- a/commons/rapidoid-commons/pom.xml +++ b/commons/rapidoid-commons/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 @@ -38,7 +39,7 @@ jackson-dataformat-yaml ${jackson.version} - + com.fasterxml.jackson.dataformat jackson-dataformat-xml ${jackson.version} diff --git a/commons/rapidoid-commons/src/main/java/org/rapidoid/data/XML.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/data/XML.java index 5cb313fc49..be4cdd9e20 100644 --- a/commons/rapidoid-commons/src/main/java/org/rapidoid/data/XML.java +++ b/commons/rapidoid-commons/src/main/java/org/rapidoid/data/XML.java @@ -2,23 +2,14 @@ import com.fasterxml.jackson.core.Base64Variants; import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.fasterxml.jackson.module.afterburner.AfterburnerModule; import org.rapidoid.RapidoidThing; +import org.rapidoid.env.Env; +import org.rapidoid.writable.ReusableWritable; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; -import static org.rapidoid.data.JSON.tuuidModule; -import org.rapidoid.env.Env; -import org.rapidoid.writable.ReusableWritable; /* * #%L @@ -42,6 +33,7 @@ /** * @author Nikolche Mihajlovski + * @author Dan Cytermann * @since 4.4.0 */ public class XML extends RapidoidThing { @@ -49,9 +41,7 @@ public class XML extends RapidoidThing { private XML() { } - - - public static XmlMapper newMapper() { + public static XmlMapper newMapper() { XmlMapper mapper = new XmlMapper(); mapper.setBase64Variant(Base64Variants.MODIFIED_FOR_URL); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); @@ -61,34 +51,31 @@ public static XmlMapper newMapper() { } return mapper; - } + } - - public static String stringify(Object obj) { - XmlMapper mapper = newMapper(); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - try { - mapper.writeValue(out, obj); - } catch (IOException ex) { - throw new RuntimeException(ex); - } - - return out.toString(); + XmlMapper mapper = newMapper(); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + + try { + mapper.writeValue(out, obj); + } catch (IOException ex) { + throw new RuntimeException(ex); + } + + return out.toString(); } - - + public static void stringify(Object value, ReusableWritable out) { - XmlMapper mapper = newMapper(); - try { - mapper.writeValue(out, value); - } catch (IOException ex) { - throw new RuntimeException(ex); - } + XmlMapper mapper = newMapper(); + try { + mapper.writeValue(out, value); + } catch (IOException ex) { + throw new RuntimeException(ex); + } } - public static T parse(String xml, Class valueType) { return parse(xml.getBytes(), valueType); } @@ -96,10 +83,10 @@ public static T parse(String xml, Class valueType) { @SuppressWarnings("unchecked") public static T parse(byte[] xml, Class valueType) { try { - - XmlMapper mapper = newMapper(); - return mapper.readValue(xml, valueType); - + + XmlMapper mapper = newMapper(); + return mapper.readValue(xml, valueType); + } catch (Exception e) { throw new RuntimeException(e); } diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/HttpUtils.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/HttpUtils.java index 3d2061da74..5fb1bfa9ed 100644 --- a/rapidoid-http-fast/src/main/java/org/rapidoid/http/HttpUtils.java +++ b/rapidoid-http-fast/src/main/java/org/rapidoid/http/HttpUtils.java @@ -13,7 +13,7 @@ import org.rapidoid.data.BufRanges; import org.rapidoid.gui.reqinfo.ReqInfo; import org.rapidoid.http.customize.Customization; -import org.rapidoid.http.customize.JsonResponseRenderer; +import org.rapidoid.http.customize.MediaResponseRenderer; import org.rapidoid.http.impl.MaybeReq; import org.rapidoid.io.Res; import org.rapidoid.lambda.Mapper; @@ -25,7 +25,6 @@ import java.io.Serializable; import java.util.Map; import java.util.regex.Pattern; -import org.rapidoid.http.customize.MediaResponseRenderer; /* * #%L diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/Customization.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/Customization.java index 8f777b0297..8a57008edf 100644 --- a/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/Customization.java +++ b/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/Customization.java @@ -59,9 +59,9 @@ public class Customization extends RapidoidThing { private volatile JsonResponseRenderer jsonResponseRenderer; private volatile JsonRequestBodyParser jsonRequestBodyParser; - + private volatile XmlResponseRenderer xmlResponseRenderer; - + private volatile XmlRequestBodyParser xmlRequestBodyParser; private volatile BeanParameterFactory beanParameterFactory; @@ -73,7 +73,7 @@ public class Customization extends RapidoidThing { private volatile BeanValidator validator; private volatile ObjectMapper jackson; - + private volatile XmlMapper jacksonXml; private volatile EntityManagerProvider entityManagerProvider; @@ -207,12 +207,12 @@ public Customization jsonResponseRenderer(JsonResponseRenderer jsonResponseRende this.jsonResponseRenderer = jsonResponseRenderer; return this; } - - public XmlResponseRenderer xmlResponseRenderer(){ + + public XmlResponseRenderer xmlResponseRenderer() { return xmlResponseRenderer != null || defaults == null ? xmlResponseRenderer : defaults.xmlResponseRenderer(); } - - public Customization xmlResponseRenderer(XmlResponseRenderer xmlResponseRenderer){ + + public Customization xmlResponseRenderer(XmlResponseRenderer xmlResponseRenderer) { this.xmlResponseRenderer = xmlResponseRenderer; return this; } @@ -261,15 +261,16 @@ public Customization jackson(ObjectMapper jackson) { this.jackson = jackson; return this; } - - public XmlMapper jacksonXml(){ - return jacksonXml != null || defaults == null ? jacksonXml : defaults.jacksonXml(); + + public XmlMapper jacksonXml() { + return jacksonXml != null || defaults == null ? jacksonXml : defaults.jacksonXml(); } - + public Customization jacksonXml(XmlMapper jacksonXml) { this.jacksonXml = jacksonXml; return this; } + public EntityManagerProvider entityManagerProvider() { return entityManagerProvider != null || defaults == null ? entityManagerProvider : defaults.entityManagerProvider(); } @@ -296,11 +297,11 @@ public Customization jsonRequestBodyParser(JsonRequestBodyParser jsonRequestBody this.jsonRequestBodyParser = jsonRequestBodyParser; return this; } - + public XmlRequestBodyParser xmlRequestBodyParser() { - return xmlRequestBodyParser != null || defaults == null ? xmlRequestBodyParser : defaults.xmlRequestBodyParser(); + return xmlRequestBodyParser != null || defaults == null ? xmlRequestBodyParser : defaults.xmlRequestBodyParser(); } - + public Customization xmlRequestBodyParser(XmlRequestBodyParser xmlRequestBodyParser) { this.xmlRequestBodyParser = xmlRequestBodyParser; return this; diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/XmlResponseRenderer.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/XmlResponseRenderer.java index 3fc1f28134..71dc614d5e 100644 --- a/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/XmlResponseRenderer.java +++ b/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/XmlResponseRenderer.java @@ -2,9 +2,6 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; -import org.rapidoid.http.Req; - -import java.io.OutputStream; /* * #%L @@ -28,7 +25,6 @@ @Authors("Dan Cytermann") @Since("5.5.0") -public interface XmlResponseRenderer extends MediaResponseRenderer{ - +public interface XmlResponseRenderer extends MediaResponseRenderer { } diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/RespImpl.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/RespImpl.java index f8462e2577..a5820075ea 100644 --- a/rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/RespImpl.java +++ b/rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/RespImpl.java @@ -16,6 +16,7 @@ import org.rapidoid.http.Resp; import org.rapidoid.http.customize.Customization; import org.rapidoid.http.customize.LoginProvider; +import org.rapidoid.http.customize.MediaResponseRenderer; import org.rapidoid.http.customize.RolesProvider; import org.rapidoid.io.IO; import org.rapidoid.net.AsyncLogic; @@ -34,7 +35,6 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -import org.rapidoid.http.customize.MediaResponseRenderer; /* * #%L @@ -585,15 +585,15 @@ void finish() { } private MediaResponseRenderer mediaResponseRenderer() { - if(contentType.equals(MediaType.JSON)){ + if (contentType.equals(MediaType.JSON)) { + return Customization.of(req).jsonResponseRenderer(); + + } else if (contentType.equals(MediaType.XML_UTF_8)) { + return Customization.of(req).xmlResponseRenderer(); + + } else { + //default to json return Customization.of(req).jsonResponseRenderer(); } - else{ - if(contentType.equals(MediaType.XML_UTF_8)){ - return Customization.of(req).xmlResponseRenderer(); - } - } - //default to json - return Customization.of(req).jsonResponseRenderer(); } } diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/setup/My.java b/rapidoid-http-fast/src/main/java/org/rapidoid/setup/My.java index 8ecadaff0d..734a18989f 100644 --- a/rapidoid-http-fast/src/main/java/org/rapidoid/setup/My.java +++ b/rapidoid-http-fast/src/main/java/org/rapidoid/setup/My.java @@ -104,6 +104,7 @@ public static void jsonResponseRenderer(JsonResponseRenderer jsonResponseRendere public static void xmlResponseRenderer(XmlResponseRenderer xmlResponseRenderer) { GLOBAL.xmlResponseRenderer(xmlResponseRenderer); } + public static void beanParameterFactory(BeanParameterFactory beanParameterFactory) { GLOBAL.beanParameterFactory(beanParameterFactory); } @@ -131,8 +132,8 @@ public static void viewResolver(ViewResolver viewResolver) { public static void jackson(ObjectMapper jackson) { GLOBAL.jackson(jackson); } - - public static void jacksonXml(XmlMapper jacksonXml){ + + public static void jacksonXml(XmlMapper jacksonXml) { GLOBAL.jacksonXml(jacksonXml); } @@ -143,7 +144,7 @@ public static ErrorHandler errorHandler() { public static JsonResponseRenderer jsonResponseRenderer() { return GLOBAL.jsonResponseRenderer(); } - + public static XmlResponseRenderer xmlResponseRenderer() { return GLOBAL.xmlResponseRenderer(); } diff --git a/rapidoid-http-server/src/main/java/org/rapidoid/setup/OnRoute.java b/rapidoid-http-server/src/main/java/org/rapidoid/setup/OnRoute.java index 3c91b39aa1..b09eda5168 100644 --- a/rapidoid-http-server/src/main/java/org/rapidoid/setup/OnRoute.java +++ b/rapidoid-http-server/src/main/java/org/rapidoid/setup/OnRoute.java @@ -4,7 +4,10 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; import org.rapidoid.annotation.TransactionMode; -import org.rapidoid.http.*; +import org.rapidoid.http.HttpWrapper; +import org.rapidoid.http.MediaType; +import org.rapidoid.http.ReqHandler; +import org.rapidoid.http.ReqRespHandler; import org.rapidoid.http.impl.RouteOptions; import org.rapidoid.lambda.*; @@ -222,8 +225,7 @@ public void json(SevenParamLambda handler) { HttpHandlers.register(setup, verb, path, jsonOpts(), handler); } - - /* XML */ + /* XML */ public void xml(String response) { HttpHandlers.registerPredefined(setup, verb, path, xmlOpts(), response); @@ -276,7 +278,7 @@ public void xml(SixParamLambda handler) { public void xml(SevenParamLambda handler) { HttpHandlers.register(setup, verb, path, xmlOpts(), handler); } - + /* PLAIN */ public void plain(String response) { @@ -399,10 +401,10 @@ private RouteOptions jsonOpts() { return opts(MediaType.JSON); } - private RouteOptions xmlOpts() { + private RouteOptions xmlOpts() { return opts(MediaType.XML_UTF_8); } - + private RouteOptions plainOpts() { return opts(MediaType.PLAIN_TEXT_UTF_8); } diff --git a/rapidoid-http-server/src/test/java/HttpXmlAPITest.java b/rapidoid-http-server/src/test/java/HttpXmlAPITest.java index f4d52b5d40..c748c65a8a 100644 --- a/rapidoid-http-server/src/test/java/HttpXmlAPITest.java +++ b/rapidoid-http-server/src/test/java/HttpXmlAPITest.java @@ -27,36 +27,21 @@ import org.rapidoid.setup.On; import org.rapidoid.test.TestCommons; import org.rapidoid.u.U; -import org.rapidoid.util.MscOpts; -@Authors("Nikolche Mihajlovski") -@Since("5.2.9") +@Authors({"Dan Cytermann", "Nikolche Mihajlovski"}) +@Since("5.5.0") public class HttpXmlAPITest extends TestCommons { - private void initAPI() { - - + @Test + public void testXmlAPI() { On.get("/inc/{x}").xml(new ReqHandler() { @Override public Object execute(Req req) { return U.num(req.param("x")) + 1; } }); - } - - @Test - public void testIncludedModules() { - isFalse(MscOpts.hasRapidoidHTML()); - isFalse(MscOpts.hasRapidoidGUI()); - } - - @Test - public void testRestAPI() { - initAPI(); Self.get("/inc/99").expect("100"); } - - }