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 2020/01/16 23:16:15 UTC
[isis] branch master updated: ISIS-2265: removes FreeStandingList,
replaced by interface 'Container'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 6295636 ISIS-2265: removes FreeStandingList, replaced by interface 'Container'
6295636 is described below
commit 6295636ec4de93271a7f680d3dccca4b95dbb271
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 17 00:15:12 2020 +0100
ISIS-2265: removes FreeStandingList, replaced by interface 'Container'
Container has no implementing class (might be removed as well)
---
.../apache/isis/core/metamodel/spec/Container.java | 8 ++-
.../isis/core/metamodel/spec/FreeStandingList.java | 80 ----------------------
.../standalonelist/CollectionFacetOnContainer.java | 17 ++---
.../ObjectSpecificationOnContainer.java | 3 +-
4 files changed, 15 insertions(+), 93 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Container.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Container.java
index b62272d..0073f0c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Container.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Container.java
@@ -18,8 +18,10 @@
*/
package org.apache.isis.core.metamodel.spec;
+import java.util.stream.Stream;
+
/**
- * possibly just temporary for refactoring
+ * Possibly just temporary for refactoring, as of FreeStandingList being removed.
*
* @since 2.0
*/
@@ -29,4 +31,8 @@ public interface Container {
String titleString();
+ Stream<ManagedObject> stream();
+
+ int size();
+
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/FreeStandingList.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/FreeStandingList.java
deleted file mode 100644
index 5b43e41..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/FreeStandingList.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.spec;
-
-import java.util.stream.Stream;
-
-import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.core.metamodel.commons.ToString;
-
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
-/**
- * A list returned from an action, ie not associated or owned by any entity.
- */
-@RequiredArgsConstructor(staticName = "of")
-public class FreeStandingList implements Container {
-
- @Getter(onMethod = @__(@Override))
- @NonNull private final ObjectSpecification elementSpecification;
- @NonNull private final Can<ManagedObject> elements;
-
- public Stream<ManagedObject> stream() {
- return elements.stream();
- }
-
- public int size() {
- return elements.size();
- }
-
- @Override
- public String titleString() {
- switch(elements.getCardinality()) {
- case ONE:
- return getElementSpecification().getSingularName();
- default:
- return getElementSpecification().getPluralName() + ", " + size();
- }
- }
-
- @Override
- public String toString() {
- final ToString s = new ToString(this);
- s.append("elements", getElementSpecification().getFullIdentifier());
-
- // title
- String title;
- try {
- title = "'" + this.titleString() + "'";
- } catch (final NullPointerException e) {
- title = "none";
- }
- s.append("title", title);
-
- s.append("vector", elements);
-
- return s.toString();
- }
-
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnContainer.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnContainer.java
index 93f3e46..2fb87a1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnContainer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnContainer.java
@@ -25,12 +25,10 @@ import java.util.stream.Stream;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.CollectionFacetAbstract;
-import org.apache.isis.core.metamodel.spec.FreeStandingList;
+import org.apache.isis.core.metamodel.spec.Container;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import lombok.val;
-
public class CollectionFacetOnContainer extends CollectionFacetAbstract {
public CollectionFacetOnContainer(final FacetHolder holder) {
@@ -38,9 +36,8 @@ public class CollectionFacetOnContainer extends CollectionFacetAbstract {
}
@Override
- public Stream<ManagedObject> stream(ManagedObject container) {
- val list = unwrap(container);
- return list.stream();
+ public Stream<ManagedObject> stream(ManagedObject wrappedContainer) {
+ return unwrap(wrappedContainer).stream();
}
/**
@@ -48,8 +45,8 @@ public class CollectionFacetOnContainer extends CollectionFacetAbstract {
* {@link FreeStandingList}.
*/
@Override
- public int size(final ManagedObject wrappedInstanceCollectionVector) {
- return unwrap(wrappedInstanceCollectionVector).size();
+ public int size(final ManagedObject wrappedContainer) {
+ return unwrap(wrappedContainer).size();
}
@Override
@@ -64,8 +61,8 @@ public class CollectionFacetOnContainer extends CollectionFacetAbstract {
// -- HELPER
- private FreeStandingList unwrap(final ManagedObject wrappedObjectList) {
- return (FreeStandingList) wrappedObjectList.getPojo();
+ private Container unwrap(final ManagedObject wrappedContainer) {
+ return (Container) wrappedContainer.getPojo();
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnContainer.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnContainer.java
index f998da9..3d76697 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnContainer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnContainer.java
@@ -71,8 +71,7 @@ public class ObjectSpecificationOnContainer extends ObjectSpecificationAbstract
loadSpecOfSuperclass(Object.class);
addFacet(new CollectionFacetOnContainer(this));
- addFacet(new TypeOfFacetDefaultToObject(this) {
- });
+ addFacet(new TypeOfFacetDefaultToObject(this) {});
// ObjectList specific
FacetUtil.addFacet(new NamedFacetOnStandaloneList(NAME, this));