fix /describe with invalid param

Author: jbarrasa

src/main/java/n10s/rdf/export/LPGToRDFProcesssor.java

@@ -247,7 +247,7 @@ protected  Set<Statement> processNode(Node node, Map<Long, IRI> ontologyEntities
 
 //    //TODO: Not doing this mapping. Imported ontos through the onto.import method are non reversible.
     for (Label label : nodeLabels) {
-//      if (!exportOnlyMappedElems || exportMappings.containsKey(label.name())) {
+      if (!exportOnlyMappedElems || exportMappings.containsKey(label.name())) {
 //        if (label.equals(Label.label("Class"))) {
 //          statements.add(vf.createStatement(subject, RDF.TYPE, RDFS.CLASS));
 //        } else if (label.equals(Label.label("Property"))) {
@@ -260,7 +260,7 @@ protected  Set<Statement> processNode(Node node, Map<Long, IRI> ontologyEntities
                   .createIRI(exportMappings.get(label.name()))
                   : vf.createIRI(BASE_SCH_NS, label.name())));
 //        }
-//      }
+      }
     }
 
     Map<String, Object> allProperties = node.getAllProperties();

src/test/java/n10s/endpoint/RDFEndpointTest.java

@@ -526,9 +526,9 @@ public void ImportGetNodeByIdOnImportedOnto() throws Exception {
 
     String expected = "@prefix n4sch: <neo4j://graph.schema#> .\n" +
             "\n" +
-            "n4sch:RF_signal_strength a <http://www.w3.org/2000/01/rdf-schema#Class>;\n" +
-            "  <http://www.w3.org/2000/01/rdf-schema#subClassOf> n4sch:Vehicle_Key;\n" +
-            "  <neo4j://neo4j.org/rdfs/1#name> \"RF_signal_strength\" .";
+            "<http://n4j.com/tst1/ontologies/2017/4/Cyber_EA_Smart_City#RF_signal_strength> a n4sch:Class;\n" +
+            "  n4sch:SCO <http://n4j.com/tst1/ontologies/2017/4/Cyber_EA_Smart_City#Vehicle_Key>;\n" +
+            "  n4sch:name \"RF_signal_strength\" .";
 
     assertEquals(200, response.status());
     assertTrue(ModelTestUtils
@@ -839,27 +839,6 @@ public void testFindNodeByLabelAndProperty() throws Exception {
         .compareModels(expected, RDFFormat.JSONLD, response.rawContent(), RDFFormat.JSONLD));
   }
 
-
-  @Test
-  public void testGetNodeByIdNotFoundOrInvalid() throws Exception {
-    // Given
-
-    HTTP.Response response = HTTP.withHeaders("Accept", "application/ld+json").GET(
-        HTTP.GET(neo4j.httpURI().resolve("rdf").toString()).location()
-            + "neo4j/describe/9999999");
-
-    assertEquals("[ ]", response.rawContent());
-    assertEquals(200, response.status());
-
-    //TODO: Non Long param for ID (would be a good idea to be consistent with previous case?...)
-    response = HTTP.withHeaders("Accept", "application/ld+json").GET(
-        HTTP.GET(neo4j.httpURI().resolve("rdf").toString()).location()
-            + "neo4j/describe/adb");
-
-    assertEquals("[ ]", response.rawContent());
-    assertEquals(200, response.status());
-  }
-
   @Test
   public void testFindNodeByLabelAndPropertyNotFoundOrInvalid() throws Exception {
     HTTP.Response response = HTTP.withHeaders("Accept", "application/ld+json").GET(
@@ -880,7 +859,7 @@ public void testFindNodeByLabelAndPropertyNotFoundOrInvalid() throws Exception {
   }
 
   @Test
-  public void testGetNodeByUriNotFoundOrInvalid() throws Exception {
+  public void testGetNodeByUriOrIdNotFoundOrInvalid() throws Exception {
 
     HTTP.Response response = HTTP.withHeaders("Accept", "text/n3").GET(
             HTTP.GET(neo4j.httpURI().resolve("rdf").toString()).location()
@@ -901,6 +880,13 @@ public void testGetNodeByUriNotFoundOrInvalid() throws Exception {
             "\n" +
             "</rdf:RDF>", response.rawContent());
 
+    response = HTTP.withHeaders("Accept", "application/ld+json").GET(
+            HTTP.GET(neo4j.httpURI().resolve("rdf").toString()).location()
+                    + "neo4j/describe/adb");
+
+    assertEquals("[ ]", response.rawContent());
+    assertEquals(200, response.status());
+
     try (Transaction tx = neo4j.defaultDatabaseService().beginTx()) {
       tx.execute("CALL n10s.graphconfig.init()");
       tx.commit();