From c0bc729541bdd96eb030a61927a007f6a548307f Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Mon, 21 Dec 2020 16:02:46 +0100
Subject: [PATCH] Documenting types

---
 .../model/impl/properties/EnumStringPropertyImpl.java     | 4 ++--
 .../model/impl/properties/RegexPropertyImpl.java          | 4 ++--
 .../model/impl/properties/ValueSchemaImpl.java            | 6 +++---
 .../model/reference/properties/EnumStringProperty.java    | 2 +-
 .../model/reference/properties/RegexProperty.java         | 8 ++++----
 .../model/reference/properties/ValueSchema.java           | 4 ++--
 .../reference/properties/utilities/TypedProperty.java     | 4 ++--
 .../reference/entities/facets/AccessPointFacetTest.java   | 2 +-
 .../model/reference/entities/facets/ActionFacetTest.java  | 2 +-
 .../reference/properties/EnumStringPropertyTest.java      | 2 +-
 .../model/reference/properties/RegexPropertyTest.java     | 2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/EnumStringPropertyImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/EnumStringPropertyImpl.java
index 5e7535e..def7e62 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/EnumStringPropertyImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/EnumStringPropertyImpl.java
@@ -33,12 +33,12 @@ public class EnumStringPropertyImpl extends GCubePropertyImpl implements EnumStr
 	}
 
 	@Override
