Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/AuScope/AuScope-Portal-API
Browse files Browse the repository at this point in the history 
Fix conflicts when pull new changes
.
  • Loading branch information
@laughing0li
laughing0li committed Nov 5, 2024
2 parents 80d85cf + 9c6b27b commit 3065503
Show file tree
Hide file tree
Showing 23 changed files with 35 additions and 1,273 deletions.
2 changes: 1 addition & 1 deletion .github/badges/jacoco.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 24 additions & 27 deletions .github/coverage/jacoco.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,16 @@ AuScope-Portal-API,org.auscope.portal.server.web.controllers,UserController,136,
AuScope-Portal-API,org.auscope.portal.server.web.controllers,RemanentAnomaliesAutoSearchController,44,0,0,0,15,0,3,0,3,0
AuScope-Portal-API,org.auscope.portal.server.web.controllers,IRISController,138,269,4,6,28,53,6,7,3,5
AuScope-Portal-API,org.auscope.portal.server.web.controllers,GsmlpNameSpaceTable,90,0,4,0,25,0,6,0,4,0
AuScope-Portal-API,org.auscope.portal.server.web.controllers,MSCLController,333,0,32,0,72,0,20,0,4,0
AuScope-Portal-API,org.auscope.portal.server.web.controllers,MSCLController,303,0,32,0,66,0,19,0,3,0
AuScope-Portal-API,org.auscope.portal.server.web.controllers,TIMAController,179,0,10,0,38,0,9,0,4,0
AuScope-Portal-API,org.auscope.portal.server.web.controllers,SF0BoreholeController,635,0,34,0,129,0,23,0,6,0
AuScope-Portal-API,org.auscope.portal.server.web.controllers,VocabController,102,235,6,6,14,43,6,9,2,7
AuScope-Portal-API,org.auscope.portal.server.web.controllers,VocabController,10,235,2,6,2,43,2,9,0,7
AuScope-Portal-API,org.auscope.portal.server.web.controllers,PortalParamsController,114,0,10,0,29,0,10,0,5,0
AuScope-Portal-API,org.auscope.portal.server.web.controllers,CustomKMLController,138,0,4,0,27,0,5,0,3,0
AuScope-Portal-API,org.auscope.portal.server.web.controllers,PortalStateController,212,0,20,0,51,0,17,0,7,0
AuScope-Portal-API,org.auscope.portal.server.web.controllers,NVCLController,1093,381,76,6,222,83,58,11,19,9
AuScope-Portal-API,org.auscope.portal.server.web.controllers,NVCLController,792,378,56,6,164,82,43,11,14,9
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,GenericController,188,0,12,0,54,0,12,0,5,0
AuScope-Portal-API,org.auscope.portal.server.web.controllers,GenericController,143,0,10,0,41,0,10,0,4,0
AuScope-Portal-API,org.auscope.portal.server.web.controllers,IRISController.new IterableNamespace() {...},0,12,0,0,0,3,0,1,0,1
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,MSCLController.new Comparator() {...},16,0,0,0,2,0,2,0,2,0
Expand All @@ -55,19 +53,6 @@ AuScope-Portal-API,org.auscope.portal.server.web.controllers.sessonobject,String
AuScope-Portal-API,org.auscope.portal.server.web.controllers.sessonobject,StringArrayToCustomRegistry,9,0,0,0,2,0,2,0,2,0
AuScope-Portal-API,org.auscope.portal.server.bookmark,BookMarkDownload,86,0,0,0,38,0,24,0,24,0
AuScope-Portal-API,org.auscope.portal.server.bookmark,BookMark,96,0,8,0,33,0,17,0,13,0
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineralOccurrenceNamespaceContext,0,69,0,0,0,13,0,1,0,1
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,Commodity,54,118,4,0,13,30,3,4,1,4
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineralOccurrenceFilter,137,395,35,63,27,85,33,26,1,8
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MinOccurViewFilter,24,73,4,12,4,12,5,6,1,2
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineralOccurrenceFilter.MeasureTypes,0,33,0,0,0,2,0,1,0,1
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,CommodityFilter,40,0,2,0,9,0,4,0,3,0
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineralTenementCCFilter,36,0,8,0,8,0,6,0,2,0
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineFilter,43,29,6,4,8,7,5,3,1,2
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MiningActivityFilter,19,157,1,13,4,42,2,9,1,3
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,CommodityVocabMethodMaker,45,0,0,0,8,0,3,0,3,0
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineralTenementFilter,24,86,2,4,4,16,3,4,1,3
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,PortalUserService,69,0,4,0,19,0,9,0,7,0
AuScope-Portal-API,org.auscope.portal.server.web.service,PortalUserDetailsService,160,0,14,0,39,0,12,0,5,0
AuScope-Portal-API,org.auscope.portal.server.web.service,ErmlVocabService,30,101,4,10,9,29,4,6,1,2
Expand All @@ -76,17 +61,16 @@ AuScope-Portal-API,org.auscope.portal.server.web.service,LintResult,37,0,0,0,14,
AuScope-Portal-API,org.auscope.portal.server.web.service,RemanentAnomaliesAutoSearchService,27,0,2,0,9,0,4,0,3,0
AuScope-Portal-API,org.auscope.portal.server.web.service,MineralOccurrenceService,71,0,2,0,15,0,7,0,6,0
AuScope-Portal-API,org.auscope.portal.server.web.service,NVCL2_0_DataService,734,1032,68,66,138,195,53,35,11,10
AuScope-Portal-API,org.auscope.portal.server.web.service,BoreholeService,560,264,23,15,127,53,21,11,7,6
AuScope-Portal-API,org.auscope.portal.server.web.service,NVCLDataService,457,269,46,16,96,64,34,9,7,5
AuScope-Portal-API,org.auscope.portal.server.web.service,BoreholeService,560,264,23,15,127,53,21,11,7,6
AuScope-Portal-API,org.auscope.portal.server.web.service,RemanentAnomaliesService,38,0,2,0,9,0,4,0,3,0
AuScope-Portal-API,org.auscope.portal.server.web.service,NVCLDataService.DatasetCollection,6,0,0,0,1,0,1,0,1,0
AuScope-Portal-API,org.auscope.portal.server.web.service,LintResult.Location,15,0,0,0,6,0,3,0,3,0
AuScope-Portal-API,org.auscope.portal.server.web.service,LintResult.Severity,15,0,0,0,3,0,1,0,1,0
AuScope-Portal-API,org.auscope.portal.server.web.service,NVCLDataService.Dataset,6,0,0,0,1,0,1,0,1,0
AuScope-Portal-API,org.auscope.portal.server.web.service,SimpleFeatureProperty,24,39,0,0,12,14,6,7,6,7
AuScope-Portal-API,org.auscope.portal.server.web.service,SimpleFeatureProperty,63,0,0,0,26,0,13,0,13,0
AuScope-Portal-API,org.auscope.portal.server.web.service,PortalParamsService,22,0,0,0,6,0,4,0,4,0
AuScope-Portal-API,org.auscope.portal.server.web.service,SF0BoreholeService,43,53,0,2,8,10,4,3,4,2
AuScope-Portal-API,org.auscope.portal.server.web.service,SimpleWfsService,76,103,4,2,16,22,5,3,3,2
AuScope-Portal-API,org.auscope.portal.server.web.service,GeologicalProvincesService,29,0,2,0,9,0,4,0,3,0
AuScope-Portal-API,org.auscope.portal.server.web.service,PortalStateService,27,0,0,0,7,0,5,0,5,0
AuScope-Portal-API,org.auscope.portal.server.web.service,GenericService,28,0,2,0,9,0,4,0,3,0
Expand All @@ -95,17 +79,30 @@ AuScope-Portal-API,org.auscope.portal.server.web.service,BookMarkService,41,0,0,
AuScope-Portal-API,org.auscope.portal.server.web.service,GenericFilter2,50,0,0,0,8,0,3,0,3,0
AuScope-Portal-API,org.auscope.portal.server.web.service,AuScopeWMSService,180,0,18,0,34,0,11,0,2,0
AuScope-Portal-API,org.auscope.portal.server.web.service,BoreholeService.Mark,56,0,0,0,11,0,3,0,3,0
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineralOccurrenceNamespaceContext,0,69,0,0,0,13,0,1,0,1
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,Commodity,54,118,4,0,13,30,3,4,1,4
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineralOccurrenceFilter,137,395,35,63,27,85,33,26,1,8
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MinOccurViewFilter,24,73,4,12,4,12,5,6,1,2
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineralOccurrenceFilter.MeasureTypes,0,33,0,0,0,2,0,1,0,1
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,CommodityFilter,40,0,2,0,9,0,4,0,3,0
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineralTenementCCFilter,36,0,8,0,8,0,6,0,2,0
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineFilter,43,29,6,4,8,7,5,3,1,2
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MiningActivityFilter,19,157,1,13,4,42,2,9,1,3
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,CommodityVocabMethodMaker,45,0,0,0,8,0,3,0,3,0
AuScope-Portal-API,org.auscope.portal.mineraloccurrence,MineralTenementFilter,24,86,2,4,4,16,3,4,1,3
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,AppContext.new Runnable() {...},18,0,2,0,3,0,3,0,2,0
AuScope-Portal-API,org.auscope.portal.server.config,AppContext,601,0,2,0,109,0,48,0,47,0
AuScope-Portal-API,org.auscope.portal.server.config,LayerFactory,1722,0,152,0,411,0,127,0,40,0
AuScope-Portal-API,org.auscope.portal.server.config,AppContext,567,0,2,0,105,0,46,0,45,0
AuScope-Portal-API,org.auscope.portal.server.config,LayerFactory,1693,0,152,0,404,0,127,0,40,0
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
AuScope-Portal-API,org.auscope.portal.server.config,ConversionConfig,29,0,0,0,9,0,3,0,3,0
AuScope-Portal-API,org.auscope.portal.server.config,LayerFactory.selRec,16,0,0,0,3,0,1,0,1,0
Expand Down Expand Up @@ -146,13 +143,13 @@ 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
AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,AlgorithmOutputResponse,19,27,0,0,10,10,5,5,5,5
AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,TSGStatusResponse,5,0,0,0,2,0,1,0,1,0
AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,BinnedCSVResponse,3,14,0,0,1,6,1,4,1,4
AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,AnalyticalJobStatus,18,55,0,0,6,26,6,15,6,15
AuScope-Portal-API,org.auscope.portal.server.domain.nvcldataservice,BinnedCSVResponse,3,14,0,0,1,6,1,4,1,4
AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,UnixTimestampDeserializer,28,0,0,0,7,0,2,0,2,0
AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,AAFAuthenticationToken,29,0,2,0,12,0,6,0,5,0
AuScope-Portal-API,org.auscope.portal.server.web.security.aaf,AAFAuthenticationRedirect,7,0,0,0,2,0,2,0,2,0
Expand Down
2 changes: 1 addition & 1 deletion .github/coverage/percentage.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
25.4086
24.811
7 changes: 0 additions & 7 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>com.jhlabs</groupId>
<artifactId>javaproj</artifactId>
<version>1.0</version>
</dependency>

