SLING-10195 switch back to Set examples
diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/sample/osgiserviceutil/Service3.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/sample/osgiserviceutil/Service3.java
index d0485be..4c8504b 100644
--- a/core/src/test/java/org/apache/sling/testing/mock/osgi/sample/osgiserviceutil/Service3.java
+++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/sample/osgiserviceutil/Service3.java
@@ -56,9 +56,9 @@
private volatile List<ServiceSuperInterface3> references3 = new ArrayList<>();
private List<Map<String, Object>> reference3Configs = new ArrayList<>();
- @Reference(name = "references3Set", service = ServiceInterface3.class, cardinality = ReferenceCardinality.MULTIPLE)
- private List<ServiceSuperInterface3> references3Set = new ArrayList<>();
- //TODO: private Set<ServiceSuperInterface3> references3Set = new HashSet<>();
+ @Reference(name = "references3Set", service = ServiceInterface3.class, cardinality = ReferenceCardinality.MULTIPLE,
+ policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY)
+ private volatile Set<ServiceSuperInterface3> references3Set = new HashSet<>();
private ComponentContext componentContext;
private Map<String, Object> config;
@@ -104,8 +104,7 @@
}
public Set<ServiceSuperInterface3> getReferences3Set() {
- return new HashSet<>(this.references3Set);
- //TODO: return this.references3Set;
+ return this.references3Set;
}
public ComponentContext getComponentContext() {
diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/sample/osgiserviceutil/Service3OsgiR6.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/sample/osgiserviceutil/Service3OsgiR6.java
index 3b1a397..fa96b77 100644
--- a/core/src/test/java/org/apache/sling/testing/mock/osgi/sample/osgiserviceutil/Service3OsgiR6.java
+++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/sample/osgiserviceutil/Service3OsgiR6.java
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -63,10 +62,8 @@
name = "reference3DynamicFiltered")
private volatile ServiceSuperInterface3 reference3DynamicFiltered;
- @Reference(service = ServiceInterface3.class, cardinality = ReferenceCardinality.MULTIPLE,
- policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY)
- private volatile List<ServiceSuperInterface3> references3Set;
- //TODO: private Set<ServiceSuperInterface3> references3Set;
+ @Reference(service = ServiceInterface3.class, cardinality = ReferenceCardinality.MULTIPLE)
+ private volatile Set<ServiceSuperInterface3> references3Set;
@Reference(service = ServiceInterface3.class, cardinality = ReferenceCardinality.MULTIPLE,
policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY)
@@ -120,8 +117,7 @@
}
public Set<ServiceSuperInterface3> getReferences3Set() {
- return new HashSet<>(this.references3Set);
- //TODO: return this.references3Set;
+ return this.references3Set;
}
public Collection<ServiceSuperInterface3> getReferences3Collection() {
