Resolving 500 error issue from invalid list params to return 400

instead. RB=710953 G=si-dev A=xma
linkedin · Apr 26, 2016 · c054859 · c054859
1 parent 0ace10a
commit c054859
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+6.0.3
+------
+
 6.0.2
 ------
 (RB=710508)
@@ -9,6 +12,9 @@ Added cookies to isEquals/hashCode/toString in Request.java
 (RB=705680)
 Added addAcceptTypes and addAcceptType to RestliRequestOptionsBuilder
 
+(RB=710953)
+Resolving 500 error issue from invalid list params to return 400 instead.
+
 6.0.1
 ------
 Bump zookeeper library from 3.3.4 to 3.4.6

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=6.0.1
+version=6.0.2
 sonatypeUsername=please_set_in_home_dir_if_uploading_to_maven_central
 sonatypePassword=please_set_in_home_dir_if_uploading_to_maven_central
 

diff --git a/restli-server/src/main/java/com/linkedin/restli/internal/server/RestLiRouter.java b/restli-server/src/main/java/com/linkedin/restli/internal/server/RestLiRouter.java
@@ -605,9 +605,20 @@ else if (context.hasParameter(RestConstants.QUERY_BATCH_IDS_PARAM))
           {
             Key key = resource.getPrimaryKey();
             Object value;
-            // in v2, compound keys have already been converted and dealt with, so all we need to do here is convert simple values.
-            value = ArgumentUtils.convertSimpleValue(id, key.getDataSchema(), key.getType());
-            batchKeys.add(value);
+            try
+            {
+              // in v2, compound keys have already been converted and dealt with, so all we need to do here is convert simple values.
+              value = ArgumentUtils.convertSimpleValue(id, key.getDataSchema(), key.getType());
+              batchKeys.add(value);
+            }
+            catch (NumberFormatException e)
+            {
+              throw new RoutingException("NumberFormatException parsing batch key '" + id + "'", HttpStatus.S_400_BAD_REQUEST.getCode(), e);
+            }
+            catch (IllegalArgumentException e)
+            {
+              throw new RoutingException("IllegalArgumentException parsing batch key '" + id + "'", HttpStatus.S_400_BAD_REQUEST.getCode(), e);
+            }
           }
         }
         else

diff --git a/restli-server/src/test/java/com/linkedin/restli/server/test/TestRestLiRouting.java b/restli-server/src/test/java/com/linkedin/restli/server/test/TestRestLiRouting.java
@@ -2495,6 +2495,18 @@ public Object[][] invalidList()
                 "DELETE",
                 "CREATE"
             },
+            {
+                "/statuses?ids=List(NONE)",
+                AllProtocolVersions.RESTLI_PROTOCOL_2_0_0.getProtocolVersion(),
+                "DELETE",
+                "CREATE"
+            },
+            {
+                "/statuses?ids=List(1,2,3,NONE)",
+                AllProtocolVersions.RESTLI_PROTOCOL_2_0_0.getProtocolVersion(),
+                "DELETE",
+                "CREATE"
+            },
         };
   }