<!-- This is a dummy database used for development only -->
<dependency>
<groupId>org.hsqldb</groupId>
Expand Down Expand Up @@ -270,7 +264,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>false</fork>
<image>
<env>
<BP_JVM_VERSION>17.*</BP_JVM_VERSION>
Expand Down
20 changes: 0 additions & 20 deletions src/main/java/org/auscope/portal/server/config/AppContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.auscope.portal.core.services.VocabularyCacheService;
import org.auscope.portal.core.services.VocabularyFilterService;
import org.auscope.portal.core.services.WCSService;
import org.auscope.portal.core.services.WFSGml32Service;
import org.auscope.portal.core.services.WFSService;
import org.auscope.portal.core.services.WMSService;
import org.auscope.portal.core.services.csw.CSWServiceItem;
Expand All @@ -54,7 +53,6 @@
import org.auscope.portal.mscl.MSCLWFSService;
import org.auscope.portal.server.web.CatalogServicesHealthIndicator;
import org.auscope.portal.server.web.SearchHttpServiceCaller;
import org.auscope.portal.server.web.service.SimpleWfsService;
import org.auscope.portal.server.web.service.monitor.KnownLayerStatusMonitor;
import org.quartz.Trigger;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -139,19 +137,6 @@ public WFSService wfsService() {
return new WFSService(httpServiceCallerApp(), methodMaker(), new GmlToHtml());
}

