Cherrypicking

.github/workflows/maven.yml

@@ -13,9 +13,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'temurin'

onebusaway-admin-webapp/pom.xml

@@ -81,6 +81,11 @@
             <artifactId>jersey-spring5</artifactId>
             <version>2.31</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-multipart</artifactId>
+            <version>2.31</version>
+        </dependency>
 
         <!-- this is for struts 2.5 on java 11 -->
         <dependency>

onebusaway-admin-webapp/src/main/java/org/onebusaway/admin/service/BundleDeployerService.java

@@ -27,10 +27,14 @@ public interface BundleDeployerService {
 
   public Response deploy(String environment);
 
+  public Response deployName(String name);
+
   public Response deployStatus(String id);
 
   public Response getBundleFile(String bundleId, String relativeFilename);
 
   public Response getBundleList();
 
+  public Response delete(String name);
+
 }

onebusaway-admin-webapp/src/main/java/org/onebusaway/admin/service/BundleUploadService.java

@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2024 Cambridge Systematics, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onebusaway.admin.service;
+
+import javax.ws.rs.core.Response;
+import java.io.InputStream;
+
+public interface BundleUploadService {
+  Response register(String agencyId, String bundleDir, String uploadType, String uploadUrl);
+  Response accept(String agencyId, String bundleDir, String uploadType, InputStream agencySourceFile);
+  Response query(String agencyId, String bundleDir);
+}

onebusaway-admin-webapp/src/main/java/org/onebusaway/admin/service/bundle/BundleDeployer.java

@@ -19,10 +19,12 @@
 
 import org.onebusaway.transit_data_federation.bundle.model.BundleStatus;
 
+import javax.ws.rs.core.Response;
 
 
 public interface BundleDeployer {
   void setup();
-  void deploy(BundleStatus status, String path);
+  void deploy(BundleStatus status, String path, String nameFilter);
   List<String> listStagedBundles(String path);
+  Response delete(String name);
 }

onebusaway-admin-webapp/src/main/java/org/onebusaway/admin/service/bundle/api/BundleResource.java

@@ -16,23 +16,25 @@
 package org.onebusaway.admin.service.bundle.api;
 
 import javax.servlet.ServletContext;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.onebusaway.admin.service.BundleArchiverService;
 import org.onebusaway.admin.service.BundleDeployerService;
 import org.onebusaway.admin.service.BundleStagerService;
 import org.onebusaway.admin.service.RemoteConnectionService;
 import org.onebusaway.util.services.configuration.ConfigurationServiceClient;
+import org.onebusaway.admin.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.ServletContextAware;
 
+import java.io.InputStream;
+
 @Path("/bundle")
 @Component
 public class BundleResource extends AuthenticatedResource implements ServletContextAware{
@@ -52,6 +54,8 @@ public class BundleResource extends AuthenticatedResource implements ServletCont
   @Autowired
   @Qualifier("tdmRemoteBundleDeployerImpl")
   private BundleDeployerService _tdmBundleDeployer;
+  @Autowired
+  private BundleUploadService _uploadService;
 
   private String tdmURL;
 
@@ -68,23 +72,12 @@ public Response stage(@PathParam("environment")
     String environment, @PathParam("bundleDir")
     String bundleDir, @PathParam("bundleName")
     String bundleName) {
-      // TODO this should follow the deployer pattern with an async response
-      // object
       if (!isAuthorized()) {
     	return Response.noContent().build();
 	  }
-
+
+      _log.info("stage request env={} dir={} bundle-{}", environment, bundleDir, bundleName);
 	  return _localBundleStager.stage(environment, bundleDir, bundleName);
-
-    /*String json = "{ERROR}";
-      try {
-        _bundleStager.stage(environment, bundleDir, bundleName);
-        _bundleStager.notifyOTP(bundleName);
-        json = "{SUCCESS}";
-      } catch (Exception any) {
-        _log.error("stage failed:", any);
-      }
-      return Response.ok(json).build();*/
   }
 
   @Path("/stage/status/{id}/list")
@@ -195,6 +188,34 @@ public Response deploy(@PathParam("environment")
     }
     return _localBundleDeployer.deploy(environment);
   }
