refactor: remove deprecated hibernate structures/functions

apikey.hbm.xml -> apikey.orm.xml Refs: XRDDEV-2713
nordic-institute · Nov 18, 2024 · dbe5429 · dbe5429
1 parent 8a9529d
commit dbe5429
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 27 deletions.
diff --git a/src/central-server/admin-service/application/src/main/resources/application.yml b/src/central-server/admin-service/application/src/main/resources/application.yml
@@ -4,7 +4,7 @@
 spring:
   jpa:
     mapping-resources:
-      - apikey.hbm.xml
+      - apikey.orm.xml
     open-in-view: false
     hibernate:
       ddl-auto: validate

diff --git a/src/common/common-admin-api/src/main/resources/apikey.hbm.xml b/src/common/common-admin-api/src/main/resources/apikey.hbm.xml
diff --git a/src/common/common-admin-api/src/main/resources/apikey.orm.xml b/src/common/common-admin-api/src/main/resources/apikey.orm.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm
+                                     http://java.sun.com/xml/ns/persistence/orm_2_2.xsd"
+                 version="2.2">
+    <package>org.niis.xroad.restapi.domain</package>
+
+    <!-- Entity Definition -->
+    <entity class="PersistentApiKeyType" access="FIELD">
+        <table name="APIKEY"/>
+
+        <!-- ID mapping -->
+        <attributes>
+            <id name="id" access="FIELD">
+                <column name="id"/>
+                <generated-value strategy="AUTO"/>
+            </id>
+
+            <!-- Basic properties -->
+            <basic name="encodedKey">
+                <column name="encodedkey"/>
+            </basic>
+
+            <!-- Enum Set Mapping -->
+            <element-collection name="roles" access="FIELD" fetch="EAGER">
+                <column name="role" nullable="false"/>
+                <enumerated>STRING</enumerated>
+                <collection-table name="APIKEY_ROLES">
+                    <join-column name="apikey_id"/>
+                </collection-table>
+            </element-collection>
+        </attributes>
+
+    </entity>
+
+</entity-mappings>
diff --git a/src/common/common-admin-api/src/test/resources/application.yml b/src/common/common-admin-api/src/test/resources/application.yml
@@ -1,7 +1,7 @@
 # properties for test runtime
 spring:
   jpa:
-    mapping-resources: apikey.hbm.xml
+    mapping-resources: apikey.orm.xml
     open-in-view: false
     generate-ddl: true
     show-sql: false

diff --git a/src/common/common-admin-api/src/test/resources/data.sql b/src/common/common-admin-api/src/test/resources/data.sql
@@ -15,3 +15,5 @@ INSERT INTO APIKEY_ROLES (APIKEY_ID, ROLE)
 VALUES (1, 'XROAD_SERVICE_ADMINISTRATOR');
 INSERT INTO APIKEY_ROLES (APIKEY_ID, ROLE)
 VALUES (1, 'XROAD_REGISTRATION_OFFICER');
+
+ALTER SEQUENCE apikey_seq RESTART WITH 51;
diff --git a/src/security-server/admin-service/application/src/main/resources/common-application.yml b/src/security-server/admin-service/application/src/main/resources/common-application.yml
@@ -4,7 +4,7 @@ spring:
     throw-exception-if-no-handler-found: true
   jpa:
     ## *.hbm.xml files are loaded from classpath
-    mapping-resources: identifiers.hbm.xml,serverconf.hbm.xml,apikey.hbm.xml
+    mapping-resources: identifiers.hbm.xml,serverconf.hbm.xml,apikey.orm.xml
     open-in-view: false
     hibernate:
       ddl-auto: none