Merge pull request #28 from aodn/features/5262-fix-template

remove harvesters of no need https://www.notion.so/imos-world/Harvest…

geonetwork/src/main/java/au/org/aodn/geonetwork4/Setup.java

@@ -4,21 +4,14 @@
 import au.org.aodn.geonetwork_api.openapi.api.helper.*;
 import au.org.aodn.geonetwork_api.openapi.model.HarvestersApiLegacyResponse;
 
-import au.org.aodn.geonetwork_api.openapi.model.SystemInfo;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.http.ResponseEntity;
 
-import java.io.IOException;
-import java.io.InputStream;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.List;
 
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 /**
  * This class is used for post provision setup after the system starts

geonetwork/src/main/java/au/org/aodn/geonetwork4/controller/Api.java

@@ -5,6 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 
 import java.util.List;
@@ -16,6 +17,12 @@ public class Api {
     @Autowired
     protected Setup setup;
 
+    @DeleteMapping("/setup/harvesters")
+    public ResponseEntity<?> deleteAllHarvesters() {
+        setup.deleteAllHarvesters();
+        return ResponseEntity.ok().build();
+    }
+
     @GetMapping("/setup")
     public ResponseEntity<?> setup() {
         setup.getMe();
@@ -101,77 +108,31 @@ public ResponseEntity<?> setup() {
 
         setup.deleteAllHarvesters();
         setup.insertHarvester(
-            "/config/harvesters/portal_catalogue_imos.json",
-                "config/harvesters/portal_catalogue_aims.json"
-//                "/config/harvesters/catalog_aodn/aad.json",
+                // TODO: Noted discussion here
+                // https://www.notion.so/Harvester-Migration-2eec32ca6a654fe1bfac43c4feb37878?d=e764580fcba54a48a936341470c69efd&pvs=4#96a3dd8da31a476abb0f1b15429a5a12
+                // "/config/harvesters/catalogue_oeh_aodn_portal.json",
+                // "/config/harvesters/portal_catalogue_oeh_aodn_portal.json",
+
+                // TODO: Noted discussion here
+                // https://www.notion.so/Harvester-Migration-2eec32ca6a654fe1bfac43c4feb37878?d=04e1b1d653b742ac80588ea9635ff88c&pvs=4#96a3dd8da31a476abb0f1b15429a5a12
+                // "/config/harvesters/catalog_aodn/ga_marine1.json",
+                // "/config/harvesters/catalog_aodn/ga_marine2.json",
+
+                // TODO: Noted discussion here
+                // https://www.notion.so/Harvester-Migration-2eec32ca6a654fe1bfac43c4feb37878?d=55159a6a016f454cafe253c3ec8ce4a3&pvs=4#96a3dd8da31a476abb0f1b15429a5a12
+                // "/config/harvesters/portal_catalogue_uwa_aodn_portal.json"
+
 //                "/config/harvesters/catalog_aodn/aad_waf.json",
-////                "/config/harvesters/portal_catalogue_aad.json",
-//
 //                "/config/harvesters/catalog_aodn/aims.json",
-////                "/config/harvesters/portal_catalogue_aims.json",
-////                "/config/harvesters/portal_catalogue_aims_gbr_genomics_database_seawater_illumina_reads.json",
-////                "/config/harvesters/portal_catalogue_aims_microdebris_contamination.json",
-////                "/config/harvesters/portal_catalogue_aims_mmp.json",
-////                "/config/harvesters/portal_catalogue_aims_weather_station.json",
-//
 //                "/config/harvesters/catalog_aodn/csiro_oceans_atmosphere.json",
-////                "/config/harvesters/portal_catalogue_csiro_adcp.json",
-////                "/config/harvesters/portal_catalogue_csiro_catch_operations.json",
-////                "/config/harvesters/portal_catalogue_csiro_current_meter_mooring.json",
-////                "/config/harvesters/portal_catalogue_csiro_mnf_voyage_tracks.json",
-////                "/config/harvesters/portal_catalogue_csiro_o_and_a_ctd_data_overview.json",
-////                "/config/harvesters/portal_catalogue_csiro_o_and_a_hydrology_data_overview.json",
-////                "/config/harvesters/portal_catalogue_csiro_rv_franklin_xbt.json",
-////                "/config/harvesters/portal_catalogue_csiro_rv_investigator_data_overview.json",
-////                "/config/harvesters/portal_catalogue_csiro_rv_investigator_sst.json",
-////                "/config/harvesters/portal_catalogue_csiro_rv_southern_surveyor.json",
-////                "/config/harvesters/portal_catalogue_csiro_sediment_sampling.json",
-////                "/config/harvesters/portal_catalogue_csiro_wildlife_observations.json",
-////                "/config/harvesters/portal_catalogue_ga_marine_sediments_mars_database.json",
-////                "/config/harvesters/catalogue_csiro_southern_surveyor.json",
-//
-//                "/config/harvesters/catalog_aodn/ga_marine1.json",
-//                "/config/harvesters/catalog_aodn/ga_marine2.json",
-////                "/config/harvesters/catalogue_ga_mh370.json",
-////                "/config/harvesters/catalogue_ga_seabed_sediments.json",
-////                "/config/harvesters/portal_catalogue_ga_mh370_phase_1_150m_bathymetry.json",
-//
+//                "/config/harvesters/catalogue_csiro_southern_surveyor.json",
 //                "/config/harvesters/catalog_aodn/imos_geonetwork.json",
-////                "/config/harvesters/portal_catalogue_imas_aodn_portal.json",
-////                "/config/harvesters/catalogue_oeh_aodn_portal.json",
-////                "/config/harvesters/catalogue_imas_aodn_portal.json",
-////                "/config/harvesters/portal_catalogue_oeh_aodn_portal.json",
-////                "/config/harvesters/portal_catalogue_uwa_aodn_portal.json"
-//
-//                "/config/harvesters/catalog_aodn/imos_geonetwork.json",
-//                "/config/harvesters/catalogue_full_from_geo2_to_geo3.json",
-//                "/config/harvesters/portal_catalogue_imos.json",
-//                "/config/harvesters/catalogue_cdu_eretmochelys_imbricata.json",
-//                "/config/harvesters/catalogue_cdu_lepidochelys_olivacea.json",
-//                "/config/harvesters/catalogue_csiro_australian_weekly.json",
-//                "/config/harvesters/catalogue_csiro_wakmatha.json",
-//                "/config/harvesters/catalogue_csiro_world_monthly.json",
-//                "/config/harvesters/catalogue_noaa.json",
-//                "/config/harvesters/catalogue_csiro_the_australian_phytoplankton_database.json",
-//                "/config/harvesters/catalogue_csiro_ocean_acid_recon.json",
-//                "/config/harvesters/catalogue_dsto.json",
+//                "/config/harvesters/catalog_aodn/nci_marine.json",
+//                "/config/harvesters/catalog_aodn/nci_oceanography.json",
+//                "/config/harvesters/catalog_aodn/nci_physical_oceanography.json",
 //                "/config/harvesters/catalogue_full.json",
-//                "/config/harvesters/catalogue_imas_aqua_chlorophyll_concentration_monthly.json",
-//                "/config/harvesters/catalogue_imas_aqua_chlorophyll_concentration_weekly.json",
-//                "/config/harvesters/catalogue_imas_seaWIFS_chlorophyll_concentration_monthly.json",
-//                "/config/harvesters/catalogue_imas_seaWIFS_chlorophyll_concentration_weekly.json",
-//                "/config/harvesters/catalogue_mhl_sea_surface_temperature_data.json",
-//                "/config/harvesters/catalogue_mhl_waverider_buoys.json",
-//                "/config/harvesters/catalogue_nsw_oeh_bathy.json",
-//                "/config/harvesters/catalogue_ran.json",
-//                "/config/harvesters/catalogue_wamsi_ningaloo_reef.json",
-//                "/config/harvesters/catalogue_imos.json",
-//                "/config/harvesters/catalogue_imos_portal.json",
-//
-//                "/config/harvesters/catalogue_tpac_climate_futures.json"
-//
-////                "/config/harvesters/portal_catalogue_niwa.json",
-////                "/config/harvesters/portal_catalogue_systest.json"
+//                "/config/harvesters/portal_catalogue_niwa.json",
+//                "/config/harvesters/portal_catalogue_systest.json"
 //
 //// copy prod to systest
 ////                "/config/harvesters/catalogue_portal.json",