Merge pull request #268 from pdowler/main

cadc-rest: capture multiple inline content objects with same name

Author: pdowler

.github/workflows/gradle.yml

@@ -35,9 +35,6 @@ jobs:
     - name: build and test cadc-vodml
       run: cd cadc-vodml && ../gradlew --info clean build javadoc checkstyleMain install
 
-    - name: build and test cadc-test-servlet
-      run: cd cadc-test-servlet && ../gradlew --info clean build javadoc
-      
     - name: build and test cadc-http-client
       run: cd cadc-http-client && ../gradlew --info clean build
 

cadc-log/build.gradle

@@ -9,11 +9,11 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 group = 'org.opencadc'
 
-version = '1.2.2'
+version = '1.2.3'
 
 description = 'OpenCADC Logging Init server library'
 def git_url = 'https://github.com/opencadc/core'

cadc-rest/build.gradle

@@ -11,11 +11,11 @@ repositories {
 
 apply from: '../opencadc.gradle'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 group = 'org.opencadc'
 
-version = '1.4.5'
+version = '1.4.6'
 
 description = 'OpenCADC REST server library'
 def git_url = 'https://github.com/opencadc/core'
@@ -25,7 +25,7 @@ dependencies {
     api 'commons-io:commons-io:[2.18.0,3.0)' // force this because of CVE-2024-47554
     implementation 'javax.servlet:javax.servlet-api:3.1.0'
     implementation 'org.opencadc:cadc-util:[1.12.4,2.0)'
-    implementation 'org.opencadc:cadc-registry:[1.7,)'
+    implementation 'org.opencadc:cadc-registry:[1.8.0,)'
 
-    testCompile 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13'
 }

cadc-rest/src/main/java/ca/nrc/cadc/rest/RestAction.java

@@ -81,7 +81,6 @@
 import ca.nrc.cadc.net.ResourceLockedException;
 import ca.nrc.cadc.net.ResourceNotFoundException;
 import ca.nrc.cadc.net.TransientException;
-import ca.nrc.cadc.reg.client.RegistryClient;
 import ca.nrc.cadc.util.StringUtil;
 import java.io.IOException;
 import java.io.OutputStream;

cadc-rest/src/main/java/ca/nrc/cadc/rest/SyncInput.java

@@ -120,6 +120,12 @@ public SyncInput(HttpServletRequest request, InlineContentHandler handler)
             }
         }
     }
+    
+    // for subclass stubs used in unit tests
+    protected SyncInput() {
+        this.request = null;
+        this.inlineContentHandler = null;
+    }
 
     /**
      * Get the real client IP address. The REST binding is split up as follows:
@@ -268,7 +274,8 @@ public Set<String> getContentNames() {
     }
 
     /**
-     * Get an inline content object.
+     * Get an inline content object. The returned object may be a List if multiple
+     * inline objects were captured.
      *
      * @param name name of inline object
      * @return an object for the specified content name; may be null
@@ -280,6 +287,7 @@ public Object getContent(String name) {
     /**
      * Process all input. For HEAD, GET, and DELETE: process parameters. 
      * For POST and PUT: process parameters, bare content stream, and multipart.
+     * TBD: DELETE with parameters is sketchy.
      * 
      * @throws IOException fail to read
      * @throws ResourceNotFoundException thrown by InlineContentHandler 
@@ -359,7 +367,19 @@ private void processStream(String name, String contentType, InputStream inputStr
         }
 
         InlineContentHandler.Content c = inlineContentHandler.accept(name, contentType, new CloseWrapper(inputStream));
-        content.put(c.name, c.value);
+        Object o = content.get(c.name);
+        if (o == null) {
+            content.put(c.name, c.value);
+        } else if (o instanceof List) {
+            List cur = (List) o;
+            cur.add(c);
+        } else {
+            // multipart: replace single item with list
+            List<Object> cur = new ArrayList<>();
+            cur.add(o);
+            cur.add(c.value);
+            content.put(c.name, cur);
+        }
     }
 
     // this is here to aid in debugging InputStream failures like the one where some library code

cadc-util/build.gradle

@@ -15,7 +15,7 @@ sourceCompatibility = 1.8
 
 group = 'org.opencadc'
 
-version = '1.12.4'
+version = '1.12.5'
 
 description = 'OpenCADC core utility library'
 def git_url = 'https://github.com/opencadc/core'

cadc-util/src/main/java/ca/nrc/cadc/net/HttpDelete.java

@@ -125,6 +125,7 @@ protected void doAction()
         conn.setUseCaches(false);
         conn.setDoInput(true);
         conn.setDoOutput(false);
+        conn.setInstanceFollowRedirects(followRedirects);
 
         setRequestHeaders(conn);
         setRequestAuthHeaders(conn);