Allow PostCommand subclasses exclude 'apiVersion' parameter

labkey-tchad · labkey-tchad · commit e0fbb6acbcfe · 2019-12-06T20:54:05.000Z
SVN r64823 |2019-12-06 20:54:05 +0000
diff --git a/java/src/org/labkey/remoteapi/PostCommand.java b/java/src/org/labkey/remoteapi/PostCommand.java
@@ -108,8 +108,8 @@ protected HttpUriRequest createRequest(URI uri)
 
         if (null != json)
         {
-            if (!json.containsKey("apiVersion"))
-                json.put("apiVersion", getRequiredVersion());
+            if (!json.containsKey(CommonParameters.apiVersion.name()) && getRequiredVersion() > 0)
+                json.put(CommonParameters.apiVersion.name(), getRequiredVersion());
 
             request.setEntity(new StringEntity(json.toString(), ContentType.APPLICATION_JSON));
         }

Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,8 @@ protected HttpUriRequest createRequest(URI uri)`
`108`	`108`
`109`	`109`	`if (null != json)`
`110`	`110`	`{`
`111`		`- if (!json.containsKey("apiVersion"))`
`112`		`- json.put("apiVersion", getRequiredVersion());`
	`111`	`+ if (!json.containsKey(CommonParameters.apiVersion.name()) && getRequiredVersion() > 0)`
	`112`	`+ json.put(CommonParameters.apiVersion.name(), getRequiredVersion());`
`113`	`113`
`114`	`114`	`request.setEntity(new StringEntity(json.toString(), ContentType.APPLICATION_JSON));`
`115`	`115`	`}`