Merge pull request #263 from europeana/EA-3062_fix-missing-webresources

fixed bug that caused an Aggregation with no webresources to erase pr…
europeana · Jun 27, 2022 · 2173f59 · 2173f59
2 parents 8b11d6b + 42cc964
commit 2173f59
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/corelib-storage/src/main/java/eu/europeana/corelib/edm/utils/EdmUtils.java b/corelib-storage/src/main/java/eu/europeana/corelib/edm/utils/EdmUtils.java
@@ -554,8 +554,10 @@ private static void appendAggregation(RDF rdf, List<AggregationImpl> aggregation
             }
             addAsList(aggregation, Rights.class, aggr.getDcRights());
             addAsList(aggregation, HasView.class, aggr.getHasView());
-            EdmWebResourceUtils.createWebResources(rdf, aggr, preserveIdentifiers);
             aggregationList.add(aggregation);
+            if (aggr.getWebResources() != null && !aggr.getWebResources().isEmpty()) {
+                EdmWebResourceUtils.createWebResources(rdf, aggr, preserveIdentifiers);
+            }
         }
         rdf.setAggregationList(aggregationList);
     }

diff --git a/corelib-storage/src/main/java/eu/europeana/corelib/edm/utils/EdmWebResourceUtils.java b/corelib-storage/src/main/java/eu/europeana/corelib/edm/utils/EdmWebResourceUtils.java
@@ -82,7 +82,9 @@ public static void createWebResources(RDF rdf, AggregationImpl aggr,
             setIsReferencedBy(wr, wResource);
             webResources.add(wResource);
         }
-
+        if (rdf.getWebResourceList() != null && !rdf.getWebResourceList().isEmpty()) {
+            webResources.addAll(rdf.getWebResourceList());
+        }
         rdf.setWebResourceList(webResources);
     }