@Bean
public WFSGml32Service wfsGml32Service() {
WFSGetFeatureMethodMaker methodMaker = new WFSGetFeatureMethodMaker();
// give it a ERML 2.0 namespace context
methodMaker.setNamespaces(new ErmlNamespaceContext("2.0"));
// HttpServiceCaller will ignore SSL errors if the test profile is active (locally signed SSL certs)
return new WFSGml32Service(new HttpServiceCaller(900000, activeProfile.contains("test")),
methodMaker,
// can instantiate with a different XSLT for GML 32 mapping?
new GmlToHtml()
);
}

/***
* Returns a factory to create jobs that update the OpenStack service status
* for known layer services
Expand Down Expand Up @@ -309,11 +294,6 @@ public WFSGetFeatureMethodMaker wfsMethodMaker() {
@Autowired
VocabularyServiceItem vocabularyGeologicTimescales;

@Bean
public SimpleWfsService simpleWfsService() {
return new SimpleWfsService(httpServiceCallerApp(), wfsMethodMaker());
}

@Autowired
VocabularyServiceItem vocabularyCommodities;

Expand Down
7 changes: 0 additions & 7 deletions src/main/java/org/auscope/portal/server/config/LayerFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ KnownLayer annotateLayer(String id) {
case "initialBBox": {
JSONArray bboxGeoJson = new JSONArray();

ArrayList x2 = (ArrayList) v1;
ArrayList x3 = (ArrayList) ((ArrayList) v1).get(0);
int len = x3.size();
if (len == 4) {
Expand Down Expand Up @@ -564,9 +563,6 @@ else if (cswKey.startsWith("serviceNames")) {
if (sk2.startsWith("options")) {
ArrayList x2 = (ArrayList) sv2;
x2.forEach((item) -> {
ArrayList x3 = (ArrayList) item;
String i1 = (String) x3.get(0);
String i2 = (String) x3.get(1);
filter.selectlist.options.add(item);
});
}
Expand All @@ -585,9 +581,6 @@ else if (cswKey.startsWith("serviceNames")) {
if (sk2.startsWith("options")) {
ArrayList x2 = (ArrayList) sv2;
x2.forEach((item) -> {
ArrayList x3 = (ArrayList) item;
String i1 = (String) x3.get(0);
String i2 = (String) x3.get(1);
filter.mandatorylist.options.add(item);
});
}
Expand Down
Loading

0 comments on commit 3065503

Please sign in to comment.