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/25 20:42:33 UTC
[isis] 02/04: ISIS-1976: remove deprecated CollectionFacetUtils
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 4ffe04f017fc5d2da15de73de81c5b2354b61c5c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Sep 25 17:55:55 2018 +0200
ISIS-1976: remove deprecated CollectionFacetUtils
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../collections/modify/CollectionFacetUtils.java | 47 ----------------------
.../isis/core/runtime/snapshot/IsisSchema.java | 3 +-
.../ObjectCollectionReprRenderer.java | 6 +--
.../ContentNegotiationServiceOrgApacheIsisV1.java | 3 +-
4 files changed, 4 insertions(+), 55 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacetUtils.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacetUtils.java
deleted file mode 100644
index fca5be2..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionFacetUtils.java
+++ /dev/null
@@ -1,47 +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.facets.collections.modify;
-
-import java.util.List;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-
-@Deprecated
-public final class CollectionFacetUtils {
-
- private CollectionFacetUtils() {
- }
-
- @Deprecated
- public static CollectionFacet getCollectionFacetFromSpec(final ObjectAdapter objectRepresentingCollection) {
- return CollectionFacet.Utils.getCollectionFacetFromSpec(objectRepresentingCollection);
- }
-
- @Deprecated
- public static int size(final ObjectAdapter collection) {
- return CollectionFacet.Utils.size(collection);
- }
-
- @Deprecated
- public static List<ObjectAdapter> convertToAdapterList(final ObjectAdapter collection) {
- return CollectionFacet.Utils.convertToAdapterList(collection);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/IsisSchema.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/IsisSchema.java
index 4b8c6c2..37be3cd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/IsisSchema.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/IsisSchema.java
@@ -24,7 +24,6 @@ import org.w3c.dom.Element;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
/**
* Utility methods relating to the Isis meta model.
@@ -175,7 +174,7 @@ final class IsisSchema {
void setIsisCollection(final Element element, final String prefix, final String fullyQualifiedClassName, final ObjectAdapter collection) {
setAttribute(element, "feature", FEATURE_COLLECTION);
setAttribute(element, "type", prefix + ":" + fullyQualifiedClassName);
- final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
+ final CollectionFacet facet = CollectionFacet.Utils.getCollectionFacetFromSpec(collection);
setAttribute(element, "size", "" + facet.size(collection));
}
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
index 47cdcf9..1531d24 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
@@ -20,13 +20,11 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-import org.apache.isis.commons.internal.collections._Lists;
-
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -91,7 +89,7 @@ public class ObjectCollectionReprRenderer extends AbstractObjectMemberReprRender
final LinkFollowSpecs followHref = linkFollower.follow("href");
boolean eagerlyRender = rendererContext.honorUiHints() && renderEagerly(valueAdapter) || !followHref.isTerminated();
- final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(valueAdapter);
+ final CollectionFacet facet = CollectionFacet.Utils.getCollectionFacetFromSpec(valueAdapter);
final List<JsonRepresentation> list = _Lists.newArrayList();
for (final ObjectAdapter elementAdapter : facet.iterable(valueAdapter)) {
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
index e931cdc..77e3ce9 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
@@ -33,7 +33,6 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -375,7 +374,7 @@ public class ContentNegotiationServiceOrgApacheIsisV1 extends ContentNegotiation
return;
}
- final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(valueAdapter);
+ final CollectionFacet facet = CollectionFacet.Utils.getCollectionFacetFromSpec(valueAdapter);
final Iterable<ObjectAdapter> iterable = facet.iterable(valueAdapter);
appendIterableTo(rendererContext, iterable, representation);
}