-	public Set<String> getType() {
+	public Set<String> getSchema() {
 		return this.type;
 	}
 
 	@Override
-	public void setType(Set<String> type) {
+	public void setSchema(Set<String> type) {
 		this.type = type;
 	}
 
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/RegexPropertyImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/RegexPropertyImpl.java
index 1c7ed18..69c1848 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/RegexPropertyImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/RegexPropertyImpl.java
@@ -31,12 +31,12 @@ public class RegexPropertyImpl extends GCubePropertyImpl implements RegexPropert
 	}
 
 	@Override
-	public String getType() {
+	public String getSchema() {
 		return this.type;
 	}
 
 	@Override
-	public void setType(String type) {
+	public void setSchema(String type) {
 		this.type = type;
 	}
 
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/ValueSchemaImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/ValueSchemaImpl.java
index 1d766be..dac1d17 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/ValueSchemaImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/ValueSchemaImpl.java
@@ -36,13 +36,13 @@ public class ValueSchemaImpl extends GCubePropertyImpl implements ValueSchema {
 	}
 
 	@Override
-	public URI getType() {
+	public URI getSchema() {
 		return this.schema;
 	}
 
 	@Override
-	public void setType(URI type) {
-		this.schema = type;
+	public void setSchema(URI schema) {
+		this.schema = schema;
 	}
 
 }
diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringProperty.java b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringProperty.java
index 424a5ec..d5b6f12 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringProperty.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringProperty.java
@@ -45,7 +45,7 @@ public interface EnumStringProperty extends GCubeProperty, ValidatedTypedPropert
 
 		@Override
 		public Validation validate(EnumStringProperty property) {
-			return property.getType().contains(property.getValue()) ? Validation.success("Accepted!")
+			return property.getSchema().contains(property.getValue()) ? Validation.success("Accepted!")
 					: Validation.fail(property.getValue() + " is not a valid value.");
 		}
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/RegexProperty.java b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/RegexProperty.java
index 87312b9..cc2dca1 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/RegexProperty.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/RegexProperty.java
@@ -48,10 +48,10 @@ public interface RegexProperty extends GCubeProperty, ValidatedTypedProperty<Str
 		public Validation validate(RegexProperty property) {
 			if (Objects.isNull(property.getValue()))
 				return Validation.fail("The value of the regex property is not set.");
-			if (Objects.isNull(property.getType()))
+			if (Objects.isNull(property.getSchema()))
 				return Validation.fail("The type of the regex property is not set.");
 			
-			Pattern pattern = Pattern.compile(property.getType());
+			Pattern pattern = Pattern.compile(property.getSchema());
 		    Matcher matcher = pattern.matcher(property.getValue());
 			return matcher.find() ? 
 					Validation.success("Accepted!") : Validation.fail(property.getValue() + " was not a valid match!");
@@ -68,9 +68,9 @@ public interface RegexProperty extends GCubeProperty, ValidatedTypedProperty<Str
 	
 	@ISProperty
 	@Override
-	public String getType();
+	public String getSchema();
 	
 	@Override
-	public void setType(String type);
+	public void setSchema(String type);
 	
 }
diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/ValueSchema.java b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/ValueSchema.java
index 7479947..13947db 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/ValueSchema.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/ValueSchema.java
@@ -71,9 +71,9 @@ public interface ValueSchema extends GCubeProperty, ValidatedTypedProperty<URI,S
 	 */
 	@ISProperty(description = "An URI containing a schema used to validate/interpret the content of the value. It is only an informative field. The validation is charge of the client.", mandatory=true, nullable=false)
 	@Override
-	public URI getType();
+	public URI getSchema();
 	
 	@Override
-	public void setType(URI type);
+	public void setSchema(URI schema);
 	
 }
diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/utilities/TypedProperty.java b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/utilities/TypedProperty.java
index 864ad64..126475b 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/utilities/TypedProperty.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/utilities/TypedProperty.java
@@ -9,8 +9,8 @@ public interface TypedProperty<T, V> {
 	
 	public void setValue(V value);
 	
-	public T getType();
+	public T getSchema();
 	
-	public void setType(T type);
+	public void setSchema(T type);
 	
 }
diff --git a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/AccessPointFacetTest.java b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/AccessPointFacetTest.java
index 50c6229..436aaa5 100644
--- a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/AccessPointFacetTest.java
+++ b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/AccessPointFacetTest.java
@@ -26,7 +26,7 @@ public class AccessPointFacetTest {
 		ValueSchema authorization = new ValueSchemaImpl();
 		authorization.setValue("pwd");
 		URI uri = new URI("http://www.gcube-system.org");
-		authorization.setType(uri);
+		authorization.setSchema(uri);
 		accessPointFacet.setAuthorization(authorization);
 		
 		accessPointFacet.setAdditionalProperty("Test", "MyTest");
diff --git a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/ActionFacetTest.java b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/ActionFacetTest.java
index 84bba6d..6f27adf 100644
--- a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/ActionFacetTest.java
+++ b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/ActionFacetTest.java
@@ -33,7 +33,7 @@ public class ActionFacetTest {
 		facet.setName("FirstAction");
 		EnumStringProperty type = new EnumStringPropertyImpl();
 		type.setValue("ANSIBLE");
-		type.setType(values);
+		type.setSchema(values);
 		facet.setType(type);
 		facet.setSource("git@myrepo:playbook.yml");
 		facet.setCommand("ansible-pull");
diff --git a/src/test/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringPropertyTest.java b/src/test/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringPropertyTest.java
index 5c142a7..1cc720e 100644
--- a/src/test/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringPropertyTest.java
+++ b/src/test/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringPropertyTest.java
@@ -28,7 +28,7 @@ public class EnumStringPropertyTest {
 	 */
 	@Before
 	public void setUp() throws Exception {
-		property.setType(new HashSet<String>(Arrays.asList("SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT")));
+		property.setSchema(new HashSet<String>(Arrays.asList("SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT")));
 	}
 
 	/**
diff --git a/src/test/java/org/gcube/resourcemanagement/model/reference/properties/RegexPropertyTest.java b/src/test/java/org/gcube/resourcemanagement/model/reference/properties/RegexPropertyTest.java
index 51e87ea..38aff61 100644
--- a/src/test/java/org/gcube/resourcemanagement/model/reference/properties/RegexPropertyTest.java
+++ b/src/test/java/org/gcube/resourcemanagement/model/reference/properties/RegexPropertyTest.java
@@ -27,7 +27,7 @@ public class RegexPropertyTest {
 	@Before
 	public void setUp() throws Exception {
 		String patternString = ".*http://.*";
-        property.setType(patternString);
+        property.setSchema(patternString);
 	}
 
 	/**