Merge branch 'release/v1.1.6'

CHANGELOG.md

@@ -1,6 +1,11 @@
 E-FilesFromCKAN
 ----------
 
+v1.1.6
+---
+* fixed: UI error caused by resources of different datasets having the same ID
+* prevented CKAN resource id to be set as pipeline metadata. This metadata caused creation of CKAN resources with the same id. 
+
 v1.1.5
 ---
 * fixed: CKAN resources list in DPU configuration dialog is alphabetically ordered now

pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.opendatanode.plugins</groupId>
     <artifactId>uv-e-filesFromCKAN</artifactId>
     <name>E-FilesFromCKAN</name>
-    <version>1.1.5</version>
+    <version>1.1.6</version>
     <description>Extractor of CKAN file resources</description>
     <packaging>bundle</packaging>
 

src/main/java/org/opendatanode/plugins/extractor/ckan/file/FilesFromCkanHelper.java

@@ -386,6 +386,11 @@ private static Resource getResourceFromCkanResponse(JsonObject showResourceResul
         Set<String> jsonKeys = showResourceResult.keySet();
         Map<String, String> resourceMap = new HashMap<>();
         for (String key : jsonKeys) {
+        	if (PARAM_ID.equalsIgnoreCase(key)) {
+        		// ID metadata would cause creation of resource with existing ID, so skip 
+				continue;
+			}
+
             if (showResourceResult.get(key).getValueType() == ValueType.STRING) {
                 resourceMap.put(key, showResourceResult.getString(key));
             }

src/main/java/org/opendatanode/plugins/extractor/ckan/file/FilesFromCkanVaadinDialog.java

@@ -75,6 +75,8 @@ public class FilesFromCkanVaadinDialog extends AbstractDialog<FilesFromCkanConfi
 
     private static final String CONFIGURATION_LOCALE = "locale";
 
+	private static final String CAPTION_ITEM_PROPERTY = "caption";
+
     public FilesFromCkanVaadinDialog() {
         super(FilesFromCkan.class);
     }
@@ -142,8 +144,8 @@ public void valueChange(ValueChangeEvent event) {
         // setting up for filtering
         datasetResourceTree.setMultiSelect(false);
         datasetResourceTree.setItemCaptionMode(ItemCaptionMode.PROPERTY);
-        datasetResourceTree.setItemCaptionPropertyId("caption");
-        datasetResourceTree.addContainerProperty("caption", String.class, "");
+        datasetResourceTree.setItemCaptionPropertyId(CAPTION_ITEM_PROPERTY);
+        datasetResourceTree.addContainerProperty(CAPTION_ITEM_PROPERTY, String.class, "");
 
         // sort alphabetically asc 
         ((HierarchicalContainer) datasetResourceTree.getContainerDataSource()).setItemSorter(new ItemSorter() {
@@ -199,7 +201,7 @@ public void textChange(TextChangeEvent event) {
                 ds.removeAllContainerFilters();
 
                 if (!filterText.isEmpty()) {
-                    SimpleStringFilter filter = new SimpleStringFilter("caption", event.getText(), true, false);
+                    SimpleStringFilter filter = new SimpleStringFilter(CAPTION_ITEM_PROPERTY, event.getText(), true, false);
                     ds.addContainerFilter(filter);
                 }
             }
@@ -415,7 +417,12 @@ private void addPublicDatasets() {
     private void addTreeItem(CkanTreeItem item, CkanTreeItem parent, boolean childrenAllowed) {
 
         // adding item and property for filtering
-        datasetResourceTree.addItem(item).getItemProperty("caption").setValue(item.toString());
+        Item addedItem = datasetResourceTree.addItem(item);
+        if (addedItem == null) { // item is already in the tree
+        	LOG.warn("Item '" + item + "' (id=" + item.getId() + ") is already in the tree. (Parent=" + parent + ")");
+			return;
+		}
+        addedItem.getItemProperty(CAPTION_ITEM_PROPERTY).setValue(item.toString());
         datasetResourceTree.setChildrenAllowed(item, childrenAllowed);
 
         if (item instanceof DatasetItem) {
@@ -436,7 +443,7 @@ private void setDatasetParent(Tree tree, DatasetItem dataset) {
 
         Item orgItem = tree.getItem(orgItemId);
         if (orgItem == null) {
-            tree.addItem(orgItemId).getItemProperty("caption").setValue(orgItemId.toString());
+            tree.addItem(orgItemId).getItemProperty(CAPTION_ITEM_PROPERTY).setValue(orgItemId.toString());
         }
 
         tree.setParent(dataset, orgItemId);

src/main/java/org/opendatanode/plugins/extractor/ckan/file/ResourceItem.java

@@ -53,28 +53,34 @@ public String getDescription() {
         return description;
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((id == null) ? 0 : id.hashCode());
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		result = prime * result + ((packageId == null) ? 0 : packageId.hashCode());
+		return result;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        ResourceItem other = (ResourceItem) obj;
-        if (id == null) {
-            if (other.id != null)
-                return false;
-        } else if (!id.equals(other.id))
-            return false;
-        return true;
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ResourceItem other = (ResourceItem) obj;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		if (packageId == null) {
+			if (other.packageId != null)
+				return false;
+		} else if (!packageId.equals(other.packageId))
+			return false;
+		return true;
+	}
 }