Add aliasses to create datastore

ging · Sep 5, 2022 · a4662f4 · a4662f4
1 parent 8fa328b
commit a4662f4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/...cessors/src/main/java/org/apache/nifi/processors/ngsi/ngsi/backends/ckan/CKANBackend.java b/...cessors/src/main/java/org/apache/nifi/processors/ngsi/ngsi/backends/ckan/CKANBackend.java
@@ -103,7 +103,7 @@ private String resourceLookupOrCreateDynamicFields(String orgName, String pkgNam
             cache.addRes(orgName, pkgName, resName);
             cache.setResId(orgName, pkgName, resName, resId);
             if(createDataStore){
-                createDataStoreWithFields(resId,records);
+                createDataStoreWithFields(resId,resName,records);
                 createView(resId);
             }
             return resId;
@@ -123,7 +123,7 @@ private String resourceLookupOrCreateDynamicFields(String orgName, String pkgNam
             cache.addRes(orgName, pkgName, resName);
             cache.setResId(orgName, pkgName, resName, resId);
             if(createDataStore){
-                createDataStoreWithFields(resId,records);
+                createDataStoreWithFields(resId,resName,records);
                 createView(resId);
             }
             return resId;
@@ -140,7 +140,7 @@ private String resourceLookupOrCreateDynamicFields(String orgName, String pkgNam
             cache.addRes(orgName, pkgName, resName);
             cache.setResId(orgName, pkgName, resName, resId);
             if(createDataStore){
-                createDataStoreWithFields(resId,records);
+                createDataStoreWithFields(resId, resName, records);
                 createView(resId);
             }
             return resId;
@@ -169,7 +169,7 @@ private String resourceLookupOrCreate(String orgName, String pkgName, String res
                 cache.addRes(orgName, pkgName, resName);
                 cache.setResId(orgName, pkgName, resName, resId);
                 if(createDataStore){
-                    createDataStore(resId);
+                    createDataStore(resId, resName);
                     createView(resId);
                 }
                 return resId;
@@ -192,7 +192,7 @@ private String resourceLookupOrCreate(String orgName, String pkgName, String res
                 cache.addRes(orgName, pkgName, resName);
                 cache.setResId(orgName, pkgName, resName, resId);
                 if(createDataStore){
-                    createDataStore(resId);
+                    createDataStore(resId, resName);
                     createView(resId);
                 }
                 return resId;
@@ -212,7 +212,7 @@ private String resourceLookupOrCreate(String orgName, String pkgName, String res
                 cache.addRes(orgName, pkgName, resName);
                 cache.setResId(orgName, pkgName, resName, resId);
                 if(createDataStore){
-                    createDataStore(resId);
+                    createDataStore(resId, resName);
                     createView(resId);
                 }
                 return resId;
@@ -460,10 +460,11 @@ private String createResource(String resName, String pkgId, DCATMetadata dcatMet
      * @param resId Identifies the resource whose datastore is going to be created.
      * @throws Exception
      */
-    private void createDataStore(String resId) throws Exception {
+    private void createDataStore(String resId, String resName) throws Exception {
         // create the CKAN request JSON
         // CKAN types reference: http://docs.ckan.org/en/ckan-2.2/datastore.html#valid-types
         String jsonString = "{ \"resource_id\": \"" + resId
+                + "\", \"aliases\": [\""+resName+"\"+ ],"
                 + "\", \"fields\": [ "
                 + "{ \"id\": \"" + NGSIConstants.RECV_TIME_TS + "\", \"type\": \"int\"},"
                 + "{ \"id\": \"" + NGSIConstants.RECV_TIME + "\", \"type\": \"timestamp\"},"
@@ -498,7 +499,7 @@ private void createDataStore(String resId) throws Exception {
      * @param records Array list with the attributes names for being used as fields with column mode
      * @throws Exception
      */
-    private void createDataStoreWithFields(String resId, String records) throws Exception {
+    private void createDataStoreWithFields(String resId, String resName, String records) throws Exception {
         // create the CKAN request JSON
         // CKAN types reference: http://docs.ckan.org/en/ckan-2.2/datastore.html#valid-types
         org.json.JSONObject jsonContent = new org.json.JSONObject(records);
@@ -521,6 +522,7 @@ private void createDataStoreWithFields(String resId, String records) throws Exce
         }
 
         dataStore.setResource_id(resId);
+        dataStore.setAliases(resName);
         dataStore.setFields(jsonArray);
         dataStore.setForce("true");
         String jsonString = gson.toJson(dataStore);

diff --git a/...ors/src/main/java/org/apache/nifi/processors/ngsi/ngsi/backends/ckan/model/DataStore.java b/...ors/src/main/java/org/apache/nifi/processors/ngsi/ngsi/backends/ckan/model/DataStore.java
@@ -9,6 +9,7 @@ public class DataStore {
     private String resource_id;
     private ArrayList<JsonElement> fields;
     private String force;
+    private String aliases;
 
     public  DataStore(){}
 
@@ -35,4 +36,6 @@ public String getForce() {
     public void setForce(String force) {
         this.force = force;
     }
+
+    public void setAliases(String aliases) { this.aliases = aliases; }
 }