gCubeSystem
/
gcube-cms-suite
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#22461 #1

Merged
fabio.sinibaldi merged 27 commits from #22461 into master 2022-01-14 12:43:19 +01:00
Conversation 0 Commits 27 Files Changed 131 +48 -5
4 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7550f3307a - Show all commits

3
geoportal-common/CHANGELOG.md
View File

@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.application.geoportal-common # Changelog for org.gcube.application.geoportal-common
# [v1.0.8-SNAPSHOT] - 2021-11-10
Fixes [#22369](https://support.d4science.org/issues/22369)
# [v1.0.7] - 2021-09-20 # [v1.0.7] - 2021-09-20
Refactored repositories Refactored repositories

2
geoportal-common/pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.application</groupId> <groupId>org.gcube.application</groupId>
<artifactId>geoportal-common</artifactId> <artifactId>geoportal-common</artifactId>
<version>1.0.7</version> <version>1.0.8-SNAPSHOT</version>
<name>Geoportal Common</name> <name>Geoportal Common</name>

8
geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Concessione.java
View File

@ -317,15 +317,15 @@ public class Concessione extends Record{
relazioneScavo.setTitolo(ConstraintCheck.defaultFor(relazioneScavo.getTitolo(),getNome()+" relazione di scavo").evaluate()); relazioneScavo.setTitolo(ConstraintCheck.defaultFor(relazioneScavo.getTitolo(),getNome()+" relazione di scavo").evaluate());
relazioneScavo.setSoggetto(ConstraintCheck.defaultFor(relazioneScavo.getSoggetto(),getSoggetto()).evaluate()); relazioneScavo.setSoggetto(ConstraintCheck.defaultFor(relazioneScavo.getSoggetto(),getSoggetto()).evaluate());
relazioneScavo.setCreationTime(ConstraintCheck.defaultFor(relazioneScavo.getCreationTime(),getCreationTime()).evaluate()); relazioneScavo.setCreationTime(ConstraintCheck.defaultFor(relazioneScavo.getCreationTime(),getCreationTime()).evaluate());
relazioneScavo.setLicenseID(ConstraintCheck.defaultFor(getLicenzaID(), "CC-BY-4.0").evaluate()); relazioneScavo.setLicenseID(ConstraintCheck.defaultFor(relazioneScavo.getLicenseID(), "CC-BY-4.0").evaluate());
relazioneScavo.setPolicy(getPolicy()); relazioneScavo.setPolicy(ConstraintCheck.defaultFor(relazioneScavo.getPolicy(),AccessPolicy.OPEN).evaluate());
if(abstractRelazione == null) abstractRelazione = new AbstractRelazione(); if(abstractRelazione == null) abstractRelazione = new AbstractRelazione();
abstractRelazione.setTitolo(ConstraintCheck.defaultFor(abstractRelazione.getTitolo(),getNome()+" abstract relazione di scavo").evaluate()); abstractRelazione.setTitolo(ConstraintCheck.defaultFor(abstractRelazione.getTitolo(),getNome()+" abstract relazione di scavo").evaluate());
abstractRelazione.setCreationTime(ConstraintCheck.defaultFor(abstractRelazione.getCreationTime(),getCreationTime()).evaluate()); abstractRelazione.setCreationTime(ConstraintCheck.defaultFor(abstractRelazione.getCreationTime(),getCreationTime()).evaluate());
abstractRelazione.setLicenseID(ConstraintCheck.defaultFor(getLicenzaID(), "CC-BY-4.0").evaluate()); abstractRelazione.setLicenseID(ConstraintCheck.defaultFor(abstractRelazione.getLicenseID(), "CC-BY-4.0").evaluate());
abstractRelazione.setPolicy(getPolicy()); abstractRelazione.setPolicy(ConstraintCheck.defaultFor(abstractRelazione.getPolicy(),AccessPolicy.OPEN).evaluate());
if(immaginiRappresentative!=null) if(immaginiRappresentative!=null)

40
geoportal-common/src/test/java/org/gcube/application/geoportal/common/legacy/DefaultsTests.java Normal file
View File

@ -0,0 +1,40 @@
package org.gcube.application.geoportal.common.legacy;
import org.gcube.application.geoportal.common.model.legacy.AccessPolicy;
import org.gcube.application.geoportal.common.model.legacy.Concessione;
import org.gcube.application.geoportal.common.model.legacy.RelazioneScavo;
import org.gcube.application.geoportal.common.model.legacy.report.ConstraintCheck;
import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class DefaultsTests {
@Test
public void checkConstraints(){
assertEquals(AccessPolicy.OPEN,ConstraintCheck.defaultFor(null,AccessPolicy.OPEN).evaluate());
assertEquals(AccessPolicy.EMBARGOED,ConstraintCheck.defaultFor(AccessPolicy.EMBARGOED,AccessPolicy.OPEN).evaluate());
}
@Test
public void checkDefaults(){
Concessione c= new Concessione();
c.setDefaults();
c.validate();
System.out.println(c.getReport());
// Mandatory fields without defaults
assertEquals(ValidationReport.ValidationStatus.ERROR,c.getReport().getStatus());
c=new Concessione();
c.setRelazioneScavo(new RelazioneScavo());
c.getRelazioneScavo().setPolicy(AccessPolicy.EMBARGOED);
c.setPolicy(AccessPolicy.OPEN);
assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy());
c.setDefaults();
assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy());
}
}