Upgrade HttpClient to 5.2 and switch to path-first URLs (#42)

Author: labkey-adam

labkey-client-api/CHANGELOG.md

@@ -1,5 +1,10 @@
 # The LabKey Remote API Library for Java - Change Log
 
+## version 4.1.0-SNAPSHOT
+*Released*: TBD
+* Migrate internal HTTP handling to use Apache HttpClient 5.2
+* Generate and execute path-first URLs
+
 ## version 4.0.0
 *Released*: 26 October 2022
 * Migrate to a new JSON library: [JSON-java](https://github.com/stleary/JSON-java). The previous library,

labkey-client-api/gradle.properties

@@ -7,15 +7,15 @@ artifactory_contextUrl=https://labkey.jfrog.io/artifactory
 sourceCompatibility=17
 targetCompatibility=17
 
-gradlePluginsVersion=1.35.0
+gradlePluginsVersion=1.36.1
 
 commonsCodecVersion=1.15
 commonsLoggingVersion=1.2
 
 hamcrestVersion=1.3
 
-httpclient5Version=5.1.3
-httpcore5Version=5.1.4
+httpclient5Version=5.2
+httpcore5Version=5.2
 
 jsonObjectVersion=20220924
 

labkey-client-api/src/org/labkey/remoteapi/Command.java

@@ -476,12 +476,6 @@ private URI createURI(Connection connection, String folderPath) throws URISyntax
 
         StringBuilder path = new StringBuilder(uri.getPath() == null || "".equals(uri.getPath()) ? "/" : uri.getPath());
 
-        //add the controller name
-        String controller = getControllerName();
-        if (controller.charAt(0) != '/' && path.charAt(path.length() - 1) != '/')
-            path.append('/');
-        path.append(controller);
-
         //add the folderPath (if any)
         if (null != folderPath && folderPath.length() > 0)
         {
@@ -491,11 +485,25 @@ private URI createURI(Connection connection, String folderPath) throws URISyntax
             path.append(folderPathNormalized);
         }
 
+        if (path.charAt(path.length() - 1) != '/')
+            path.append('/');
+
+        //add the controller name
+        String controller = getControllerName();
+        //for now, strip leading /. TODO: For next major release, throw
+        if (controller.charAt(0) == '/')
+            controller = controller.substring(1);
+        //for now, strip trailing /. TODO: For next major release, throw
+        if (controller.charAt(controller.length() - 1) == '/')
+            controller = controller.substring(0, controller.length() - 1);
+        path.append(controller);
+
         //add the action name + ".api"
         String actionName = getActionName();
-        if (actionName.charAt(0) != '/' && path.charAt(path.length() - 1) != '/')
-            path.append('/');
-        path.append(actionName);
+        //for now, strip leading /. TODO: For next major release, throw
+        if (actionName.charAt(0) == '/')
+            actionName = actionName.substring(1);
+        path.append("-").append(actionName);
         if (!actionName.endsWith(".api"))
             path.append(".api");
 
@@ -573,5 +581,4 @@ public void setRequiredVersion(double requiredVersion)
     {
         _requiredVersion = requiredVersion;
     }
-
 }