From 04577b4047e6d89b8a993d242976244daf189e5e Mon Sep 17 00:00:00 2001
From: Benoit Orihuela <benoit.orihuela@egm.io>
Date: Wed, 18 Dec 2024 14:47:10 +0000
Subject: [PATCH] chore: minor wording and cleanup (#21)

---
 .../egm/io/nifi/processors/ckan/NgsiLdToCkan.java   | 13 +++++++------
 .../io/nifi/processors/ckan/ngsild/NGSIEvent.java   |  9 ---------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/nifi-ngsild-ckan-processors/src/main/java/egm/io/nifi/processors/ckan/NgsiLdToCkan.java b/nifi-ngsild-ckan-processors/src/main/java/egm/io/nifi/processors/ckan/NgsiLdToCkan.java
index 059d544..732553b 100644
--- a/nifi-ngsild-ckan-processors/src/main/java/egm/io/nifi/processors/ckan/NgsiLdToCkan.java
+++ b/nifi-ngsild-ckan-processors/src/main/java/egm/io/nifi/processors/ckan/NgsiLdToCkan.java
@@ -28,9 +28,9 @@
 
 @SupportsBatching
 @InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
-@Tags({"CKAN","ckan","sql", "put", "rdbms", "database", "create", "insert", "relational","NGSIv2", "NGSI","FIWARE"})
-@CapabilityDescription("Create a CKAN resource, package and dataset if not exits using the information coming from and NGSI event converted to flow file." +
-        "After insert all of the vales of the flow file content extraction the entities and attributes")
+@Tags({"CKAN", "ckan", "Open Data", "NGSI-LD", "NGSI", "FIWARE"})
+@CapabilityDescription("Create a CKAN resource, package and dataset if not exists using the information coming from an NGSI-LD event converted to flow file." +
+        "After insert all of the values of the flow file content extraction the entities and attributes")
 public class NgsiLdToCkan extends AbstractProcessor {
     protected static final PropertyDescriptor CKAN_HOST = new PropertyDescriptor.Builder()
             .name("CKAN Host")
@@ -66,6 +66,7 @@ public class NgsiLdToCkan extends AbstractProcessor {
             .description("The APi Key you are going o use in CKAN")
             .required(true)
             .defaultValue("XXXXXX")
+            .sensitive(true)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 
@@ -165,7 +166,7 @@ public void aggregate(Entity entity, long creationTime) {
 
         final String orgName = ckanBackend.buildOrgName(organizationName, dcatMetadata);
         ArrayList<Entity> entities = event.getEntitiesLD();
-        getLogger().info("[] Persisting data at NGSICKANSink (orgName=" + orgName+ ", ");
+        getLogger().info("Persisting data at NGSICKANSink: orgName=" + orgName);
         getLogger().debug("DCAT metadata: {}" , dcatMetadata);
 
         for (Entity entity : entities) {
@@ -185,8 +186,8 @@ public void aggregate(Entity entity, long creationTime) {
                 }
             }
 
-            getLogger().info("[] Persisting data at NGSICKANSink (orgName=" + orgName
-                    + ", pkgName=" + pkgName + ", resName=" + resName + ", data=(" + aggregation + ")");
+            getLogger().info("Persisting data at NGSICKANSink: orgName=" + orgName
+                    + ", pkgName=" + pkgName + ", resName=" + resName + ", data=" + aggregation);
 
             ckanBackend.persist(orgName, pkgName, pkgTitle, resName, aggregation, dcatMetadata,createDataStore);
         } // for
diff --git a/nifi-ngsild-ckan-processors/src/main/java/egm/io/nifi/processors/ckan/ngsild/NGSIEvent.java b/nifi-ngsild-ckan-processors/src/main/java/egm/io/nifi/processors/ckan/ngsild/NGSIEvent.java
index d1e3d09..a242c18 100644
--- a/nifi-ngsild-ckan-processors/src/main/java/egm/io/nifi/processors/ckan/ngsild/NGSIEvent.java
+++ b/nifi-ngsild-ckan-processors/src/main/java/egm/io/nifi/processors/ckan/ngsild/NGSIEvent.java
@@ -4,7 +4,6 @@
 
 public class NGSIEvent {
     public long creationTime;
-    public ArrayList <Entity> entities;
     public ArrayList <Entity> entitiesLD;
 
     public NGSIEvent(long creationTime, ArrayList<Entity> entitiesLD ){
@@ -24,14 +23,6 @@ public void setCreationTime(long creationTime) {
         this.creationTime = creationTime;
     }
 
-    public ArrayList<Entity> getEntities() {
-        return entities;
-    }
-
-    public void setEntities(ArrayList<Entity> entities) {
-        this.entities = entities;
-    }
-
     public long getRecvTimeTs() {
         return this.creationTime;
     } // getRecvTimeTs