fix tests, fully enforce no license and terms in TofU&A

Author: qqmyers

src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccess.java

@@ -161,6 +161,9 @@ public String getTermsOfUse() {
 
     public void setTermsOfUse(String termsOfUse) {
         this.termsOfUse = termsOfUse;
+        if (termsOfUse != null) {
+            this.license = null;
+        }
     }
 
     public String getTermsOfAccess() {
@@ -177,6 +180,9 @@ public String getConfidentialityDeclaration() {
 
     public void setConfidentialityDeclaration(String confidentialityDeclaration) {
         this.confidentialityDeclaration = confidentialityDeclaration;
+        if (confidentialityDeclaration != null) {
+            this.license = null;
+        }
     }
 
     public String getSpecialPermissions() {
@@ -185,6 +191,9 @@ public String getSpecialPermissions() {
 
     public void setSpecialPermissions(String specialPermissions) {
         this.specialPermissions = specialPermissions;
+        if (specialPermissions != null) {
+            this.license = null;
+        }
     }
 
     public String getRestrictions() {
@@ -193,6 +202,9 @@ public String getRestrictions() {
 
     public void setRestrictions(String restrictions) {
         this.restrictions = restrictions;
+        if (restrictions != null) {
+            this.license = null;
+        }
     }
 
     public String getCitationRequirements() {
@@ -201,6 +213,9 @@ public String getCitationRequirements() {
 
     public void setCitationRequirements(String citationRequirements) {
         this.citationRequirements = citationRequirements;
+        if (citationRequirements != null) {
+            this.license = null;
+        }
     }
 
     public String getDepositorRequirements() {
@@ -209,6 +224,9 @@ public String getDepositorRequirements() {
 
     public void setDepositorRequirements(String depositorRequirements) {
         this.depositorRequirements = depositorRequirements;
+        if (depositorRequirements != null) {
+            this.license = null;
+        }
     }
 
     public String getConditions() {
@@ -217,6 +235,9 @@ public String getConditions() {
 
     public void setConditions(String conditions) {
         this.conditions = conditions;
+        if (conditions != null) {
+            this.license = null;
+        }
     }
 
     public String getDisclaimer() {
@@ -225,6 +246,9 @@ public String getDisclaimer() {
 
     public void setDisclaimer(String disclaimer) {
         this.disclaimer = disclaimer;
+        if (disclaimer != null) {
+            this.license = null;
+        }
     }
 
     public String getDataAccessPlace() {

src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java

@@ -491,24 +491,6 @@ public DatasetVersion parseDatasetVersion(JsonObject obj, DatasetVersion dsv) th
                 }
             }
 
-            //test to see if license exists in dataset type 
-            //if not set it to null - 
-            //only test if Dataset has a type and if it has custom available licenses
-            if (dsv.getDataset() != null) {
-                DatasetType dst = dsv.getDataset().getDatasetType();
-                if (dst != null && dst.getLicenses() != null && !dst.getLicenses().isEmpty() && license != null) {
-                    boolean invalidLicense = true;
-                    for (License testLicense : dst.getLicenses()) {
-                        if (testLicense.equals(license)) {
-                            invalidLicense = false;
-                        }
-                    }
-                    if (invalidLicense) {
-                        license = null;
-                    }
-                }
-            }
-
             terms.setTermsOfUse(obj.getString("termsOfUse", null));
             terms.setConfidentialityDeclaration(obj.getString("confidentialityDeclaration", null));
             terms.setSpecialPermissions(obj.getString("specialPermissions", null));
@@ -547,6 +529,25 @@ public DatasetVersion parseDatasetVersion(JsonObject obj, DatasetVersion dsv) th
             terms.setFileAccessRequest(obj.getBoolean("fileAccessRequest", false));
             dsv.setTermsOfUseAndAccess(terms);
             terms.setDatasetVersion(dsv);
+
+            //test to see if license exists in dataset type
+            //if not set it to null -
+            //only test if Dataset has a type and if it has custom available licenses
+            if (dsv.getDataset() != null) {
+                DatasetType dst = dsv.getDataset().getDatasetType();
+                if (dst != null && dst.getLicenses() != null && !dst.getLicenses().isEmpty() && license != null) {
+                    boolean invalidLicense = true;
+                    for (License testLicense : dst.getLicenses()) {
+                        if (testLicense.equals(license)) {
+                            invalidLicense = false;
+                        }
+                    }
+                    if (invalidLicense) {
+                        license = null;
+                    }
+                }
+            }
+
             JsonObject metadataBlocks = obj.getJsonObject("metadataBlocks");
             if (metadataBlocks == null){
                 throw new JsonParseException(BundleUtil.getStringFromBundle("jsonparser.error.metadatablocks.not.found"));

src/test/java/edu/harvard/iq/dataverse/TermsOfUseAndAccessTest.java

@@ -0,0 +1,54 @@
+package edu.harvard.iq.dataverse;
+
+import org.junit.jupiter.api.Test;
+import edu.harvard.iq.dataverse.license.License;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TermsOfUseAndAccessTest {
+
+    @Test
+    public void testLicenseAndTermsMutualExclusivity() {
+        License license = new License();
+        license.setName("CC0");
+
+        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+
+        // 1. Setting license should clear terms
+        terms.setTermsOfUse("Some terms");
+        assertEquals("Some terms", terms.getTermsOfUse());
+        assertNull(terms.getLicense());
+
+        terms.setLicense(license);
+        assertNull(terms.getTermsOfUse());
+        assertEquals(license, terms.getLicense());
+
+        // 2. Setting terms should clear license
+        terms.setTermsOfUse("New terms");
+        assertNull(terms.getLicense());
+        assertEquals("New terms", terms.getTermsOfUse());
+
+        // 3. Test other fields clear license too
+        terms.setLicense(license);
+        terms.setConfidentialityDeclaration("Confidential");
+        assertNull(terms.getLicense());
+        assertEquals("Confidential", terms.getConfidentialityDeclaration());
+    }
+
+    @Test
+    public void testCopyTermsOfUseAndAccess() {
+        License license = new License();
+        license.setName("CC0");
+
+        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+        terms.setLicense(license);
+
+        TermsOfUseAndAccess copy = terms.copyTermsOfUseAndAccess();
+        assertEquals(license, copy.getLicense());
+        assertNull(copy.getTermsOfUse());
+
+        terms.setTermsOfUse("Some terms");
+        TermsOfUseAndAccess copy2 = terms.copyTermsOfUseAndAccess();
+        assertNull(copy2.getLicense());
+        assertEquals("Some terms", copy2.getTermsOfUse());
+    }
+}