Support BeanParam annotation on collections.

noboomu · Jun 14, 2018 · 04f5d34 · 04f5d34
1 parent 87ec289
commit 04f5d34
Show file tree

Hide file tree

Showing 7 changed files with 244 additions and 48 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.sinistral</groupId>
 	<artifactId>proteus-core</artifactId>
-	<version>0.2.0-SNAPSHOT</version>
+	<version>0.2.1-SNAPSHOT</version>
 	<name>proteus core</name>
     <description>Proteus is an extremely light, fast, and flexible Java REST API framework built atop Undertow.</description>
     <url>http://github.com/noboomu/proteus</url>

diff --git a/src/main/java/io/sinistral/proteus/server/Extractors.java b/src/main/java/io/sinistral/proteus/server/Extractors.java
@@ -52,25 +52,27 @@ public static java.util.Optional<JsonIterator> jsonIterator(final HttpServerExch
 
 		public static  <T> java.util.Optional<T> model(final HttpServerExchange exchange, final TypeLiteral<T> type )
 		{
-			if( ServerPredicates.JSON_PREDICATE.resolve(exchange) )
+			if( ServerPredicates.XML_PREDICATE.resolve(exchange) )
 			{
-				return jsonModel(exchange,type);
+
+				return xmlModel(exchange,type);			
 			}
 			else
 			{
-				return xmlModel(exchange,type);
+				return jsonModel(exchange,type); 
 			}
 		}
 
 		public static  <T> java.util.Optional<T> model(final HttpServerExchange exchange, final Class<T> type )
 		{
-			if( ServerPredicates.JSON_PREDICATE.resolve(exchange) )
+			if( ServerPredicates.XML_PREDICATE.resolve(exchange) )
 			{
-				return jsonModel(exchange,type);
+
+				return xmlModel(exchange,type);			
 			}
 			else
 			{
-				return xmlModel(exchange,type);
+				return jsonModel(exchange,type); 
 			}
 		}
 
@@ -273,7 +275,7 @@ public static  <T> T jsonModel(final HttpServerExchange exchange, final TypeLite
 		}
 		catch( Exception e )
 		{
-			throw new IllegalArgumentException("Invalid JSON");
+			throw new IllegalArgumentException("Invalid JSON: " + new String(exchange.getAttachment(ServerRequest.BYTE_BUFFER_KEY).array()) );
 		}
 	}
 
@@ -285,7 +287,7 @@ public static  <T> T jsonModel(final HttpServerExchange exchange, final Class<T>
 		}
 		catch( Exception e )
 		{
-			throw new IllegalArgumentException("Invalid JSON");
+			throw new IllegalArgumentException("Invalid JSON: " + new String(exchange.getAttachment(ServerRequest.BYTE_BUFFER_KEY).array()) );
 
 		}
 	}
@@ -413,25 +415,26 @@ public static  Boolean booleanValue(final HttpServerExchange exchange, final Str
 
 	public static <T>  T model(final HttpServerExchange exchange, final TypeLiteral<T> type )   throws IllegalArgumentException
 	{
-		if( ServerPredicates.JSON_PREDICATE.resolve(exchange) )
+		if( ServerPredicates.XML_PREDICATE.resolve(exchange) )
 		{
-			return jsonModel(exchange,type);
+			return xmlModel(exchange,type);
 		}
 		else
 		{
-			return xmlModel(exchange,type);
+			return jsonModel(exchange,type);
 		}
 	}
 
 	public static <T> T  model(final HttpServerExchange exchange, final Class<T> type )   throws IllegalArgumentException
 	{
-		if( ServerPredicates.JSON_PREDICATE.resolve(exchange) )
+		if( ServerPredicates.XML_PREDICATE.resolve(exchange) )
 		{
-			return jsonModel(exchange,type);
+
+			return xmlModel(exchange,type);			
 		}
 		else
 		{
-			return xmlModel(exchange,type);
+			return jsonModel(exchange,type); 
 		}
 	}
 

diff --git a/src/main/java/io/sinistral/proteus/server/ServerRequest.java b/src/main/java/io/sinistral/proteus/server/ServerRequest.java
@@ -11,6 +11,8 @@
 import java.util.Map;
 import java.util.concurrent.Executor;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xnio.channels.StreamSourceChannel;
 
 import io.sinistral.proteus.server.predicates.ServerPredicates;
@@ -35,6 +37,8 @@ public class ServerRequest
 {    
     public static final AttachmentKey<ByteBuffer> BYTE_BUFFER_KEY = AttachmentKey.create(ByteBuffer.class);
 
+    private static Logger log = LoggerFactory.getLogger(ServerRequest.class.getCanonicalName());
+
 	protected static final String CHARSET = "UTF-8";
 	protected static final String TMP_DIR = System.getProperty("java.io.tmpdir");
 
@@ -69,11 +73,11 @@ public ServerRequest(HttpServerExchange exchange) throws IOException
 		if (this.contentType != null )
 		{
 			if ( ServerPredicates.URL_ENCODED_FORM_PREDICATE.resolve(exchange) )
-			{
+			{ 
  				this.parseEncodedForm();
 			}
 			else if ( ServerPredicates.MULTIPART_PREDICATE.resolve(exchange) )
-			{
+			{ 
 				this.parseMultipartForm();
 			}
 			else if ( ServerPredicates.STRING_BODY_PREDICATE.resolve(exchange) )
@@ -143,6 +147,7 @@ public SecurityContext getSecurityContext()
 
 	private void extractBytes() throws IOException
 	{  
+		 //log.debug("start extracting bytes!");
 
 			this.exchange.startBlocking();
 
@@ -165,6 +170,10 @@ private void extractBytes() throws IOException
 
 	                    	System.arraycopy(buf.array(), 0, buffer.array(), 0, pos);
 
+	                    	buffer.rewind();
+
+	                    	//log.debug("buffer " + new String(buffer.array()));
+
 	    	                exchange.putAttachment(BYTE_BUFFER_KEY, buffer);
 
 	    	                break;