Fix some compatibility issues with newer resteasy versions

client/core/src/main/java/com/blazebit/storage/rest/client/ResponseObjectBuilder.java

@@ -19,8 +19,8 @@
 public class ResponseObjectBuilder implements Builder {
 
 	private final List<MessageBodyReader<?>> responseObjectMessageReader;
-	private Builder delegate;
-	
+	private final Builder delegate;
+
 	public ResponseObjectBuilder(Builder delegate, List<MessageBodyReader<?>> responseObjectMessageReader) {
 		this.delegate = delegate;
 		this.responseObjectMessageReader = responseObjectMessageReader;

client/core/src/main/java/com/blazebit/storage/rest/client/ResponseObjectInvocation.java

@@ -26,7 +26,7 @@
 public class ResponseObjectInvocation implements Invocation {
 
 	private final List<MessageBodyReader<?>> responseObjectMessageReader;
-	private Invocation delegate;
+	private final Invocation delegate;
 
 	public ResponseObjectInvocation(Invocation delegate, List<MessageBodyReader<?>> responseObjectMessageReader) {
 		this.delegate = delegate;
@@ -58,7 +58,11 @@ private <T> T getResponseObject(MessageBodyReader<T> reader, Class<T> responseTy
 			boolean success = false;
 			try {
 				// this wrapping serves as a workaround to prevent the GC from closing the response and with it the underlying inputstream
-				InputStream responseBody = new ResponseInputStreamWrapper(response.readEntity(InputStream.class), response);
+				InputStream is = null;
+				if (response.hasEntity()) {
+					is = response.readEntity(InputStream.class);
+				}
+				InputStream responseBody = new ResponseInputStreamWrapper(is, response);
 				T result = reader.readFrom(responseType, null, null, null, response.getStringHeaders(), responseBody);
 				success = true;
 				return result;

client/core/src/main/java/com/blazebit/storage/rest/client/ResponseObjectWebTarget.java

@@ -14,7 +14,7 @@
 public class ResponseObjectWebTarget implements WebTarget {
 
 	private final List<MessageBodyReader<?>> responseObjectMessageReader;
-	private WebTarget delegate;
+	private final WebTarget delegate;
 
 	public ResponseObjectWebTarget(WebTarget delegate, List<MessageBodyReader<?>> responseObjectMessageReader) {
 		this.delegate = delegate;

rest/impl/src/main/java/com/blazebit/storage/rest/impl/aop/ResponseObjectMessageBodyWriter.java

@@ -1,22 +1,19 @@
 package com.blazebit.storage.rest.impl.aop;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
+import com.blazebit.storage.rest.api.aop.ResponseObject;
+import com.blazebit.storage.rest.model.convert.ResponseObjectAwareMessageBodyWriter;
 
-import javax.enterprise.inject.Vetoed;
 import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.MessageBodyWriter;
 import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 
-import com.blazebit.storage.rest.api.aop.ResponseObject;
-import com.blazebit.storage.rest.model.convert.ResponseObjectAwareMessageBodyWriter;
-
-@Vetoed
 @Provider
 @Produces(MediaType.WILDCARD)
 public class ResponseObjectMessageBodyWriter implements MessageBodyWriter<Object> {

rest/impl/src/main/java/com/blazebit/storage/rest/impl/aop/ResteasyWorkaroundContainerRequestFilter.java

@@ -0,0 +1,25 @@
+package com.blazebit.storage.rest.impl.aop;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+import java.util.Collections;
+
+@Provider
+@PreMatching
+public class ResteasyWorkaroundContainerRequestFilter implements ContainerRequestFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        MultivaluedMap<String, String> headers = requestContext.getHeaders();
+        String accept = headers.getFirst(HttpHeaders.ACCEPT);
+        if (accept == null || accept.isEmpty()) {
+            headers.put(HttpHeaders.ACCEPT, Collections.singletonList(MediaType.WILDCARD));
+        }
+    }
+}