diff --git a/pom.xml b/pom.xml
index 27ac6d1cc..26109b62e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
org.gbif.registry
registry-parent
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
GBIF Registry Parent
GBIF Registry project
@@ -84,7 +84,7 @@
2.2.8.RELEASE
- 1.10.0
+ 1.11.0
0.59
1.3
1.25
diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml
index 14889c602..b626ed670 100644
--- a/registry-cli/pom.xml
+++ b/registry-cli/pom.xml
@@ -4,7 +4,7 @@
org.gbif.registry
registry-parent
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
registry-cli
diff --git a/registry-cli/src/main/java/org/gbif/registry/cli/datasetindex/SpringContextBuilder.java b/registry-cli/src/main/java/org/gbif/registry/cli/datasetindex/SpringContextBuilder.java
index b811a9829..aee96f171 100644
--- a/registry-cli/src/main/java/org/gbif/registry/cli/datasetindex/SpringContextBuilder.java
+++ b/registry-cli/src/main/java/org/gbif/registry/cli/datasetindex/SpringContextBuilder.java
@@ -13,13 +13,6 @@
*/
package org.gbif.registry.cli.datasetindex;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.deser.std.DateDeserializers;
-
-import com.fasterxml.jackson.databind.module.SimpleModule;
-
import org.gbif.api.service.registry.DatasetService;
import org.gbif.api.service.registry.InstallationService;
import org.gbif.api.service.registry.NetworkService;
@@ -42,6 +35,9 @@
import org.gbif.ws.client.ClientBuilder;
import org.gbif.ws.json.JacksonJsonObjectMapperProvider;
+import java.io.IOException;
+import java.util.Date;
+
import org.springframework.boot.actuate.autoconfigure.elasticsearch.ElasticSearchRestHealthContributorAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
@@ -57,12 +53,14 @@
import org.springframework.context.annotation.Primary;
import org.springframework.core.env.MapPropertySource;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.deser.std.DateDeserializers;
+import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.common.collect.ImmutableMap;
import com.zaxxer.hikari.HikariDataSource;
-import java.io.IOException;
-import java.util.Date;
-
public class SpringContextBuilder {
private static EsClient.EsClientConfiguration toEsClientConfiguration(
diff --git a/registry-cli/src/main/java/org/gbif/registry/cli/doisynchronizer/DoiSynchronizer.java b/registry-cli/src/main/java/org/gbif/registry/cli/doisynchronizer/DoiSynchronizer.java
index 233ea383e..ddfd71c84 100644
--- a/registry-cli/src/main/java/org/gbif/registry/cli/doisynchronizer/DoiSynchronizer.java
+++ b/registry-cli/src/main/java/org/gbif/registry/cli/doisynchronizer/DoiSynchronizer.java
@@ -30,6 +30,7 @@
import org.gbif.registry.persistence.mapper.DoiMapper;
import org.gbif.registry.persistence.mapper.OccurrenceDownloadMapper;
import org.gbif.registry.persistence.mapper.UserMapper;
+import org.gbif.registry.persistence.mapper.params.DatasetListParams;
import java.io.File;
import java.io.IOException;
@@ -40,9 +41,6 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
-
-import org.gbif.registry.persistence.mapper.params.DatasetListParams;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
diff --git a/registry-cli/src/main/java/org/gbif/registry/cli/doisynchronizer/diagnostic/DoiDiagnostician.java b/registry-cli/src/main/java/org/gbif/registry/cli/doisynchronizer/diagnostic/DoiDiagnostician.java
index 49fcce47f..1088dfd71 100644
--- a/registry-cli/src/main/java/org/gbif/registry/cli/doisynchronizer/diagnostic/DoiDiagnostician.java
+++ b/registry-cli/src/main/java/org/gbif/registry/cli/doisynchronizer/diagnostic/DoiDiagnostician.java
@@ -26,11 +26,10 @@
import org.gbif.registry.persistence.mapper.DatasetMapper;
import org.gbif.registry.persistence.mapper.DoiMapper;
import org.gbif.registry.persistence.mapper.OccurrenceDownloadMapper;
+import org.gbif.registry.persistence.mapper.params.DatasetListParams;
import java.util.stream.Collectors;
-import org.gbif.registry.persistence.mapper.params.DatasetListParams;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml
index 5bdcf9659..6612a5247 100644
--- a/registry-directory/pom.xml
+++ b/registry-directory/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml
index cf0b5575f..f57c0931d 100644
--- a/registry-doi/pom.xml
+++ b/registry-doi/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml
index 622096027..c4c83663e 100644
--- a/registry-domain/pom.xml
+++ b/registry-domain/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-domain/src/main/java/org/gbif/registry/domain/ws/LegacyDataset.java b/registry-domain/src/main/java/org/gbif/registry/domain/ws/LegacyDataset.java
index f9a810fa2..72fbce5d9 100644
--- a/registry-domain/src/main/java/org/gbif/registry/domain/ws/LegacyDataset.java
+++ b/registry-domain/src/main/java/org/gbif/registry/domain/ws/LegacyDataset.java
@@ -20,7 +20,9 @@
import org.gbif.api.model.registry.Contact;
import org.gbif.api.model.registry.Dataset;
import org.gbif.api.model.registry.Endpoint;
+import org.gbif.api.util.VocabularyUtils;
import org.gbif.api.vocabulary.ContactType;
+import org.gbif.api.vocabulary.DatasetSubtype;
import org.gbif.api.vocabulary.DatasetType;
import org.gbif.api.vocabulary.EndpointType;
import org.gbif.api.vocabulary.Language;
@@ -73,6 +75,7 @@ public class LegacyDataset extends Dataset implements LegacyEntity {
private String serviceTypes;
private String serviceUrls;
private DOI datasetDoi;
+ private String rawSubtype;
// created from combination of fields after injection
private Contact primaryContact;
@@ -141,6 +144,17 @@ public void setOrganizationKey(String organizationKey) {
}
}
+ @XmlTransient
+ @Nullable
+ public String getRawSubtype() {
+ return rawSubtype;
+ }
+
+ @ParamName(LegacyResourceConstants.SUBTYPE_PARAM)
+ public void setRawSubtype(String rawSubtype) {
+ this.rawSubtype = rawSubtype;
+ }
+
/**
* Get the publishing organization key. This is a required field in Registry2, and is required by
* the web services. This method is not used but it is needed otherwise this Object can't be
@@ -634,6 +648,7 @@ public void prepare() {
addArchiveEndpoint();
addDataPackageEndpoint();
setType(resolveType());
+ setSubtype(resolveSubtype());
}
/**
@@ -811,6 +826,18 @@ public DatasetType resolveType() {
return DatasetType.METADATA;
}
+ /**
+ * Return the DatasetSubtype from the string.
+ */
+ public DatasetSubtype resolveSubtype() {
+ try {
+ return VocabularyUtils.lookupEnum(rawSubtype, DatasetSubtype.class);
+ } catch (Exception e) {
+ LOG.error("Failed to resolve subtype", e);
+ return null;
+ }
+ }
+
/**
* Return a new GBIF API Dataset instance, derived from the LegacyDataset. Needed because of:
* http://dev.gbif.org/issues/browse/REG-459
@@ -830,6 +857,7 @@ public Dataset toApiDataset() {
dataset.setLogoUrl(getLogoUrl());
dataset.setHomepage(getHomepage());
dataset.setType(getType());
+ dataset.setSubtype(getSubtype());
dataset.setDoi(datasetDoi);
return dataset;
}
@@ -853,7 +881,8 @@ public boolean equals(Object o) {
&& Objects.equal(primaryContact, that.primaryContact)
&& Objects.equal(emlEndpoint, that.emlEndpoint)
&& Objects.equal(archiveEndpoint, that.archiveEndpoint)
- && Objects.equal(dataPackageEndpoint, that.dataPackageEndpoint);
+ && Objects.equal(dataPackageEndpoint, that.dataPackageEndpoint)
+ && Objects.equal(rawSubtype, that.rawSubtype);
}
@Generated
@@ -873,7 +902,8 @@ public int hashCode() {
primaryContact,
emlEndpoint,
archiveEndpoint,
- dataPackageEndpoint);
+ dataPackageEndpoint,
+ rawSubtype);
}
@Generated
@@ -893,6 +923,7 @@ public String toString() {
.add("emlEndpoint", emlEndpoint)
.add("archiveEndpoint", archiveEndpoint)
.add("dataPackageEndpoint", dataPackageEndpoint)
+ .add("rawSubtype", rawSubtype)
.toString();
}
}
diff --git a/registry-domain/src/main/java/org/gbif/registry/domain/ws/util/LegacyResourceConstants.java b/registry-domain/src/main/java/org/gbif/registry/domain/ws/util/LegacyResourceConstants.java
index e2c8ee21c..940875608 100644
--- a/registry-domain/src/main/java/org/gbif/registry/domain/ws/util/LegacyResourceConstants.java
+++ b/registry-domain/src/main/java/org/gbif/registry/domain/ws/util/LegacyResourceConstants.java
@@ -49,6 +49,7 @@ public class LegacyResourceConstants {
public static final String TYPE_DESCRIPTION_PARAM = "typeDescription";
public static final String ACCESS_POINT_URL_PARAM = "accessPointURL";
public static final String DOI_PARAM = "doi";
+ public static final String SUBTYPE_PARAM = "subtype";
// request / response value names
public static final String ADMINISTRATIVE_CONTACT_TYPE = "administrative";
diff --git a/registry-events/pom.xml b/registry-events/pom.xml
index f31a12805..10bf42780 100644
--- a/registry-events/pom.xml
+++ b/registry-events/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml
index bd171f9e4..30fa6ff1d 100644
--- a/registry-examples/pom.xml
+++ b/registry-examples/pom.xml
@@ -3,12 +3,12 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
registry-examples
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
jar
diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml
index 6dbd5dbbb..eeb48feae 100644
--- a/registry-identity/pom.xml
+++ b/registry-identity/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml
index bbe90e68b..ce792fea4 100644
--- a/registry-integration-tests/pom.xml
+++ b/registry-integration-tests/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetIT.java
index 45bb51334..0a85c1685 100644
--- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetIT.java
+++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DatasetIT.java
@@ -51,7 +51,6 @@
import org.gbif.registry.ws.client.InstallationClient;
import org.gbif.registry.ws.client.NodeClient;
import org.gbif.registry.ws.client.OrganizationClient;
-import org.gbif.registry.ws.provider.networkEntitiesList.BaseRequestSearchParamsHandlerMethodArgumentResolver;
import org.gbif.registry.ws.resources.DatasetResource;
import org.gbif.utils.file.FileUtils;
import org.gbif.ws.NotFoundException;
diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/InstallationIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/InstallationIT.java
index fba3854a7..5b965f563 100644
--- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/InstallationIT.java
+++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/InstallationIT.java
@@ -17,16 +17,12 @@
import org.gbif.api.model.registry.Identifier;
import org.gbif.api.model.registry.Installation;
import org.gbif.api.model.registry.MachineTag;
-import org.gbif.api.model.registry.Node;
import org.gbif.api.model.registry.Organization;
-import org.gbif.api.model.registry.search.DatasetRequestSearchParams;
import org.gbif.api.model.registry.search.InstallationRequestSearchParams;
-import org.gbif.api.model.registry.search.OrganizationRequestSearchParams;
import org.gbif.api.service.registry.InstallationService;
import org.gbif.api.service.registry.NodeService;
import org.gbif.api.service.registry.OrganizationService;
import org.gbif.api.util.Range;
-import org.gbif.api.vocabulary.Country;
import org.gbif.api.vocabulary.IdentifierType;
import org.gbif.api.vocabulary.InstallationType;
import org.gbif.registry.search.test.EsManageServer;
diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkIT.java
index 21aaf7fbf..66eece969 100644
--- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkIT.java
+++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkIT.java
@@ -20,13 +20,10 @@
import org.gbif.api.model.registry.Installation;
import org.gbif.api.model.registry.MachineTag;
import org.gbif.api.model.registry.Network;
-import org.gbif.api.model.registry.Node;
import org.gbif.api.model.registry.Organization;
import org.gbif.api.model.registry.search.NetworkRequestSearchParams;
-import org.gbif.api.model.registry.search.NodeRequestSearchParams;
import org.gbif.api.service.registry.DatasetService;
import org.gbif.api.service.registry.NetworkService;
-import org.gbif.api.service.registry.NodeService;
import org.gbif.api.util.Range;
import org.gbif.api.vocabulary.IdentifierType;
import org.gbif.registry.identity.service.IdentityService;
diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/BaseBatchServiceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/BaseBatchServiceIT.java
index d41f1baa0..448f9d747 100644
--- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/BaseBatchServiceIT.java
+++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/BaseBatchServiceIT.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.ws.it.collections.service.batch;
import org.gbif.api.model.collections.Address;
diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/CollectionBatchHandlerIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/CollectionBatchHandlerIT.java
index 7b5d86270..1805c6ca0 100644
--- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/CollectionBatchHandlerIT.java
+++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/CollectionBatchHandlerIT.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.ws.it.collections.service.batch;
import org.gbif.api.model.collections.Collection;
diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/CollectionBatchServiceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/CollectionBatchServiceIT.java
index e8be3e3ff..037516610 100644
--- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/CollectionBatchServiceIT.java
+++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/CollectionBatchServiceIT.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.ws.it.collections.service.batch;
import org.gbif.api.model.collections.Collection;
diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/InstitutionBatchHandlerIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/InstitutionBatchHandlerIT.java
index 60ff449d1..9e0d20384 100644
--- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/InstitutionBatchHandlerIT.java
+++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/InstitutionBatchHandlerIT.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.ws.it.collections.service.batch;
import org.gbif.api.model.collections.CollectionEntityType;
diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/InstitutionBatchServiceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/InstitutionBatchServiceIT.java
index 67242da87..29851c547 100644
--- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/InstitutionBatchServiceIT.java
+++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/InstitutionBatchServiceIT.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.ws.it.collections.service.batch;
import org.gbif.api.model.collections.CollectionEntityType;
diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/ZipUtils.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/ZipUtils.java
index 2b1d6fdb6..13ba7fc68 100644
--- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/ZipUtils.java
+++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/service/batch/ZipUtils.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.ws.it.collections.service.batch;
import java.io.File;
diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml
index 5f6ce20ba..bc40f5866 100644
--- a/registry-mail/pom.xml
+++ b/registry-mail/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml
index 669437520..32dfc6a94 100644
--- a/registry-messaging/pom.xml
+++ b/registry-messaging/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml
index 088d395be..6187de8bc 100644
--- a/registry-oaipmh/pom.xml
+++ b/registry-oaipmh/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-oaipmh/src/main/java/org/gbif/registry/oaipmh/OaipmhSetRepository.java b/registry-oaipmh/src/main/java/org/gbif/registry/oaipmh/OaipmhSetRepository.java
index cd5856c18..a051d7db4 100644
--- a/registry-oaipmh/src/main/java/org/gbif/registry/oaipmh/OaipmhSetRepository.java
+++ b/registry-oaipmh/src/main/java/org/gbif/registry/oaipmh/OaipmhSetRepository.java
@@ -13,11 +13,11 @@
*/
package org.gbif.registry.oaipmh;
-import org.gbif.api.model.registry.Dataset;
import org.gbif.api.model.registry.Installation;
import org.gbif.api.vocabulary.Country;
import org.gbif.api.vocabulary.DatasetType;
import org.gbif.registry.persistence.mapper.DatasetMapper;
+import org.gbif.registry.persistence.mapper.params.DatasetListParams;
import java.util.List;
import java.util.Optional;
@@ -30,8 +30,6 @@
import com.google.common.collect.Lists;
-import org.gbif.registry.persistence.mapper.params.DatasetListParams;
-
/**
* Implementation of a XOAI SetRepository for country, installation, dataset_type sets.
*
diff --git a/registry-oaipmh/src/test/java/org/gbif/registry/oaipmh/MockDatasetMapper.java b/registry-oaipmh/src/test/java/org/gbif/registry/oaipmh/MockDatasetMapper.java
index a39e1d6b9..c77fc6264 100644
--- a/registry-oaipmh/src/test/java/org/gbif/registry/oaipmh/MockDatasetMapper.java
+++ b/registry-oaipmh/src/test/java/org/gbif/registry/oaipmh/MockDatasetMapper.java
@@ -26,7 +26,6 @@
import org.gbif.api.vocabulary.ContactType;
import org.gbif.api.vocabulary.Country;
import org.gbif.registry.persistence.mapper.DatasetMapper;
-import org.gbif.registry.persistence.mapper.params.BaseListParams;
import org.gbif.registry.persistence.mapper.params.DatasetListParams;
import java.util.List;
diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml
index ad6f79942..2c9acb96f 100644
--- a/registry-persistence/pom.xml
+++ b/registry-persistence/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/BaseNetworkEntityMapper.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/BaseNetworkEntityMapper.java
index 29e103421..01ac833de 100644
--- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/BaseNetworkEntityMapper.java
+++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/BaseNetworkEntityMapper.java
@@ -14,11 +14,8 @@
package org.gbif.registry.persistence.mapper;
import org.gbif.api.model.registry.NetworkEntity;
-import org.gbif.registry.persistence.mapper.params.BaseListParams;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
/** The BaseNetworkEntityMapper defines a common interface for all our Network entities. */
public interface BaseNetworkEntityMapper
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/MachineTaggableMapper.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/MachineTaggableMapper.java
index 4bd860fd0..29a18b401 100644
--- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/MachineTaggableMapper.java
+++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/MachineTaggableMapper.java
@@ -13,7 +13,6 @@
*/
package org.gbif.registry.persistence.mapper;
-import org.gbif.api.model.common.paging.Pageable;
import org.gbif.api.model.registry.MachineTag;
import org.gbif.api.model.registry.MachineTaggable;
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/NodeMapper.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/NodeMapper.java
index e4de5d0a1..cba99b031 100644
--- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/NodeMapper.java
+++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/NodeMapper.java
@@ -17,7 +17,6 @@
import org.gbif.api.model.registry.search.KeyTitleResult;
import org.gbif.api.vocabulary.ContactType;
import org.gbif.api.vocabulary.Country;
-import org.gbif.registry.persistence.mapper.params.InstallationListParams;
import org.gbif.registry.persistence.mapper.params.NodeListParams;
import java.util.List;
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/BaseMapper.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/BaseMapper.java
index 7345db9e2..9f537486b 100644
--- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/BaseMapper.java
+++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/BaseMapper.java
@@ -25,6 +25,7 @@
import org.gbif.registry.persistence.mapper.IdentifiableMapper;
import org.gbif.registry.persistence.mapper.MachineTaggableMapper;
import org.gbif.registry.persistence.mapper.TaggableMapper;
+import org.gbif.registry.persistence.mapper.params.Count;
import java.util.Collection;
import java.util.List;
@@ -32,8 +33,6 @@
import org.apache.ibatis.annotations.Param;
-import org.gbif.registry.persistence.mapper.params.Count;
-
/** Generic mapper for CRUD operations. Initially implemented for collections. */
public interface BaseMapper
extends TaggableMapper,
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/InstitutionGeoJsonDto.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/InstitutionGeoJsonDto.java
index 8231e4ff0..aa4f906db 100644
--- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/InstitutionGeoJsonDto.java
+++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/collections/dto/InstitutionGeoJsonDto.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.persistence.mapper.collections.dto;
import java.math.BigDecimal;
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/BaseListParams.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/BaseListParams.java
index 5c5797d81..6840991ef 100644
--- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/BaseListParams.java
+++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/BaseListParams.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.persistence.mapper.params;
import org.gbif.api.model.common.paging.Pageable;
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/Count.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/Count.java
index b760b5caa..66b55cf98 100644
--- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/Count.java
+++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/Count.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.persistence.mapper.params;
import java.util.UUID;
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/DatasetListParams.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/DatasetListParams.java
index 0afbe14e2..c68028e39 100644
--- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/DatasetListParams.java
+++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/DatasetListParams.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.persistence.mapper.params;
import org.gbif.api.vocabulary.Country;
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/InstallationListParams.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/InstallationListParams.java
index 19a762337..79b0a63d7 100644
--- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/InstallationListParams.java
+++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/InstallationListParams.java
@@ -1,13 +1,26 @@
+/*
+ * 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.gbif.registry.persistence.mapper.params;
-import lombok.Getter;
-import lombok.experimental.SuperBuilder;
-
import org.gbif.api.vocabulary.InstallationType;
+import java.util.UUID;
+
import javax.annotation.Nullable;
-import java.util.UUID;
+import lombok.Getter;
+import lombok.experimental.SuperBuilder;
@SuperBuilder
@Getter
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/NetworkListParams.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/NetworkListParams.java
index 31d1cf9f7..717da0ba2 100644
--- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/NetworkListParams.java
+++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/NetworkListParams.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.persistence.mapper.params;
import java.util.UUID;
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/NodeListParams.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/NodeListParams.java
index 1989d1422..7f478ce45 100644
--- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/NodeListParams.java
+++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/NodeListParams.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.persistence.mapper.params;
import lombok.Getter;
diff --git a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/OrganizationListParams.java b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/OrganizationListParams.java
index ee91ca411..b27236728 100644
--- a/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/OrganizationListParams.java
+++ b/registry-persistence/src/main/java/org/gbif/registry/persistence/mapper/params/OrganizationListParams.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.persistence.mapper.params;
import org.gbif.api.vocabulary.Country;
diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml
index 818f74838..acd6084b9 100644
--- a/registry-pipelines/pom.xml
+++ b/registry-pipelines/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/BasicAuthInterceptor.java b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/BasicAuthInterceptor.java
index 8eea5ea1e..31ba35354 100644
--- a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/BasicAuthInterceptor.java
+++ b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/BasicAuthInterceptor.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.pipelines.issues;
import java.io.IOException;
diff --git a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/GithubApiService.java b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/GithubApiService.java
index 0cf650088..fb346015c 100644
--- a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/GithubApiService.java
+++ b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/GithubApiService.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.pipelines.issues;
import java.util.List;
diff --git a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/GithubClientConfig.java b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/GithubClientConfig.java
index 4788e35c0..2b8e9f239 100644
--- a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/GithubClientConfig.java
+++ b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/GithubClientConfig.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.pipelines.issues;
import javax.validation.constraints.NotEmpty;
diff --git a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/IssueCreator.java b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/IssueCreator.java
index fdd3a29ac..100b24251 100644
--- a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/IssueCreator.java
+++ b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/IssueCreator.java
@@ -1,9 +1,18 @@
+/*
+ * 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.gbif.registry.pipelines.issues;
-import org.apache.commons.io.IOUtils;
-
-import org.gbif.api.model.pipelines.PipelineStep;
-import org.gbif.api.model.pipelines.StepType;
import org.gbif.api.model.registry.Dataset;
import org.gbif.api.model.registry.Installation;
import org.gbif.api.model.registry.Organization;
@@ -17,7 +26,6 @@
import java.net.URI;
import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Collections;
@@ -26,6 +34,7 @@
import java.util.function.UnaryOperator;
import java.util.stream.Collectors;
+import org.apache.commons.io.IOUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
diff --git a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/SyncCall.java b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/SyncCall.java
index a26cdb6a0..2ba25db34 100644
--- a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/SyncCall.java
+++ b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/issues/SyncCall.java
@@ -1,6 +1,21 @@
+/*
+ * 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.gbif.registry.pipelines.issues;
+import java.io.IOException;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -8,8 +23,6 @@
import retrofit2.HttpException;
import retrofit2.Response;
-import java.io.IOException;
-
/**
* Utility class to perform synchronous call on Retrofit services.
*/
diff --git a/registry-search/pom.xml b/registry-search/pom.xml
index b8e00165c..e949ad671 100644
--- a/registry-search/pom.xml
+++ b/registry-search/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-security/pom.xml b/registry-security/pom.xml
index d71fd6338..105c2c2b8 100644
--- a/registry-security/pom.xml
+++ b/registry-security/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-service/pom.xml b/registry-service/pom.xml
index 1d4034d5e..696f6d396 100644
--- a/registry-service/pom.xml
+++ b/registry-service/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-service/src/main/java/org/gbif/registry/service/RegistryDatasetServiceImpl.java b/registry-service/src/main/java/org/gbif/registry/service/RegistryDatasetServiceImpl.java
index 72cc9c25f..061e65330 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/RegistryDatasetServiceImpl.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/RegistryDatasetServiceImpl.java
@@ -32,6 +32,7 @@
import org.gbif.registry.persistence.mapper.MetadataMapper;
import org.gbif.registry.persistence.mapper.OrganizationMapper;
import org.gbif.registry.persistence.mapper.handler.ByteArrayWrapper;
+import org.gbif.registry.persistence.mapper.params.DatasetListParams;
import java.io.IOException;
import java.util.ArrayList;
@@ -46,8 +47,6 @@
import javax.annotation.Nullable;
-import org.gbif.registry.persistence.mapper.params.DatasetListParams;
-
import org.owasp.html.HtmlPolicyBuilder;
import org.owasp.html.PolicyFactory;
import org.slf4j.Logger;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/RegistryDerivedDatasetServiceImpl.java b/registry-service/src/main/java/org/gbif/registry/service/RegistryDerivedDatasetServiceImpl.java
index cc065dfb5..af5c40ccd 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/RegistryDerivedDatasetServiceImpl.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/RegistryDerivedDatasetServiceImpl.java
@@ -27,6 +27,7 @@
import org.gbif.registry.domain.ws.DerivedDatasetUsage;
import org.gbif.registry.persistence.mapper.DatasetMapper;
import org.gbif.registry.persistence.mapper.DerivedDatasetMapper;
+import org.gbif.registry.persistence.mapper.params.DatasetListParams;
import java.net.URI;
import java.text.MessageFormat;
@@ -38,9 +39,6 @@
import java.util.UUID;
import org.apache.commons.collections.CollectionUtils;
-
-import org.gbif.registry.persistence.mapper.params.DatasetListParams;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@@ -49,8 +47,6 @@
import com.google.common.collect.Iterators;
-import javax.xml.crypto.Data;
-
import static org.gbif.registry.service.util.ServiceUtils.pagingResponse;
@Service
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/BaseBatchHandler.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/BaseBatchHandler.java
index de26fad8b..b2844c462 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/BaseBatchHandler.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/BaseBatchHandler.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch;
import org.gbif.api.model.collections.Batch;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/BaseBatchService.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/BaseBatchService.java
index 10afc06ca..0795fc7e9 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/BaseBatchService.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/BaseBatchService.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch;
import org.gbif.api.model.collections.Batch;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/BatchHandler.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/BatchHandler.java
index 2c7a776b1..531400451 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/BatchHandler.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/BatchHandler.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch;
import org.gbif.api.model.collections.Batch;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/CollectionBatchHandler.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/CollectionBatchHandler.java
index 87b1869af..d27289c16 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/CollectionBatchHandler.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/CollectionBatchHandler.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch;
import org.gbif.api.model.collections.Collection;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/CollectionBatchService.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/CollectionBatchService.java
index 8c545a6b6..461855057 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/CollectionBatchService.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/CollectionBatchService.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch;
import org.gbif.api.model.collections.CollectionEntityType;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/FileFields.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/FileFields.java
index c1b7a4ab6..cf35538cd 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/FileFields.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/FileFields.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch;
import org.gbif.api.model.collections.CollectionEntityType;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/FileParser.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/FileParser.java
index 8c925bc1e..ef934f966 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/FileParser.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/FileParser.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch;
import org.gbif.api.model.collections.Collection;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/FileParsingUtils.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/FileParsingUtils.java
index b1f3e209b..4a70aac65 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/FileParsingUtils.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/FileParsingUtils.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch;
import org.gbif.api.model.collections.Address;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/InstitutionBatchHandler.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/InstitutionBatchHandler.java
index 227eda273..4292ec57b 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/InstitutionBatchHandler.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/InstitutionBatchHandler.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch;
import org.gbif.api.model.collections.CollectionEntityType;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/InstitutionBatchService.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/InstitutionBatchService.java
index bf6bf2373..2a15078b6 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/InstitutionBatchService.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/InstitutionBatchService.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch;
import org.gbif.api.model.collections.CollectionEntityType;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/ContactsParserResult.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/ContactsParserResult.java
index 69f882274..e6e3fd988 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/ContactsParserResult.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/ContactsParserResult.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch.model;
import org.gbif.api.model.collections.Contact;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/EntitiesParserResult.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/EntitiesParserResult.java
index 0ed059ceb..d5e2e02ff 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/EntitiesParserResult.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/EntitiesParserResult.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch.model;
import org.gbif.api.model.collections.CollectionEntity;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/ParsedData.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/ParsedData.java
index ac0565cbb..e01fd0f1c 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/ParsedData.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/ParsedData.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.batch.model;
import java.util.List;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/ParserResult.java b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/ParserResult.java
index 5864fafce..5ab781bb8 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/ParserResult.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/batch/model/ParserResult.java
@@ -1,6 +1,18 @@
+/*
+ * 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.gbif.registry.service.collections.batch.model;
-import org.apache.commons.math3.analysis.function.Exp;
import org.gbif.api.model.common.export.ExportFormat;
diff --git a/registry-service/src/main/java/org/gbif/registry/service/collections/lookup/matchers/BaseMatcher.java b/registry-service/src/main/java/org/gbif/registry/service/collections/lookup/matchers/BaseMatcher.java
index bc10e16f4..978ec7519 100644
--- a/registry-service/src/main/java/org/gbif/registry/service/collections/lookup/matchers/BaseMatcher.java
+++ b/registry-service/src/main/java/org/gbif/registry/service/collections/lookup/matchers/BaseMatcher.java
@@ -13,8 +13,6 @@
*/
package org.gbif.registry.service.collections.lookup.matchers;
-import com.google.common.annotations.VisibleForTesting;
-
import org.gbif.api.model.collections.lookup.EntityMatched;
import org.gbif.api.model.collections.lookup.Match;
import org.gbif.api.vocabulary.Country;
@@ -34,6 +32,7 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
import static org.gbif.api.model.collections.lookup.Match.Reason.ALTERNATIVE_CODE_MATCH;
diff --git a/registry-service/src/test/java/org/gbif/registry/service/collections/lookup/matchers/MatchersTest.java b/registry-service/src/test/java/org/gbif/registry/service/collections/lookup/matchers/MatchersTest.java
index be0654248..9177645a5 100644
--- a/registry-service/src/test/java/org/gbif/registry/service/collections/lookup/matchers/MatchersTest.java
+++ b/registry-service/src/test/java/org/gbif/registry/service/collections/lookup/matchers/MatchersTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.service.collections.lookup.matchers;
import java.util.UUID;
diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml
index bef31eb79..432849a04 100644
--- a/registry-surety/pom.xml
+++ b/registry-surety/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml
index f77736474..6d0b4a6c4 100644
--- a/registry-ws-client/pom.xml
+++ b/registry-ws-client/pom.xml
@@ -3,7 +3,7 @@
registry-parent
org.gbif.registry
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
4.0.0
diff --git a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/BaseDownloadClient.java b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/BaseDownloadClient.java
index d7d8ceb52..61c0893c2 100644
--- a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/BaseDownloadClient.java
+++ b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/BaseDownloadClient.java
@@ -124,14 +124,10 @@ PagingResponse listByEraseAfter(
@Override
void update(@RequestBody Download download);
- @RequestMapping(
- method = RequestMethod.GET,
- value = "{key}/datasets",
- produces = MediaType.APPLICATION_JSON_VALUE)
- @ResponseBody
@Override
- PagingResponse listDatasetUsages(
- @PathVariable("key") String key, @SpringQueryMap Pageable page);
+ default PagingResponse listDatasetUsages(@PathVariable("key") String key, @SpringQueryMap Pageable page) {
+ return listDatasetUsages(key, null, null, null, page);
+ }
@RequestMapping(
method = RequestMethod.GET,
diff --git a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/NetworkClient.java b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/NetworkClient.java
index 499ec6961..f554bfbfa 100644
--- a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/NetworkClient.java
+++ b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/NetworkClient.java
@@ -16,14 +16,10 @@
import org.gbif.api.model.common.paging.Pageable;
import org.gbif.api.model.common.paging.PagingResponse;
import org.gbif.api.model.registry.Dataset;
-import org.gbif.api.model.registry.Installation;
import org.gbif.api.model.registry.Network;
-import org.gbif.api.model.registry.Node;
import org.gbif.api.model.registry.Organization;
-import org.gbif.api.model.registry.search.InstallationRequestSearchParams;
import org.gbif.api.model.registry.search.KeyTitleResult;
import org.gbif.api.model.registry.search.NetworkRequestSearchParams;
-import org.gbif.api.model.registry.search.NodeRequestSearchParams;
import org.gbif.api.service.registry.NetworkService;
import java.util.List;
diff --git a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/NodeClient.java b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/NodeClient.java
index 07dc449aa..bf3b2161e 100644
--- a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/NodeClient.java
+++ b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/NodeClient.java
@@ -17,13 +17,10 @@
import org.gbif.api.model.common.paging.PagingResponse;
import org.gbif.api.model.registry.Dataset;
import org.gbif.api.model.registry.Installation;
-import org.gbif.api.model.registry.Network;
import org.gbif.api.model.registry.Node;
import org.gbif.api.model.registry.Organization;
import org.gbif.api.model.registry.search.KeyTitleResult;
-import org.gbif.api.model.registry.search.NetworkRequestSearchParams;
import org.gbif.api.model.registry.search.NodeRequestSearchParams;
-import org.gbif.api.model.registry.search.OrganizationRequestSearchParams;
import org.gbif.api.service.registry.NodeService;
import org.gbif.api.vocabulary.Country;
diff --git a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CollectionClient.java b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CollectionClient.java
index 36e90c018..b6dc297c7 100644
--- a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CollectionClient.java
+++ b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CollectionClient.java
@@ -18,7 +18,6 @@
import org.gbif.api.model.collections.request.CollectionSearchRequest;
import org.gbif.api.model.collections.suggestions.CollectionChangeSuggestion;
import org.gbif.api.model.collections.view.CollectionView;
-import org.gbif.api.model.common.paging.Pageable;
import org.gbif.api.model.common.paging.PagingResponse;
import org.gbif.api.model.registry.search.collections.KeyCodeNameResult;
diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml
index 5eba31dbe..cccfe18ab 100644
--- a/registry-ws/pom.xml
+++ b/registry-ws/pom.xml
@@ -4,7 +4,7 @@
org.gbif.registry
registry-parent
- 3.94.17-SNAPSHOT
+ 3.95.0-SNAPSHOT
registry-ws
GBIF Registry Webservices
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/config/AsyncConfig.java b/registry-ws/src/main/java/org/gbif/registry/ws/config/AsyncConfig.java
index d64e224d8..75858302e 100644
--- a/registry-ws/src/main/java/org/gbif/registry/ws/config/AsyncConfig.java
+++ b/registry-ws/src/main/java/org/gbif/registry/ws/config/AsyncConfig.java
@@ -1,3 +1,16 @@
+/*
+ * 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.gbif.registry.ws.config;
import org.springframework.context.annotation.Configuration;
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/config/WebMvcConfig.java b/registry-ws/src/main/java/org/gbif/registry/ws/config/WebMvcConfig.java
index 5fc6a3ef7..c110ee77b 100644
--- a/registry-ws/src/main/java/org/gbif/registry/ws/config/WebMvcConfig.java
+++ b/registry-ws/src/main/java/org/gbif/registry/ws/config/WebMvcConfig.java
@@ -28,13 +28,13 @@
import org.gbif.registry.security.precheck.AuthPreCheckInterceptor;
import org.gbif.registry.ws.converter.UuidTextMessageConverter;
import org.gbif.registry.ws.provider.CollectionSearchRequestHandlerMethodArgumentResolver;
-import org.gbif.registry.ws.provider.networkEntitiesList.DatasetRequestSearchParamsHandlerMethodArgumentResolver;
import org.gbif.registry.ws.provider.InstitutionSearchRequestHandlerMethodArgumentResolver;
+import org.gbif.registry.ws.provider.PartialDateHandlerMethodArgumentResolver;
+import org.gbif.registry.ws.provider.networkEntitiesList.DatasetRequestSearchParamsHandlerMethodArgumentResolver;
import org.gbif.registry.ws.provider.networkEntitiesList.InstallationRequestSearchParamsHandlerMethodArgumentResolver;
import org.gbif.registry.ws.provider.networkEntitiesList.NetworkRequestSearchParamsHandlerMethodArgumentResolver;
import org.gbif.registry.ws.provider.networkEntitiesList.NodeRequestSearchParamsHandlerMethodArgumentResolver;
import org.gbif.registry.ws.provider.networkEntitiesList.OrganizationRequestSearchParamsHandlerMethodArgumentResolver;
-import org.gbif.registry.ws.provider.PartialDateHandlerMethodArgumentResolver;
import org.gbif.ws.json.JacksonJsonObjectMapperProvider;
import org.gbif.ws.server.processor.ParamNameProcessor;
import org.gbif.ws.server.provider.CountryHandlerMethodArgumentResolver;
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/provider/networkEntitiesList/InstallationRequestSearchParamsHandlerMethodArgumentResolver.java b/registry-ws/src/main/java/org/gbif/registry/ws/provider/networkEntitiesList/InstallationRequestSearchParamsHandlerMethodArgumentResolver.java
index 312f5b592..6b6149248 100644
--- a/registry-ws/src/main/java/org/gbif/registry/ws/provider/networkEntitiesList/InstallationRequestSearchParamsHandlerMethodArgumentResolver.java
+++ b/registry-ws/src/main/java/org/gbif/registry/ws/provider/networkEntitiesList/InstallationRequestSearchParamsHandlerMethodArgumentResolver.java
@@ -13,26 +13,19 @@
*/
package org.gbif.registry.ws.provider.networkEntitiesList;
-import com.google.common.base.Strings;
-
-import org.gbif.api.model.registry.search.DatasetRequestSearchParams;
import org.gbif.api.model.registry.search.InstallationRequestSearchParams;
-import org.gbif.api.model.registry.search.OrganizationRequestSearchParams;
import org.gbif.api.util.VocabularyUtils;
-import org.gbif.api.vocabulary.Country;
-
-import org.gbif.api.vocabulary.DatasetType;
-
import org.gbif.api.vocabulary.InstallationType;
+import java.util.UUID;
+
import org.springframework.core.MethodParameter;
import org.springframework.web.bind.support.WebDataBinderFactory;
import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer;
-import java.util.Optional;
-import java.util.UUID;
+import com.google.common.base.Strings;
@SuppressWarnings("NullableProblems")
public class InstallationRequestSearchParamsHandlerMethodArgumentResolver
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/BaseNetworkEntityResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/BaseNetworkEntityResource.java
index ebdfb5499..64b12e28d 100644
--- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/BaseNetworkEntityResource.java
+++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/BaseNetworkEntityResource.java
@@ -29,7 +29,6 @@
import org.gbif.api.model.registry.Tag;
import org.gbif.api.service.registry.NetworkEntityService;
import org.gbif.api.util.Range;
-import org.gbif.api.vocabulary.DatasetType;
import org.gbif.api.vocabulary.IdentifierType;
import org.gbif.api.vocabulary.TagName;
import org.gbif.api.vocabulary.TagNamespace;
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/InstallationResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/InstallationResource.java
index 9b32a8113..d7fb6e9a4 100644
--- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/InstallationResource.java
+++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/InstallationResource.java
@@ -13,8 +13,6 @@
*/
package org.gbif.registry.ws.resources;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.enums.Explode;
import org.gbif.api.annotation.NullToNotFound;
import org.gbif.api.annotation.Trim;
@@ -31,7 +29,6 @@
import org.gbif.api.model.registry.search.KeyTitleResult;
import org.gbif.api.service.registry.InstallationService;
import org.gbif.api.service.registry.MetasyncHistoryService;
-import org.gbif.api.vocabulary.DatasetType;
import org.gbif.api.vocabulary.InstallationType;
import org.gbif.common.messaging.api.MessagePublisher;
import org.gbif.common.messaging.api.messages.StartMetasyncMessage;
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/NodeResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/NodeResource.java
index 967905f01..b4c60064d 100644
--- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/NodeResource.java
+++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/NodeResource.java
@@ -13,13 +13,7 @@
*/
package org.gbif.registry.ws.resources;
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Strings;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.enums.Explode;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.media.Schema;
import org.gbif.api.annotation.NullToNotFound;
import org.gbif.api.annotation.Trim;
@@ -37,7 +31,6 @@
import org.gbif.api.model.registry.search.NodeRequestSearchParams;
import org.gbif.api.service.registry.NodeService;
import org.gbif.api.vocabulary.Country;
-import org.gbif.api.vocabulary.DatasetType;
import org.gbif.api.vocabulary.IdentifierType;
import org.gbif.registry.directory.Augmenter;
import org.gbif.registry.events.EventManager;
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/CollectionResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/CollectionResource.java
index d5f3577b7..dd6554207 100644
--- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/CollectionResource.java
+++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/CollectionResource.java
@@ -23,7 +23,6 @@
import org.gbif.api.model.collections.suggestions.CollectionChangeSuggestion;
import org.gbif.api.model.collections.view.CollectionView;
import org.gbif.api.model.common.export.ExportFormat;
-import org.gbif.api.model.common.paging.Pageable;
import org.gbif.api.model.common.paging.PagingResponse;
import org.gbif.api.model.registry.search.collections.KeyCodeNameResult;
import org.gbif.api.service.collections.CollectionService;
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/InstitutionResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/InstitutionResource.java
index 3586d04ff..c86ef938d 100644
--- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/InstitutionResource.java
+++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/InstitutionResource.java
@@ -48,7 +48,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/IptNetworkResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/IptNetworkResource.java
index 65d5d8c30..4fb5ec54f 100644
--- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/IptNetworkResource.java
+++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/IptNetworkResource.java
@@ -16,6 +16,7 @@
import org.gbif.api.model.registry.Network;
import org.gbif.registry.domain.ws.IptNetworkBriefResponse;
import org.gbif.registry.persistence.mapper.NetworkMapper;
+import org.gbif.registry.persistence.mapper.params.NetworkListParams;
import java.util.List;
import java.util.UUID;
@@ -23,9 +24,6 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
-
-import org.gbif.registry.persistence.mapper.params.NetworkListParams;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.CacheControl;
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/IptResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/IptResource.java
index 86c8f5aac..daf077b0d 100644
--- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/IptResource.java
+++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/IptResource.java
@@ -361,6 +361,7 @@ else if (dataset.getInstallationKey() != existing.getInstallationKey()) {
// (A crawl will be triggered and EML read, unless the EML is not modified.)
existing.setModifiedBy(user);
existing.setType(dataset.getType());
+ existing.setSubtype(dataset.getSubtype());
existing.setInstallationKey(dataset.getInstallationKey());
existing.setPublishingOrganizationKey(dataset.getPublishingOrganizationKey());
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/LegacyDatasetResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/LegacyDatasetResource.java
index 62dfa5007..c3d476a22 100644
--- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/LegacyDatasetResource.java
+++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/legacy/LegacyDatasetResource.java
@@ -181,6 +181,7 @@ else if (dataset.getInstallationKey() != existing.getInstallationKey()) {
existing.setLogoUrl(dataset.getLogoUrl());
existing.setLanguage(dataset.getLanguage());
existing.setInstallationKey(dataset.getInstallationKey());
+ existing.setSubtype(dataset.getSubtype());
existing.setPublishingOrganizationKey(dataset.getPublishingOrganizationKey());
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/scheduled/GRSciCollCountsUpdaterService.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/scheduled/GRSciCollCountsUpdaterService.java
index aa211c834..22ea37d49 100644
--- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/scheduled/GRSciCollCountsUpdaterService.java
+++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/scheduled/GRSciCollCountsUpdaterService.java
@@ -1,7 +1,18 @@
+/*
+ * 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.gbif.registry.ws.resources.scheduled;
-import lombok.extern.slf4j.Slf4j;
-
import org.gbif.api.model.common.search.Facet;
import org.gbif.api.model.common.search.SearchResponse;
import org.gbif.api.model.occurrence.Occurrence;
@@ -31,6 +42,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import lombok.extern.slf4j.Slf4j;
+
@Service
@Endpoint(id = "grscicollCounts")
@Slf4j