diff --git a/.github/badges/jacoco.svg b/.github/badges/jacoco.svg index 110b4eb73..a38985a2b 100644 --- a/.github/badges/jacoco.svg +++ b/.github/badges/jacoco.svg @@ -1 +1 @@ -coverage60.5% \ No newline at end of file +coverage58.5% \ No newline at end of file diff --git a/.github/coverage/jacoco.csv b/.github/coverage/jacoco.csv index 379dd820e..b19d101b3 100644 --- a/.github/coverage/jacoco.csv +++ b/.github/coverage/jacoco.csv @@ -10,7 +10,7 @@ Portal-Core,org.auscope.portal.core.services.methodmakers,OPeNDAPGetDataMethodMa Portal-Core,org.auscope.portal.core.services.methodmakers,WMSMethodMaker,260,898,32,20,51,136,31,11,6,10 Portal-Core,org.auscope.portal.core.services.methodmakers,VocabularyMethodMaker.View,0,27,0,0,0,5,0,1,0,1 Portal-Core,org.auscope.portal.core.services.methodmakers,WFSGetFeatureMethodMaker,284,451,18,44,51,88,26,29,11,12 -Portal-Core,org.auscope.portal.core.services.methodmakers,WCSMethodMaker,74,329,15,43,12,61,14,19,1,3 +Portal-Core,org.auscope.portal.core.services.methodmakers,WCSMethodMaker,74,257,14,36,12,48,13,15,1,2 Portal-Core,org.auscope.portal.core.services.methodmakers,OPeNDAPGetDataMethodMaker.OPeNDAPFormat,0,15,0,0,0,3,0,1,0,1 Portal-Core,org.auscope.portal.core.services.methodmakers,CSWMethodMaker,89,0,0,0,16,0,3,0,3,0 Portal-Core,org.auscope.portal.core.services.methodmakers,GoogleCloudMonitoringMethodMaker,0,100,0,4,0,23,0,4,0,2 @@ -31,27 +31,23 @@ Portal-Core,org.auscope.portal.core.services.responses.vocab,ConceptFactory,14,3 Portal-Core,org.auscope.portal.core.services.responses.vocab,Concept,11,140,3,11,4,43,3,25,1,20 Portal-Core,org.auscope.portal.core.services.responses.search,FacetedMultiSearchResponse,0,51,0,0,0,18,0,9,0,9 Portal-Core,org.auscope.portal.core.services.responses.search,FacetedSearchResponse,3,28,0,0,1,12,1,8,1,8 -Portal-Core,org.auscope.portal.core.services.responses.wfs,WFSCountResponse,0,9,0,0,0,4,0,2,0,2 Portal-Core,org.auscope.portal.core.services.responses.wfs,WFSTransformedResponse,6,29,0,0,2,10,2,4,2,4 -Portal-Core,org.auscope.portal.core.services.responses.wfs,WFSGetCapabilitiesResponse,6,44,0,0,2,18,2,8,2,8 Portal-Core,org.auscope.portal.core.services.responses.wfs,WFSResponse,0,15,0,0,0,6,0,3,0,3 Portal-Core,org.auscope.portal.core.services.responses.stackdriver,ServiceStatusResponse,0,15,0,0,0,6,0,3,0,3 -Portal-Core,org.auscope.portal.core.services.responses.wcs,TemporalDomainFactory,21,18,3,1,4,4,3,1,1,1 -Portal-Core,org.auscope.portal.core.services.responses.wcs,RangeSetImpl,3,115,0,6,1,21,1,8,1,5 +Portal-Core,org.auscope.portal.core.services.responses.wcs,TemporalDomainFactory,39,0,4,0,8,0,4,0,2,0 +Portal-Core,org.auscope.portal.core.services.responses.wcs,RangeSetImpl,118,0,6,0,22,0,9,0,6,0 Portal-Core,org.auscope.portal.core.services.responses.wcs,SimpleTimePeriod,51,0,0,0,12,0,4,0,4,0 -Portal-Core,org.auscope.portal.core.services.responses.wcs,GetCapabilitiesRecord_1_0_0,57,135,0,6,19,34,2,8,2,5 -Portal-Core,org.auscope.portal.core.services.responses.wcs,DescribeCoverageRecord,42,387,2,22,14,71,3,24,1,14 Portal-Core,org.auscope.portal.core.services.responses.wcs,Resolution,18,47,1,5,6,10,4,7,3,5 -Portal-Core,org.auscope.portal.core.services.responses.wcs,SpatialDomain,9,57,1,3,4,12,2,4,1,3 +Portal-Core,org.auscope.portal.core.services.responses.wcs,SpatialDomain,66,0,4,0,16,0,6,0,4,0 Portal-Core,org.auscope.portal.core.services.responses.wcs,Interval,64,0,6,0,16,0,8,0,5,0 -Portal-Core,org.auscope.portal.core.services.responses.wcs,ValueEnumTypeFactory,21,10,3,1,4,2,3,1,1,1 -Portal-Core,org.auscope.portal.core.services.responses.wcs,SingleValue,0,17,0,0,0,6,0,3,0,3 -Portal-Core,org.auscope.portal.core.services.responses.wcs,CoverageOfferingBrief,45,120,2,4,18,27,8,8,6,7 -Portal-Core,org.auscope.portal.core.services.responses.wcs,SimpleEnvelope,77,137,4,6,16,28,6,10,2,9 +Portal-Core,org.auscope.portal.core.services.responses.wcs,ValueEnumTypeFactory,31,0,4,0,6,0,4,0,2,0 +Portal-Core,org.auscope.portal.core.services.responses.wcs,SingleValue,17,0,0,0,6,0,3,0,3,0 +Portal-Core,org.auscope.portal.core.services.responses.wcs,CoverageOfferingBrief,165,0,6,0,45,0,16,0,13,0 +Portal-Core,org.auscope.portal.core.services.responses.wcs,SimpleEnvelope,214,0,10,0,44,0,16,0,11,0 Portal-Core,org.auscope.portal.core.services.responses.wcs,TimeConstraint,41,65,5,5,5,14,4,8,1,6 -Portal-Core,org.auscope.portal.core.services.responses.wcs,RectifiedGrid,89,244,0,8,17,63,1,21,1,17 -Portal-Core,org.auscope.portal.core.services.responses.wcs,SimpleTimePosition,0,45,0,0,0,13,0,3,0,3 -Portal-Core,org.auscope.portal.core.services.responses.wcs,AxisDescriptionImpl,4,79,1,3,1,16,1,6,0,5 +Portal-Core,org.auscope.portal.core.services.responses.wcs,RectifiedGrid,333,0,8,0,80,0,22,0,18,0 +Portal-Core,org.auscope.portal.core.services.responses.wcs,SimpleTimePosition,45,0,0,0,13,0,3,0,3,0 +Portal-Core,org.auscope.portal.core.services.responses.wcs,AxisDescriptionImpl,83,0,4,0,17,0,7,0,5,0 Portal-Core,org.auscope.portal.core.services.csw.custom,CustomRegistry,78,0,8,0,23,0,15,0,11,0 Portal-Core,org.auscope.portal.core.server.http,HttpServiceCaller,236,163,15,15,56,41,22,10,12,5 Portal-Core,org.auscope.portal.core.server.http,DistributedHTTPServiceCaller,14,172,1,25,4,42,2,19,1,7 @@ -71,21 +67,18 @@ Portal-Core,org.auscope.portal.core.uifilter.mandatory,UIHiddenParam,11,0,0,0,5, Portal-Core,org.auscope.portal.core.uifilter.mandatory,UITextBox,14,0,0,0,6,0,2,0,2,0 Portal-Core,org.auscope.portal.core.server.controllers,OPeNDAPController,311,0,24,0,66,0,16,0,4,0 Portal-Core,org.auscope.portal.core.server.controllers,CSWFilterController,186,750,44,66,38,140,40,27,2,10 -Portal-Core,org.auscope.portal.core.server.controllers,WFSController,434,223,12,6,84,54,11,9,4,7 -Portal-Core,org.auscope.portal.core.server.controllers,DownloadController,376,225,52,18,103,59,37,8,5,5 -Portal-Core,org.auscope.portal.core.server.controllers,WCSController,167,338,34,26,36,70,22,16,1,7 +Portal-Core,org.auscope.portal.core.server.controllers,WFSController,269,126,9,5,52,35,7,7,2,5 +Portal-Core,org.auscope.portal.core.server.controllers,DownloadController,273,225,36,18,69,59,27,8,3,5 +Portal-Core,org.auscope.portal.core.server.controllers,WCSController,125,323,34,26,24,66,21,15,0,6 Portal-Core,org.auscope.portal.core.server.controllers,KnownLayerController,18,0,0,0,5,0,3,0,3,0 -Portal-Core,org.auscope.portal.core.server.controllers,ServiceConfigurationController,24,0,2,0,9,0,3,0,2,0 Portal-Core,org.auscope.portal.core.server.controllers,CSWSearchController,442,329,58,35,91,70,47,11,4,4 Portal-Core,org.auscope.portal.core.server.controllers,BaseCSWController,43,63,7,3,8,13,5,4,1,3 Portal-Core,org.auscope.portal.core.server.controllers,CSWCacheController,53,72,0,2,10,16,1,4,1,3 Portal-Core,org.auscope.portal.core.server.controllers,ElasticsearchController,86,0,2,0,13,0,4,0,3,0 -Portal-Core,org.auscope.portal.core.server.controllers,NamespaceController,65,0,0,0,15,0,3,0,3,0 -Portal-Core,org.auscope.portal.core.server.controllers,CSWController,256,0,24,0,58,0,17,0,5,0 -Portal-Core,org.auscope.portal.core.server.controllers,WMSController,553,351,34,22,124,74,29,12,9,4 -Portal-Core,org.auscope.portal.core.server.controllers,BasePortalController,60,225,6,14,11,45,5,18,0,13 +Portal-Core,org.auscope.portal.core.server.controllers,CSWController,179,0,24,0,39,0,15,0,3,0 +Portal-Core,org.auscope.portal.core.server.controllers,WMSController,164,0,2,0,32,0,6,0,5,0 +Portal-Core,org.auscope.portal.core.server.controllers,BasePortalController,89,196,11,9,16,40,7,16,0,13 Portal-Core,org.auscope.portal.core.services.methodmakers.filter,FilterBoundingBox,215,436,16,34,40,82,23,23,8,13 -Portal-Core,org.auscope.portal.core.services.methodmakers.filter,SimplePropertyFilter,23,18,0,0,4,5,1,2,1,2 Portal-Core,org.auscope.portal.core.services.methodmakers.filter,AbstractFilter.MatchActionType,0,21,0,0,0,4,0,1,0,1 Portal-Core,org.auscope.portal.core.services.methodmakers.filter,AbstractFilter,154,751,22,56,22,127,28,49,9,28 Portal-Core,org.auscope.portal.core.services.methodmakers.filter,SimpleBBoxFilter,3,14,1,1,1,4,1,3,0,3 @@ -110,9 +103,9 @@ Portal-Core,org.auscope.portal.core.view.knownlayer,CSWTitleFilterRecordSelector Portal-Core,org.auscope.portal.core.view.knownlayer,WMSSelector,83,83,17,11,21,18,16,8,6,4 Portal-Core,org.auscope.portal.core.services.vocabs,VocabularyServiceItem,15,18,0,0,7,7,4,3,4,3 Portal-Core,org.auscope.portal.core.services.responses.sos,SOSResponse,15,0,0,0,6,0,3,0,3,0 -Portal-Core,org.auscope.portal.core.services.responses.wms,GetCapabilitiesRecord_1_3_0,109,378,11,20,32,95,13,25,2,20 +Portal-Core,org.auscope.portal.core.services.responses.wms,GetCapabilitiesRecord_1_3_0,114,373,11,20,34,93,15,23,4,18 Portal-Core,org.auscope.portal.core.services.responses.wms,GetCapabilitiesWMSLayer_1_3_0,125,211,22,16,24,47,17,12,3,7 -Portal-Core,org.auscope.portal.core.services.responses.wms,GetCapabilitiesRecord_1_1_1,118,331,11,16,35,85,14,21,3,18 +Portal-Core,org.auscope.portal.core.services.responses.wms,GetCapabilitiesRecord_1_1_1,123,326,11,16,37,83,16,19,5,16 Portal-Core,org.auscope.portal.core.services.responses.wms,GetCapabilitiesWMSLayer_1_1_1,44,275,10,18,9,59,9,16,2,9 Portal-Core,org.auscope.portal.core.uifilter.optional.xpath,UIPolygonBBox,17,0,0,0,7,0,2,0,2,0 Portal-Core,org.auscope.portal.core.uifilter.optional.xpath,UIDropDownRemote,27,0,0,0,11,0,4,0,4,0 @@ -129,7 +122,7 @@ Portal-Core,org.auscope.portal.core.services.responses.ows,OWSExceptionParser.ne Portal-Core,org.auscope.portal.core.services.responses.ows,OWSExceptionParser,10,84,1,3,3,22,2,5,1,4 Portal-Core,org.auscope.portal.core.services.responses.ows,OWSException,4,9,0,0,2,4,1,2,1,2 Portal-Core,org.auscope.portal.core.services.csw,GriddedCSWRecord,18,0,0,0,8,0,5,0,5,0 -Portal-Core,org.auscope.portal.core.services.csw,GriddedCSWRecordTransformer,115,0,2,0,26,0,5,0,4,0 +Portal-Core,org.auscope.portal.core.services.csw,GriddedCSWRecordTransformer,110,0,2,0,25,0,5,0,4,0 Portal-Core,org.auscope.portal.core.services.csw,GriddedCSWRecordTransformerFactory,18,0,0,0,4,0,4,0,4,0 Portal-Core,org.auscope.portal.core.services.csw,SearchFacet.Comparison,0,21,0,0,0,4,0,1,0,1 Portal-Core,org.auscope.portal.core.services.csw,URLToStringConverter,23,0,0,0,8,0,3,0,3,0 @@ -141,10 +134,10 @@ Portal-Core,org.auscope.portal.core.services.csw,CSWRecordsHostFilter,14,27,3,3, Portal-Core,org.auscope.portal.core.services.namespaces,WFSNamespaceContext,0,27,0,0,0,6,0,1,0,1 Portal-Core,org.auscope.portal.core.services.namespaces,VocabNamespaceContext,0,75,0,0,0,14,0,1,0,1 Portal-Core,org.auscope.portal.core.services.namespaces,CSWNamespaceContext,0,69,0,0,0,13,0,1,0,1 -Portal-Core,org.auscope.portal.core.services.namespaces,IterableNamespace,13,34,1,5,3,9,3,5,2,3 -Portal-Core,org.auscope.portal.core.services.namespaces,ServiceNamespaceContext,3,10,0,0,1,3,1,2,1,2 +Portal-Core,org.auscope.portal.core.services.namespaces,IterableNamespace,15,32,2,4,4,8,4,4,2,3 +Portal-Core,org.auscope.portal.core.services.namespaces,ServiceNamespaceContext,13,0,0,0,4,0,3,0,3,0 Portal-Core,org.auscope.portal.core.services.namespaces,OGCNamespaceContext,0,9,0,0,0,3,0,1,0,1 -Portal-Core,org.auscope.portal.core.services.namespaces,WCSNamespaceContext,0,27,0,0,0,6,0,1,0,1 +Portal-Core,org.auscope.portal.core.services.namespaces,WCSNamespaceContext,27,0,0,0,6,0,1,0,1,0 Portal-Core,org.auscope.portal.core.services.namespaces,ErmlNamespaceContext,30,21,2,0,7,5,2,1,1,1 Portal-Core,org.auscope.portal.core.services.namespaces,XsdNamespace,27,0,0,0,6,0,1,0,1,0 Portal-Core,org.auscope.portal.core.uifilter,Predicate,0,33,0,0,0,2,0,1,0,1 @@ -157,8 +150,8 @@ Portal-Core,org.auscope.portal.core.services.responses.csw,CSWRecordTransformerF Portal-Core,org.auscope.portal.core.services.responses.csw,CSWSuggestion,36,0,0,0,11,0,5,0,5,0 Portal-Core,org.auscope.portal.core.services.responses.csw,CSWOnlineResourceFactory,3,109,2,4,1,28,3,3,1,2 Portal-Core,org.auscope.portal.core.services.responses.csw,CSWTemporalExtent,26,0,0,0,11,0,6,0,6,0 -Portal-Core,org.auscope.portal.core.services.responses.csw,CSWGetRecordResponse,0,160,3,5,0,36,3,7,0,6 Portal-Core,org.auscope.portal.core.services.responses.csw,CSWGetCapabilities.CSWGetCapabilitiesNamespace,0,18,0,0,0,4,0,1,0,1 +Portal-Core,org.auscope.portal.core.services.responses.csw,CSWGetRecordResponse,0,160,3,5,0,36,3,7,0,6 Portal-Core,org.auscope.portal.core.services.responses.csw,CSWContact,3,83,0,0,1,28,1,19,1,19 Portal-Core,org.auscope.portal.core.services.responses.csw,AbstractCSWOnlineResource.OnlineResourceType,0,87,0,0,0,15,0,1,0,1 Portal-Core,org.auscope.portal.core.services.responses.csw,CSWRecordTransformer.Scope,0,15,0,0,0,2,0,1,0,1 @@ -189,19 +182,29 @@ Portal-Core,org.auscope.portal.core.server.http.download,ServiceDownloadManager, Portal-Core,org.auscope.portal.core.server.http.download,Progression,0,21,0,0,0,2,0,1,0,1 Portal-Core,org.auscope.portal.core.server.http.download,DownloadTracker,61,139,6,6,18,42,8,11,3,10 Portal-Core,org.auscope.portal.core.server.security.oauth2,PortalUser,40,0,0,0,11,0,7,0,7,0 -Portal-Core,org.auscope.portal.core.services,NamespaceService,69,131,6,10,18,32,10,6,5,3 +Portal-Core,org.auscope.portal.core.util,FileIOUtil,433,551,52,56,122,138,48,30,12,12 +Portal-Core,org.auscope.portal.core.util,MimeUtil,20,143,5,15,6,33,6,7,1,2 +Portal-Core,org.auscope.portal.core.util,DOMResponseUtil,19,41,0,0,5,11,1,1,1,1 +Portal-Core,org.auscope.portal.core.util,ResourceUtil,15,14,1,1,2,5,2,2,1,2 +Portal-Core,org.auscope.portal.core.util,SLDLoader,137,84,11,9,29,22,10,5,3,2 +Portal-Core,org.auscope.portal.core.util,DateUtil.TimeField,0,33,0,0,0,2,0,1,0,1 +Portal-Core,org.auscope.portal.core.util,DOMUtil,3,136,0,2,1,37,1,9,1,8 +Portal-Core,org.auscope.portal.core.util,HttpUtil,92,48,4,2,19,7,5,2,3,1 +Portal-Core,org.auscope.portal.core.util,TextUtil,63,45,12,2,11,10,11,2,5,1 +Portal-Core,org.auscope.portal.core.util,DateUtil,79,102,20,0,18,28,13,3,3,3 +Portal-Core,org.auscope.portal.core.util,GeoJsonPolygonUtils,296,0,42,0,69,0,29,0,8,0 +Portal-Core,org.auscope.portal.core.util,CSVUtil,20,158,4,14,4,32,4,10,0,5 Portal-Core,org.auscope.portal.core.services,LocalCSWFilterService.FilterRunnerState,0,15,0,0,0,3,0,1,0,1 Portal-Core,org.auscope.portal.core.services,SOSService,30,19,0,0,6,5,1,2,1,2 Portal-Core,org.auscope.portal.core.services,OpendapService,103,68,0,0,17,14,2,3,2,3 Portal-Core,org.auscope.portal.core.services,LocalCSWFilterService.FilterRunner,15,141,0,8,4,38,0,7,0,3 Portal-Core,org.auscope.portal.core.services,WMSService,273,195,25,11,60,36,22,6,5,5 -Portal-Core,org.auscope.portal.core.services,WFSGml32Service,22,0,0,0,4,0,2,0,2,0 -Portal-Core,org.auscope.portal.core.services,KnownLayerService,560,327,72,33,124,75,41,22,4,6 +Portal-Core,org.auscope.portal.core.services,KnownLayerService,532,327,68,33,119,75,39,22,4,6 Portal-Core,org.auscope.portal.core.services,CSWCacheService,394,0,32,0,89,0,35,0,19,0 Portal-Core,org.auscope.portal.core.services,GoogleCloudMonitoringCachedService,84,19,6,0,19,7,6,3,3,3 Portal-Core,org.auscope.portal.core.services,PortalServiceException,31,27,0,0,13,11,5,5,5,5 Portal-Core,org.auscope.portal.core.services,CSWService,104,98,5,7,23,24,5,5,0,4 -Portal-Core,org.auscope.portal.core.services,BaseWFSService,113,298,5,19,21,64,10,13,5,6 +Portal-Core,org.auscope.portal.core.services,BaseWFSService,113,78,0,8,21,16,5,8,5,4 Portal-Core,org.auscope.portal.core.services,LocalCSWFilterService,76,642,11,77,16,148,12,44,2,8 Portal-Core,org.auscope.portal.core.services,VocabularyService,51,225,7,11,16,65,5,14,1,9 Portal-Core,org.auscope.portal.core.services,ElasticsearchService,1029,37,111,0,218,1,72,1,16,1 @@ -213,22 +216,10 @@ Portal-Core,org.auscope.portal.core.services,SISSVoc2Service,0,151,2,4,0,35,2,4, Portal-Core,org.auscope.portal.core.services,VocabularyCacheService.VocabularyCacheUpdateThread,0,121,0,6,0,33,0,8,0,5 Portal-Core,org.auscope.portal.core.services,GoogleCloudMonitoringCachedService.CacheEntry,51,0,0,0,21,0,8,0,8,0 Portal-Core,org.auscope.portal.core.services,VocabularyFilterService,8,345,8,24,2,85,8,21,0,13 -Portal-Core,org.auscope.portal.core.services,WFSService,6,137,1,1,1,27,1,9,0,9 +Portal-Core,org.auscope.portal.core.services,WFSService,6,123,1,1,1,25,1,8,0,8 Portal-Core,org.auscope.portal.core.services,GeonetworkService,40,296,6,8,10,58,6,6,0,5 Portal-Core,org.auscope.portal.core.services,VocabularyCacheService,10,138,3,9,3,29,4,8,1,5 -Portal-Core,org.auscope.portal.core.services,WCSService,54,78,3,1,12,21,4,3,2,3 -Portal-Core,org.auscope.portal.core.util,FileIOUtil,433,551,52,56,122,138,48,30,12,12 -Portal-Core,org.auscope.portal.core.util,MimeUtil,20,143,5,15,6,33,6,7,1,2 -Portal-Core,org.auscope.portal.core.util,DOMResponseUtil,19,41,0,0,5,11,1,1,1,1 -Portal-Core,org.auscope.portal.core.util,ResourceUtil,15,14,1,1,2,5,2,2,1,2 -Portal-Core,org.auscope.portal.core.util,DateUtil.TimeField,0,33,0,0,0,2,0,1,0,1 -Portal-Core,org.auscope.portal.core.util,SLDLoader,137,84,11,9,29,22,10,5,3,2 -Portal-Core,org.auscope.portal.core.util,DOMUtil,3,136,0,2,1,37,1,9,1,8 -Portal-Core,org.auscope.portal.core.util,HttpUtil,92,48,4,2,19,7,5,2,3,1 -Portal-Core,org.auscope.portal.core.util,TextUtil,63,45,12,2,11,10,11,2,5,1 -Portal-Core,org.auscope.portal.core.util,DateUtil,79,102,20,0,18,28,13,3,3,3 -Portal-Core,org.auscope.portal.core.util,GeoJsonPolygonUtils,296,0,42,0,69,0,29,0,8,0 -Portal-Core,org.auscope.portal.core.util,CSVUtil,20,158,4,14,4,32,4,10,0,5 +Portal-Core,org.auscope.portal.core.services,WCSService,23,43,0,0,4,11,1,2,1,2 Portal-Core,org.auscope.portal.core.services.methodmakers.filter.csw,CSWGetDataRecordsFilter.Type,0,21,0,0,0,4,0,1,0,1 Portal-Core,org.auscope.portal.core.services.methodmakers.filter.csw,CSWGetDataRecordsFilter.KeywordMatchType,0,15,0,0,0,3,0,1,0,1 Portal-Core,org.auscope.portal.core.services.methodmakers.filter.csw,CSWGetDataRecordsFilter,386,436,41,41,77,103,62,34,31,24 diff --git a/.github/coverage/percentage.txt b/.github/coverage/percentage.txt index 9a78b975b..0b785c51f 100644 --- a/.github/coverage/percentage.txt +++ b/.github/coverage/percentage.txt @@ -1 +1 @@ -60.5234 +58.5755