Merge branch 'develop'

Author: Gerald Unterrainer

pom.xml

@@ -17,11 +17,16 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.2.23</version>
+	<version>0.2.24</version>
 	<name>HttpServer</name>
 	<packaging>jar</packaging>
 
 	<dependencies>
+		<dependency>
+			<groupId>com.squareup.okio</groupId>
+			<artifactId>okio</artifactId>
+			<version>1.17.2</version>
+		</dependency>
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>jre-utils</artifactId>

src/main/java/info/unterrainer/commons/httpserver/GenericHandlerGroup.java

@@ -156,7 +156,7 @@ private void getList(final Context ctx) {
 	}
 
 	private void create(final Context ctx) throws IOException {
-		String b = ctx.body();
+		String b = ctx.attribute(Attribute.REQUEST_BODY);
 		try {
 			J json = jsonMapper.fromStringTo(jsonType, b);
 			P mappedJpa = orikaMapper.map(json, jpaType);
@@ -182,7 +182,7 @@ private void fullUpdate(final Context ctx) throws IOException {
 		DaoTransaction<E> transaction = dao.getTransactionManager().beginTransaction(ctx);
 		P jpa = hu.getJpaById(ctx, transaction.getManager(), dao);
 		try {
-			J json = jsonMapper.fromStringTo(jsonType, ctx.body());
+			J json = jsonMapper.fromStringTo(jsonType, ctx.attribute(Attribute.REQUEST_BODY));
 			P mappedJpa = orikaMapper.map(json, jpaType);
 			mappedJpa.setId(jpa.getId());
 			mappedJpa.setCreatedOn(jpa.getCreatedOn());

src/main/java/info/unterrainer/commons/httpserver/HttpServer.java

@@ -43,6 +43,9 @@
 import lombok.extern.slf4j.Slf4j;
 import ma.glasnost.orika.MapperFactory;
 import ma.glasnost.orika.impl.DefaultMapperFactory;
+import okio.BufferedSource;
+import okio.GzipSource;
+import okio.Okio;
 
 @Slf4j
 public class HttpServer {
@@ -119,6 +122,7 @@ private void create() {
 		javalin.before(ctx -> ctx.attribute(Attribute.JAVALIN_SERVER, this));
 		javalin.before(ctx -> ctx.attribute(Attribute.RESPONSE_TYPE, ResponseType.JSON));
 		javalin.before(ctx -> ctx.contentType("application/json"));
+		javalin.before(this::unzip);
 
 		javalin.after(ctx -> render(ctx));
 		javalin.after(ctx -> {
@@ -232,6 +236,22 @@ public HttpServer delete(final String path, final Handler handler, final Role...
 		return this;
 	}
 
+	private void unzip(final Context ctx) throws IOException {
+		String body = ctx.body();
+
+		if (body == null)
+			return;
+
+		if (ctx.header("Content-Encoding") == "gzip") {
+			BufferedSource bs = Okio.buffer(Okio.source(ctx.bodyAsInputStream()));
+			GzipSource gzipSource = new GzipSource(bs);
+			body = Okio.buffer(gzipSource).readUtf8();
+		}
+
+		ctx.bodyAsInputStream().reset();
+		ctx.attribute(Attribute.REQUEST_BODY, body);
+	}
+
 	private void render(final Context ctx) throws IOException {
 
 		Object dto = ctx.attribute(Attribute.RESPONSE_OBJECT);

src/main/java/info/unterrainer/commons/httpserver/enums/Attribute.java

@@ -3,6 +3,8 @@
 public class Attribute {
 	public static final String JAVALIN_SERVER = "javalin_server";
 
+	public static final String REQUEST_BODY = "request_body";
+
 	public static final String RESPONSE_OBJECT = "response_object";
 	public static final String RESPONSE_STATUS = "response_status";
 	public static final String RESPONSE_TYPE = "response_type";