Merge pull request #168 from stuartwoodman/AUS-4325-Remove-Obselete-C…

…alls AUS-4325 Remove Obselete Calls
AuScope · Sep 9, 2024 · 73ebefe · 73ebefe
2 parents e58704b + dd03a74
commit 73ebefe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/coverage/jacoco.csv b/.github/coverage/jacoco.csv
@@ -31,6 +31,7 @@ AuScope-Portal-API,org.auscope.portal.server.web.controllers,NVCLController,1093
 AuScope-Portal-API,org.auscope.portal.server.web.controllers,EarthResourcesFilterController,385,0,8,0,108,0,15,0,11,0
 AuScope-Portal-API,org.auscope.portal.server.web.controllers,ReprojectionController,0,264,2,36,0,46,2,22,0,5
 AuScope-Portal-API,org.auscope.portal.server.web.controllers,VocabController.new Comparator() {...},0,16,0,0,0,2,0,2,0,2
+AuScope-Portal-API,org.auscope.portal.server.web.controllers,ReprojectionController,0,264,2,36,0,46,2,22,0,5
 AuScope-Portal-API,org.auscope.portal.server.web.controllers,GenericController,188,0,12,0,54,0,12,0,5,0
 AuScope-Portal-API,org.auscope.portal.server.web.controllers,VocabularyCacheController,48,0,0,0,12,0,3,0,3,0
 AuScope-Portal-API,org.auscope.portal.server.web.controllers,IRISController.new IterableNamespace() {...},0,12,0,0,0,3,0,1,0,1
@@ -96,6 +97,7 @@ AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineralTenementFilter,24
 AuScope-Portal-API,org.auscope.portal.mineraloccurrence,Mine,122,84,8,2,31,18,7,3,2,3
 AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineralOccurrence,10,141,1,5,4,37,1,7,0,5
 AuScope-Portal-API,org.auscope.portal.server.web.service.download,MineralOccurrenceDownloadService,19,0,2,0,7,0,3,0,2,0
+AuScope-Portal-API,org.auscope.portal.server.config,ExtraVocabularies,111,0,0,0,13,0,13,0,13,0
 AuScope-Portal-API,org.auscope.portal.server.config,LayerFactory.mandRec,16,0,0,0,3,0,1,0,1,0
 AuScope-Portal-API,org.auscope.portal.server.config,ExtraVocabularies,111,0,0,0,13,0,13,0,13,0
 AuScope-Portal-API,org.auscope.portal.server.config,AppContext.new Runnable() {...},18,0,2,0,3,0,3,0,2,0
@@ -104,6 +106,7 @@ AuScope-Portal-API,org.auscope.portal.server.config,LayerFactory,1670,0,149,0,39
 AuScope-Portal-API,org.auscope.portal.server.config,LayerFactory.wfsRec,16,0,0,0,3,0,1,0,1,0
 AuScope-Portal-API,org.auscope.portal.server.config,ProfilePortalTest,79,0,2,0,18,0,5,0,4,0
 AuScope-Portal-API,org.auscope.portal.server.config,ElasticsearchConfig,65,0,2,0,18,0,4,0,3,0
+AuScope-Portal-API,org.auscope.portal.server.config,ProfilePortalProduction,79,0,2,0,18,0,5,0,4,0
 AuScope-Portal-API,org.auscope.portal.server.config,LayerFactory.filterCtl,6,0,0,0,1,0,1,0,1,0
 AuScope-Portal-API,org.auscope.portal.server.config,ProfilePortalProduction,79,0,2,0,18,0,5,0,4,0
 AuScope-Portal-API,org.auscope.portal.server.config,AuscopeRegistries,18,0,0,0,6,0,4,0,4,0
@@ -146,6 +149,7 @@ AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,TrayThumbNai
 AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,GetDatasetCollectionResponse,12,21,0,0,6,8,3,4,3,4
 AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,AlgorithmVersion,11,15,0,0,6,6,3,3,3,3
 AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,GetLogCollectionResponse,12,21,0,0,6,8,3,4,3,4
+AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,ImageTrayDepthResponse,33,0,0,0,14,0,7,0,7,0
 AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,CSVDownloadResponse,5,0,0,0,2,0,1,0,1,0
 AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,ImageTrayDepthResponse,33,0,0,0,14,0,7,0,7,0
 AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,AlgorithmOutputClassification,15,21,0,0,8,8,4,4,4,4
@@ -158,8 +162,8 @@ AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,AAFAuthenticationT
 AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,AAFAuthenticationRedirect,7,0,0,0,2,0,2,0,2,0
 AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,JWTManagement,222,0,24,0,46,0,18,0,6,0
 AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,AAFAttributes,359,0,88,0,41,0,56,0,12,0
-AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,AAFJWT,17,0,0,0,3,0,2,0,2,0
 AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,AAFAuthentication,139,0,18,0,32,0,21,0,12,0
+AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,AAFJWT,17,0,0,0,3,0,2,0,2,0
 AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,AAFAuthenticationFilter,39,0,4,0,9,0,4,0,2,0
 AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,AAFAuthenticationProvider,48,0,0,0,14,0,7,0,7,0
 AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,AAFAuthenticationSuccessHandler,9,0,0,0,3,0,2,0,2,0

diff --git a/src/main/resources/layers.yaml b/src/main/resources/layers.yaml
@@ -281,7 +281,6 @@
         name: "W.A. Mineralogy"
         group: "Mineralogy - Geosample"
         description: "A collection of the results published from TIMA"
-        proxyUrl: "doTIMAGeoSample.do"
         proxyDownloadUrl: "doTIMAGeoSampleCSVDownload.do"
         proxyStyleUrl: "doGenericFilterStyle.do?styleType=POINT&color=0xFF0000&layerName=tima:geosample_and_mineralogy"
         order: "180"
@@ -298,7 +297,6 @@
         name: "W.A. Geochronology"
         group: "Geochronology"
         description: "Locations and dataset download URLs of samples that have been analysed by SHRIMP U-Pb mass spectrometer at Curtin University"
-        proxyUrl: "doSHRIMPGeoSample.do"
         proxyDownloadUrl: "doSHRIMPGeoSampleCSVDownload.do"
         proxyStyleUrl: "doGenericFilterStyle.do?styleType=POINT&color=0xFF0000&layerName=tima:view_shrimp_geochronology_result"
         order: "180"