From dfccd87a62f93ff88439741f073fee67595b652f Mon Sep 17 00:00:00 2001
From: "luca.frosini" <luca.frosini@nb-frosini.isti.cnr.it>
Date: Thu, 9 Nov 2023 17:21:21 +0100
Subject: [PATCH] Fixed queries and test

---
 .../instances/model/entities/EntityManagement.java          | 6 +++---
 .../informationsystem/resourceregistry/rest/Access.java     | 2 +-
 .../informationsystem/resourceregistry/ContextTest.java     | 1 -
 .../resourceregistry/queries/QueryTest.java                 | 2 +-
 src/test/resources/logback-test.xml                         | 3 ++-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java
index 27ca50c..8db54f7 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java
@@ -769,14 +769,14 @@ public abstract class EntityManagement<E extends Entity, ET extends EntityType>
 		
 		StringBuilder selectStringBuilder = new StringBuilder("SELECT FROM (TRAVERSE ");
 		
-		selectStringBuilder.append(direction.opposite().name().toLowerCase());
+		selectStringBuilder.append(direction.name().toLowerCase());
 		selectStringBuilder.append("V('");
 		selectStringBuilder.append(typeName);
 		selectStringBuilder.append("')");
 		
 		selectStringBuilder.append(", ");
 		
-		selectStringBuilder.append(direction.name().toLowerCase());
+		selectStringBuilder.append(direction.opposite().name().toLowerCase());
 		selectStringBuilder.append("E('");
 		selectStringBuilder.append(relationType);
 		selectStringBuilder.append("')");
@@ -803,7 +803,7 @@ public abstract class EntityManagement<E extends Entity, ET extends EntityType>
 		
 		selectStringBuilder.append(" WHERE @class");
 		if(polymorphic) {
-			selectStringBuilder.append(" INSTANCEOF ");
+			selectStringBuilder.append(" INSTANCEOF '");
 		} else {	
 			selectStringBuilder.append("='");
 		}
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/Access.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/Access.java
index 3fc245b..4374d0e 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/Access.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/Access.java
@@ -430,7 +430,7 @@ public class Access extends BaseRest {
 	 * 
 	 * All the EService having an incoming (IN) Hosts relation (i.e. hosted by) the HostingNode with UUID 
 	 * 16032d09-3823-444e-a1ff-a67de4f350a 
-	 * 	 * GET /access/query/EService/hosts/HostingNode?_reference=16032d09-3823-444e-a1ff-a67de4f350a8&_polymorphic=true&_direction=in
+	 * 	 * GET /access/query/EService/Hosts/HostingNode?_reference=16032d09-3823-444e-a1ff-a67de4f350a8&_polymorphic=true&_direction=in
 	 * 
 	 */
 	@SuppressWarnings({"rawtypes"})
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
index 8b4a3b6..ccb7b1a 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
@@ -63,7 +63,6 @@ public class ContextTest {
 		try {
 			// load the properties file
 			properties.load(input);
-	
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/queries/QueryTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/queries/QueryTest.java
index a017293..d0a5a60 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/queries/QueryTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/queries/QueryTest.java
@@ -337,7 +337,7 @@ public class QueryTest extends ERManagementTest {
 	@Test
 	public void getAllResourcesHavingFacet() throws ObjectNotFound, Exception {
 		String[] names = new String[]{"MyTest", "MyTest", "Aux", "MyID", "MyID"};
-		Object[] additionalProperties = new Object[] {5, 5.0, false, "test", null};
+		Object[] additionalProperties = new Object[] {5, 6.0, false, "test", null};
 		
 		List<Configuration> createdConfigurations = new ArrayList<>();
 		
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 7c403cf..33b7802 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -14,8 +14,9 @@
   <logger name="org.gcube.informationsystem.types" level="INFO" />
   <logger name="org.gcube.informationsystem.resourceregistry.dbinitialization" level="INFO" />
   <logger name="org.gcube.informationsystem.utils.discovery" level="ERROR" />
+  <logger name="org.gcube.informationsystem.resourceregistry" level="TRACE" />
   <logger name="org.gcube.informationsystem.resourceregistry.contexts" level="INFO" />
-  <logger name="org.gcube.informationsystem.resourceregistry.types" level="TRACE" />
+  <logger name="org.gcube.informationsystem.resourceregistry.types" level="INFO" />
   <logger name="org.gcube.informationsystem.resourceregistry.instances" level="TRACE" />
    
   <root level="WARN">