CLARIN-DSpace v9/Port #1325 (ClarinLicenseLabel PUT/DELETE) to the v9 base (#1376)

Cherry-pick of eebe17d "[Port to dtq-dev] Issue 1343: add PUT and DELETE
endpoint methods to ClarinLicenseLabel REST repository (#1325)", adapted for
DSpace 9.

This port was dropped when CLARIN was merged into the v9 base: dtq-dev-9-base
carries every other CLARIN 7.6 migration but not this one. Diffing the migration
sets against dtq-dev shows exactly one missing:

    V7.6_2026.06.01__license_label_constraint.sql

which is why importing a dev-5 (CLARIN 7.6) dump onto this branch dies with

    FlywayValidateException: Detected applied migration not resolved locally:
    7.6.2026.06.01.

The deploy workflow currently works around that with `dspace database repair`.
That masks the gap rather than fixing it -- and would mask the next dropped
migration just as quietly -- so fix the cause: bring the port back. The rest of
#1325 was missing too (REST repository had no put, no DELETE, no DAO/service
methods, no ClarinLicenseLabelNotFoundException).

Adapted for v9 (javax -> jakarta; the branch is fully Jakarta EE -- 283 files
import jakarta.servlet.http.HttpServletRequest and none import the javax one):

- ClarinLicenseDAOImpl        javax.persistence.* -> jakarta.persistence.*
                              The only real cherry-pick conflict. Adds Predicate
                              and SetJoin, which the new findByLabel needs.
- ClarinLicenseLabelDAOImpl   javax.persistence.* -> jakarta.persistence.*
                              This one merged CLEANLY and silently: 9-base had no
                              persistence imports at all, so git had nothing to
                              conflict with, and it would simply not have compiled.
- ClarinLicenseLabelNotFoundException  javax.ws.rs   -> jakarta.ws.rs
- ClarinLicenseLabelRestRepository     javax.servlet -> jakarta.servlet

Import order follows the v9 convention checkstyle enforces: jakarta.* belongs to
the third-party group, lexicographically between com.* and org.*.

Verified locally: dspace-api compile, dspace-server-webapp compile and
test-compile, checkstyle on both -- all clean.

Co-authored-by: Milan Majchrák <minptai7@gmail.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: 3 people

dspace-api/src/main/java/org/dspace/content/clarin/ClarinLicenseLabelServiceImpl.java

@@ -76,6 +76,11 @@ public List<ClarinLicenseLabel> findAll(Context context) throws SQLException, Au
         return clarinLicenseLabelDAO.findAll(context, ClarinLicenseLabel.class);
     }
 
+    @Override
+    public ClarinLicenseLabel findByLabel(Context context, String label) throws SQLException {
+        return clarinLicenseLabelDAO.findByLabel(context, label);
+    }
+
     @Override
     public void delete(Context context, ClarinLicenseLabel license) throws SQLException, AuthorizeException {
         if (!authorizeService.isAdmin(context)) {

dspace-api/src/main/java/org/dspace/content/clarin/ClarinLicenseServiceImpl.java

@@ -97,6 +97,11 @@ public List<ClarinLicense> findByNameLike(Context context, String name) throws S
         return clarinLicenseDAO.findByNameLike(context, name);
     }
 
+    @Override
+    public List<ClarinLicense> findByLabel(Context context, String label) throws SQLException {
+        return clarinLicenseDAO.findByLabel(context, label);
+    }
+
     @Override
     public void addLicenseMetadataToItem(Context context, ClarinLicense clarinLicense, Item item) throws SQLException {
         if (Objects.isNull(clarinLicense) || Objects.isNull(item)) {

dspace-api/src/main/java/org/dspace/content/dao/clarin/ClarinLicenseDAO.java

@@ -28,4 +28,6 @@ public interface ClarinLicenseDAO extends GenericDAO<ClarinLicense> {
 
     List<ClarinLicense> findByNameLike(Context context, String name) throws SQLException;
 
+    List<ClarinLicense> findByLabel(Context context, String label) throws SQLException;
+
 }

dspace-api/src/main/java/org/dspace/content/dao/clarin/ClarinLicenseLabelDAO.java

@@ -7,7 +7,10 @@
  */
 package org.dspace.content.dao.clarin;
 
+import java.sql.SQLException;
+
 import org.dspace.content.clarin.ClarinLicenseLabel;
+import org.dspace.core.Context;
 import org.dspace.core.GenericDAO;
 
 /**
@@ -19,4 +22,6 @@
  * @author Milan Majchrak (milan.majchrak at dataquest.sk)
  */
 public interface ClarinLicenseLabelDAO extends GenericDAO<ClarinLicenseLabel> {
+
+    ClarinLicenseLabel findByLabel(Context context, String label) throws SQLException;
 }

dspace-api/src/main/java/org/dspace/content/dao/impl/clarin/ClarinLicenseDAOImpl.java

@@ -13,8 +13,12 @@
 import jakarta.persistence.Query;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.SetJoin;
 import org.dspace.content.clarin.ClarinLicense;
+import org.dspace.content.clarin.ClarinLicenseLabel;
+import org.dspace.content.clarin.ClarinLicenseLabel_;
 import org.dspace.content.clarin.ClarinLicense_;
 import org.dspace.content.dao.clarin.ClarinLicenseDAO;
 import org.dspace.core.AbstractHibernateDAO;
@@ -54,4 +58,20 @@ public List<ClarinLicense> findByNameLike(Context context, String name) throws S
         criteriaQuery.orderBy(criteriaBuilder.asc(clarinLicenseRoot.get(ClarinLicense_.name)));
         return list(context, criteriaQuery, false, ClarinLicense.class, -1, -1);
     }
+
+    @Override
+    public List<ClarinLicense> findByLabel(Context context, String label) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<ClarinLicense> criteriaQuery = getCriteriaQuery(criteriaBuilder, ClarinLicense.class);
+        Root<ClarinLicense> clarinLicenseRoot = criteriaQuery.from(ClarinLicense.class);
+
+        SetJoin<ClarinLicense, ClarinLicenseLabel> labelJoin =
+                clarinLicenseRoot.joinSet(ClarinLicense_.CLARIN_LICENSE_LABELS);
+
+        Predicate labelPredicate = criteriaBuilder.equal(labelJoin.get(ClarinLicenseLabel_.LABEL), label);
+
+        criteriaQuery.select(clarinLicenseRoot).where(labelPredicate);
+
+        return list(context, criteriaQuery, false, ClarinLicense.class, -1, -1);
+    }
 }

