Merge branch '544-rename-camtrap-endpoint' into dev

gbif · Jan 22, 2024 · 652e081 · 652e081
2 parents 99f7921 + 6c66b78
commit 652e081
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -84,7 +84,7 @@
     <spring-cloud-sleuth.version>2.2.8.RELEASE</spring-cloud-sleuth.version>
 
     <!-- GBIF -->
-    <gbif-api.version>1.13.0</gbif-api.version>
+    <gbif-api.version>1.13.1-SNAPSHOT</gbif-api.version>
     <gbif-common.version>0.59</gbif-common.version>
     <gbif-common-mybatis.version>1.3</gbif-common-mybatis.version>
     <gbif-common-ws.version>1.26</gbif-common-ws.version>

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
@@ -96,7 +96,7 @@ public class LegacyDataset extends Dataset implements LegacyEntity {
           LegacyResourceConstants.SAMPLING_EVENT_SERVICE_TYPE);
   private static final Set<String> DATA_PACKAGE_ENDPOINT_TYPE_ALTERNATIVES =
       ImmutableSet.of(
-          EndpointType.CAMTRAP_DP_v_0_4.name(), LegacyResourceConstants.CAMTRAP_DP_SERVICE_TYPE);
+          EndpointType.CAMTRAP_DP.name(), LegacyResourceConstants.CAMTRAP_DP_SERVICE_TYPE);
 
   /** Default constructor. */
   public LegacyDataset() {
@@ -758,7 +758,7 @@ private void addDataPackageEndpoint() {
         String url = serviceUrlsTokenizer.nextToken();
         if (type != null && url != null && DATA_PACKAGE_ENDPOINT_TYPE_ALTERNATIVES.contains(type)) {
           // create endpoint
-          Endpoint endpoint = createEndpoint(url, EndpointType.CAMTRAP_DP_v_0_4);
+          Endpoint endpoint = createEndpoint(url, EndpointType.CAMTRAP_DP);
           if (endpoint != null) {
             // set it
             dataPackageEndpoint = endpoint;

diff --git a/registry-persistence/src/main/resources/liquibase/130-rename-camtrap-dp-endpoint-type.xml b/registry-persistence/src/main/resources/liquibase/130-rename-camtrap-dp-endpoint-type.xml
@@ -0,0 +1,13 @@
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd">
+
+  <changeSet id="115" author="mpodolskiy" runInTransaction="false">
+    <sql splitStatements="false" stripComments="false">
+      <![CDATA[
+      ALTER TYPE enum_endpoint_type RENAME VALUE 'CAMTRAP_DP_v_0_4' TO 'CAMTRAP'
+      ]]>
+    </sql>
+  </changeSet>
+</databaseChangeLog>
diff --git a/registry-persistence/src/main/resources/liquibase/master.xml b/registry-persistence/src/main/resources/liquibase/master.xml
@@ -135,4 +135,5 @@
   <include file="liquibase/127-organization-country-not-null.xml" />
   <include file="liquibase/128-parent-code-occurrence-mapping.xml" />
   <include file="liquibase/129-duplicate-dataset-key-constraint.xml" />
+  <include file="liquibase/130-rename-camtrap-dp-endpoint-type.xml" />
 </databaseChangeLog>