You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/09/28 13:58:44 UTC
[isis] 02/07: ISIS-1976: cleanup CollectionData API
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 168354de94e485bdcecdf97b57a2fbf950f0fda7
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 28 10:36:15 2018 +0200
ISIS-1976: cleanup CollectionData API
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../javautilcollection/JavaArrayFacet.java | 16 +++++++----
.../javautilcollection/JavaCollectionFacet.java | 12 ++++----
.../facets/collections/modify/CollectionFacet.java | 3 +-
.../CollectionFacetOnStandaloneList.java | 5 ++--
.../isis/core/runtime/memento/CollectionData.java | 33 +++++++++-------------
.../ObjectAdapterContext_MementoSupport.java | 15 ++++------
6 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
index 5a86a12..a18ad9c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
@@ -20,10 +20,12 @@
package org.apache.isis.core.metamodel.facets.collections.javautilcollection;
import static org.apache.isis.commons.internal.base._NullSafe.isEmpty;
+import static org.apache.isis.commons.internal.collections._Arrays.toArray;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.stream.Stream;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
@@ -43,12 +45,14 @@ public class JavaArrayFacet extends CollectionFacetAbstract {
* Expected to be called with a {@link ObjectAdapter} wrapping an array.
*/
@Override
- public ObjectAdapter init(final ObjectAdapter arrayAdapter, final ObjectAdapter[] initData) {
- final int length = initData.length;
- final Object[] array = new Object[length];
- for (int i = 0; i < length; i++) {
- array[i] = initData[i].getObject();
- }
+ public ObjectAdapter init(
+ final ObjectAdapter arrayAdapter,
+ final Stream<ObjectAdapter> initData,
+ final int elementCount) {
+
+ final Object[] array = initData
+ .map(ObjectAdapter::getObject)
+ .collect(toArray(Object.class, elementCount));
return arrayAdapter.withPojo(array);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
index d52e94d..499984b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.facets.collections.javautilcollection;
import java.util.Collection;
import java.util.Iterator;
+import java.util.stream.Stream;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -38,13 +39,14 @@ public class JavaCollectionFacet extends CollectionFacetAbstract {
}
@Override
- public ObjectAdapter init(final ObjectAdapter collection, final ObjectAdapter[] initData) {
+ public ObjectAdapter init(
+ final ObjectAdapter collection,
+ final Stream<ObjectAdapter> initData,
+ final int elementCount) {
+
final Collection<? super Object> pojoCollection = pojoCollection(collection);
pojoCollection.clear();
- for (final ObjectAdapter element : initData) {
- final Object pojo = element.getObject();
- pojoCollection.add(pojo);
- }
+ initData.forEach(pojoCollection::add);
return collection;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java
index fb6019f..68ac8f1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacet.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import java.util.stream.Stream;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -58,7 +59,7 @@ public interface CollectionFacet extends Facet {
* Set the contents of this collection.
* @return a possibly new instance
*/
- ObjectAdapter init(ObjectAdapter collectionAdapter, ObjectAdapter[] elements);
+ ObjectAdapter init(ObjectAdapter collectionAdapter, Stream<ObjectAdapter> elements, int elementCount);
/**
* Convenience method that returns the {@link TypeOfFacet} on this facet's
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java
index e03fda9..fcfe276 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.metamodel.specloader.specimpl.standalonelist;
import java.util.List;
+import java.util.stream.Stream;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -64,8 +65,8 @@ public class CollectionFacetOnStandaloneList extends CollectionFacetAbstract {
* Does nothing.
*/
@Override
- public ObjectAdapter init(final ObjectAdapter collection, final ObjectAdapter[] initData) {
- return collection;
+ public ObjectAdapter init(ObjectAdapter collectionAdapter, Stream<ObjectAdapter> elements, int elementCount) {
+ return collectionAdapter;
}
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/CollectionData.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/CollectionData.java
index cc1da17..ccb8755 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/CollectionData.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/CollectionData.java
@@ -20,19 +20,21 @@
package org.apache.isis.core.runtime.memento;
import java.io.IOException;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.core.commons.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
public class CollectionData extends Data {
private final static long serialVersionUID = 1L;
- final Data[] elements;
+ private final Data[] elements;
public CollectionData(final Oid oid, final String className, final Data[] elements) {
super(oid, className);
this.elements = elements;
- initialized();
}
@Override
@@ -41,28 +43,19 @@ public class CollectionData extends Data {
output.writeEncodables(elements);
}
- public void initialized() {
- // nothing to do
- }
-
@Override
public String toString() {
- final StringBuffer str = new StringBuffer("(");
- for (int i = 0; i < elements.length; i++) {
- str.append((i > 0) ? "," : "");
- str.append(elements[i]);
- }
- str.append(")");
- return str.toString();
+ return "(" + streamElements()
+ .map(data->""+data)
+ .collect(Collectors.joining(",")) + ")";
}
- /**
- * FIXME[ISIS-1976] only introduced for refactoring.
- */
- @Deprecated
- public Data[] getElements() {
- return elements;
+ public Stream<Data> streamElements() {
+ return _NullSafe.stream(elements);
+ }
+
+ public int getElementCount() {
+ return _NullSafe.size(elements);
}
-
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_MementoSupport.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_MementoSupport.java
index fefe04d..f31d9e5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_MementoSupport.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_MementoSupport.java
@@ -131,13 +131,11 @@ class ObjectAdapterContext_MementoSupport implements MementoRecreateObjectSuppor
}
private ObjectAdapter populateCollection(final ObjectAdapter collectionAdapter, final CollectionData state) {
- final ObjectAdapter[] initData = new ObjectAdapter[state.getElements().length];
- int i = 0;
- for (final Data elementData : state.getElements()) {
- initData[i++] = recreateReference(elementData);
- }
+ final Stream<ObjectAdapter> initData = state.streamElements()
+ .map((final Data elementData) -> recreateReference(elementData));
+
final CollectionFacet facet = collectionAdapter.getSpecification().getFacet(CollectionFacet.class);
- return facet.init(collectionAdapter, initData);
+ return facet.init(collectionAdapter, initData, state.getElementCount());
}
private void updateFieldsAndResolveState(final ObjectAdapter objectAdapter, final Data data) {
@@ -207,8 +205,7 @@ class ObjectAdapterContext_MementoSupport implements MementoRecreateObjectSuppor
original.add(adapter);
}
- final Data[] elements = collectionData.getElements();
- for (final Data data : elements) {
+ collectionData.streamElements().forEach((final Data data) -> {
final ObjectAdapter elementAdapter = recreateReference(data);
if (!facet.contains(collection, elementAdapter)) {
if (LOG.isDebugEnabled()) {
@@ -218,7 +215,7 @@ class ObjectAdapterContext_MementoSupport implements MementoRecreateObjectSuppor
} else {
otma.removeElement(objectAdapter, elementAdapter, InteractionInitiatedBy.FRAMEWORK);
}
- }
+ });
for (final ObjectAdapter element : original) {
if (LOG.isDebugEnabled()) {