dspace-api/src/main/java/org/dspace/content/dao/impl/clarin/ClarinLicenseLabelDAOImpl.java

@@ -7,9 +7,16 @@
  */
 package org.dspace.content.dao.impl.clarin;
 
+import java.sql.SQLException;
+
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.clarin.ClarinLicenseLabel;
+import org.dspace.content.clarin.ClarinLicenseLabel_;
 import org.dspace.content.dao.clarin.ClarinLicenseLabelDAO;
 import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
 
 /**
  * Hibernate implementation of the Database Access Object interface class for the Clarin License Label object.
@@ -23,4 +30,14 @@ public class ClarinLicenseLabelDAOImpl extends AbstractHibernateDAO<ClarinLicens
     protected ClarinLicenseLabelDAOImpl() {
         super();
     }
+
+    @Override
+    public ClarinLicenseLabel findByLabel(Context context, String label) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<ClarinLicenseLabel> criteriaQuery = getCriteriaQuery(criteriaBuilder, ClarinLicenseLabel.class);
+        Root<ClarinLicenseLabel> cllRoot = criteriaQuery.from(ClarinLicenseLabel.class);
+        criteriaQuery.select(cllRoot);
+        criteriaQuery.where(criteriaBuilder.equal(cllRoot.get(ClarinLicenseLabel_.label), label));
+        return uniqueResult(context, criteriaQuery, true, ClarinLicenseLabel.class);
+    }
 }

dspace-api/src/main/java/org/dspace/content/service/clarin/ClarinLicenseLabelService.java

@@ -52,6 +52,16 @@ ClarinLicenseLabel create(Context context, ClarinLicenseLabel clarinLicenseLabel
      */
     ClarinLicenseLabel find(Context context, int valueId) throws SQLException;
 
+    /**
+     * Find the clarin license label object by label name
+     *
+     * @param context DSpace context object
+     * @param label label name of the searching clarin license label object
+     * @return found clarin license label object or null
+     * @throws SQLException if database error
+     */
+    ClarinLicenseLabel findByLabel(Context context, String label) throws SQLException;
+
     /**
      * Find all clarin license label objects
      * @param context DSpace context object

dspace-api/src/main/java/org/dspace/content/service/clarin/ClarinLicenseService.java

@@ -77,6 +77,16 @@ public interface ClarinLicenseService {
      */
     List<ClarinLicense> findByNameLike(Context context, String name) throws SQLException;
 
+    /**
+     * Find Clarin Licenses by the license label.
+     *
+     * @param context DSpace context object
+     * @param label the license label
+     * @return List of clarin licenses which contain the specified license label.
+     * @throws SQLException if database error
+     */
+    List<ClarinLicense> findByLabel(Context context, String label) throws SQLException;
+
     void addLicenseMetadataToItem(Context context, ClarinLicense clarinLicense, Item item) throws SQLException;
 
     void clearLicenseMetadataFromItem(Context context, Item item) throws SQLException;

dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.6_2026.06.01__license_label_constraint.sql

@@ -0,0 +1,18 @@
+--
+-- The contents of this file are subject to the license and copyright
+-- detailed in the LICENSE and NOTICE files at the root of the source
+-- tree and available online at
+--
+-- http://www.dspace.org/license/
+--
+
+ALTER TABLE license_label_extended_mapping
+    DROP CONSTRAINT IF EXISTS license_label_license_label_extended_mapping_fk;
+
+-- here the "ON DELETE RESTRICT" clause (default clause) is used, which prevents deletion of a license_label record
+-- when there are any license_label_extended_mapping records that reference it
+ALTER TABLE license_label_extended_mapping
+    ADD CONSTRAINT license_label_license_label_extended_mapping_fk FOREIGN KEY (label_id) REFERENCES license_label(label_id);
+
+ALTER TABLE license_label DROP CONSTRAINT IF EXISTS license_label_label_unique;
+ALTER TABLE license_label ADD CONSTRAINT license_label_label_unique UNIQUE(label);

dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V7.6_2026.06.01__license_label_constraint.sql

@@ -0,0 +1,18 @@
+--
+-- The contents of this file are subject to the license and copyright
+-- detailed in the LICENSE and NOTICE files at the root of the source
+-- tree and available online at
+--
+-- http://www.dspace.org/license/
+--
+
+ALTER TABLE license_label_extended_mapping
+    DROP CONSTRAINT IF EXISTS license_label_license_label_extended_mapping_fk;
+
+-- here the "ON DELETE RESTRICT" clause (default clause) is used, which prevents deletion of a license_label record
+-- when there are any license_label_extended_mapping records that reference it
+ALTER TABLE license_label_extended_mapping
+    ADD CONSTRAINT license_label_license_label_extended_mapping_fk FOREIGN KEY (label_id) REFERENCES license_label(label_id);
+
+ALTER TABLE license_label DROP CONSTRAINT IF EXISTS license_label_label_unique;
+ALTER TABLE license_label ADD CONSTRAINT license_label_label_unique UNIQUE(label);