+
+  @Path("/deploy/name/{name}")
+  @GET
+  public Response deployNamedBundle(@PathParam("name")
+                         String name) {
+    if (!isAuthorized()) {
+      return Response.noContent().build();
+    }
+
+    if(isTdm()){
+      return Response.noContent().build();
+    }
+    return _localBundleDeployer.deployName(name);
+  }
+
+  @Path("/deploy/delete/{name}")
+  @GET
+  public Response deployDelete(@PathParam("name")
+                               String name) {
+    if (!isAuthorized()) {
+      return Response.noContent().build();
+    }
+    if (isTdm()) {
+      // not supported
+      return Response.noContent().build();
+    }
+    return _localBundleDeployer.delete(name);
+  }
 
   @Path("/deploy/status/{id}/list")
   @GET
@@ -227,8 +248,32 @@ public Response getBundleFile(@PathParam("bundleId") String bundleId,
     }
     return _localBundleDeployer.getBundleFile(bundleId, relativeFilename);
   }
-
-
+
+  @Path("/upload/register/{agencyId}/{bundleDir}/{uploadType}")
+  @POST
+  public Response doUploadAsync(@PathParam("agencyId") String agencyId,
+                                @PathParam("bundleDir") String bundleDir,
+                                @PathParam("uploadType") String uploadType,
+                                @FormParam("url") String uploadUrl) {
+    return _uploadService.register(agencyId, bundleDir, uploadType, uploadUrl);
+  }
+
+  @Path("/upload/accept/{agencyId}/{bundleDir}/{uploadType}")
+  @Consumes(MediaType.MULTIPART_FORM_DATA)
+  @POST
+  public Response doAccept(@PathParam("agencyId") String agencyId,
+                           @PathParam("bundleDir") String bundleDir,
+                           @PathParam("uploadType") String uploadType,
+                           InputStream agencySourceFile) {
+    return _uploadService.accept(agencyId, bundleDir, uploadType, agencySourceFile);
+  }
+
+  @Path("/upload/status/{agencyId}/{bundleDir}")
+  @GET
+  public Response query(@PathParam("agencyId") String agencyId,
+                                @PathParam("bundleDir") String bundleDir) {
+    return _uploadService.query(agencyId, bundleDir);
+  }
   private boolean isTdm() {
     if (isTdm != null)
       return isTdm;

onebusaway-admin-webapp/src/main/java/org/onebusaway/admin/service/bundle/impl/DirectoryBundleDeployerImpl.java

@@ -21,7 +21,9 @@
 import java.util.List;
 
 import javax.annotation.PostConstruct;
+import javax.ws.rs.core.Response;
 
+import org.apache.commons.io.FileUtils;
 import org.onebusaway.transit_data_federation.bundle.model.BundleStatus;
 import org.onebusaway.admin.service.bundle.BundleDeployer;
 import org.onebusaway.admin.util.NYCFileUtils;
@@ -38,6 +40,7 @@ public class DirectoryBundleDeployerImpl implements BundleDeployer {
   private FileUtility _fileUtil;
   private NYCFileUtils _nycFileUtils;
   private String _deployBundleDirectory;
+  private boolean _cleanupDeployEnabled = false;
 
   public void setDeployBundleDirectory(String localBundlePath) {
     _deployBundleDirectory = localBundlePath;
@@ -58,7 +61,32 @@ public List<String> listStagedBundles(String path) {
     }
     return bundleFiles;
   }
-
+
+  @Override
+  /**
+   * Delete a single deployed bundle from the deploy directory
+   * @param name
+   * @return
+   */
+  public Response delete(String name) {
+    String path = this._deployBundleDirectory + File.separator;
+    String bundleDir = path + name;
+    File dirToDelete = new File(bundleDir);
+    if (!dirToDelete.exists() || !dirToDelete.isDirectory()) {
+      _log.error("bad request to delete deploy dir {}", bundleDir);
+      return Response.serverError().build();
+    }
+    try {
+      FileUtils.deleteDirectory(dirToDelete);
+      return Response.ok().build();
+    } catch (Exception e) {
+      _log.error("exception deleting name {}:", name, e, e);
+    }
+    return Response.serverError().build();
+
+  }
+
+
   private List<String> listFiles(String directory, int maxResults){
     File bundleDir = new File(directory);
     int fileCount = 1;
@@ -90,23 +118,30 @@ private List<String> listFiles(String directory, int maxResults){
    * Copy the bundle from Staging to the Admin Server's bundle serving location, and arrange
    * as necessary.
    */
-  private int deployBundleForServing(BundleStatus status, String path) throws Exception{
+  private int deployBundleForServing(BundleStatus status, String path, String nameFilter) throws Exception{
     _log.info("deployBundleForServing(" + path + ")");
 
     int bundlesDownloaded = 0;
     // list bundles at given path
     List<String> bundles = listFiles(path, MAX_RESULTS);
 
     if (bundles != null && !bundles.isEmpty()) {
-      clearBundleDeployDirectory();
+      if (_cleanupDeployEnabled) {
+        clearBundleDeployDirectory();
+      }
     } else {
       _log.error("no bundles found at path=" + path);
       return bundlesDownloaded;
     }
 
     for (String bundle : bundles) {
       String bundleFilename = _nycFileUtils.parseFileName(bundle, File.separator);
-      // retreive bundle and add it to the list of bundles
+      if (nameFilter != null && !nameFilter.equals(bundleFilename)) {
+        // filter specified, only deploy if it matches
+        continue;
+      }
+
+      // retrieve bundle and add it to the list of bundles
       try{
         _log.info("getting bundle = " + bundle);
         get(bundle, _deployBundleDirectory);
@@ -158,10 +193,10 @@ public String get(String bundlePath, String destinationDirectory) throws Excepti
   /**
    * Transfer bundles from staging directory to active bundles directory for serving 
    */
-  public void deploy(BundleStatus status, String path) {
+  public void deploy(BundleStatus status, String path, String nameFilter) {
     try {
       status.setStatus(BundleStatus.STATUS_STARTED);
-      deployBundleForServing(status, path);
+      deployBundleForServing(status, path, nameFilter);
       status.setStatus(BundleStatus.STATUS_COMPLETE);
     } catch (Exception e) {
       status.setStatus(BundleStatus.STATUS_ERROR);

onebusaway-admin-webapp/src/main/java/org/onebusaway/admin/service/bundle/impl/DirectoryBundleStagerImpl.java

@@ -41,6 +41,7 @@ public class DirectoryBundleStagerImpl implements BundleStager {
 
   private String _builtBundleDirectory;
   private String _stagingDirectory;
+  private boolean _cleanupStagingEnabled = true;
 
   private FileUtility _fileUtil;
 
@@ -80,13 +81,14 @@ private void stageBundle(BundleStatus status, String environment, String bundleD
     File srcFile = new File(srcDir, bundleName + ".tar.gz");
     File destDir = new File(this.getStagedBundleDirectory());
     _log.info("deleting " + destDir);
-    // cleanup from past run
-    try {
-      FileUtils.deleteDirectory(destDir);
-    } catch (Exception any) {
-      _log.error("deleteDir failed with :", any);
+    if (_cleanupStagingEnabled) {
+      // cleanup from past run
+      try {
+        FileUtils.deleteDirectory(destDir);
+      } catch (Exception any) {
+        _log.error("deleteDir failed with :", any);
+      }
     }
-
     try{
       _log.info("making directory" + destDir);
       destDir.mkdir();