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/13 18:38:42 UTC
[isis] 03/04: ISIS-1976: cleaning up
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch ISIS-1976-rethink-object-adapters
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d283f14b0a7202dce77dcf0040ae1c20fd12aa48
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 13 17:22:07 2018 +0200
ISIS-1976: cleaning up
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../core/metamodel/facetapi/FacetHolderImpl.java | 1 -
.../isis/core/metamodel/facetapi/FacetUtil.java | 35 ----------------------
.../facets/fallback/FallbackFacetFactory.java | 11 +++----
.../facets/members/hidden/HiddenFacetAbstract.java | 4 ++-
.../specimpl/OneToManyAssociationDefault.java | 4 ++-
5 files changed, 12 insertions(+), 43 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java
index 239f90c..b0a15e9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java
@@ -20,7 +20,6 @@
package org.apache.isis.core.metamodel.facetapi;
import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
import java.util.HashMap;
import java.util.Map;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
index 0fbbaff..60faedb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.core.runtime.snapshot.XmlSchema.ExtensionData;
@@ -80,20 +79,6 @@ public final class FacetUtil {
*
* @return <tt>true</tt> if any facets were added, <tt>false</tt> otherwise.
*/
- public static boolean addFacets(final Facet[] facets) {
- boolean addedFacets = false;
- for (final Facet facet : facets) {
- addedFacets = addFacet(facet) | addedFacets;
- }
- return addedFacets;
- }
-
- /**
- * Attaches each {@link Facet} to its {@link Facet#getFacetHolder() facet
- * holder}.
- *
- * @return <tt>true</tt> if any facets were added, <tt>false</tt> otherwise.
- */
public static boolean addFacets(final List<Facet> facetList) {
boolean addedFacets = false;
for (final Facet facet : facetList) {
@@ -119,14 +104,6 @@ public final class FacetUtil {
facetsByClass.put(facet.facetType(), facet);
}
- public static Facet[] toArray(final List<Facet> facetList) {
- if (facetList == null) {
- return new Facet[0];
- } else {
- return facetList.toArray(new Facet[] {});
- }
- }
-
public static <T extends Facet> ExtensionData<T> getFacetsByType(final FacetHolder facetHolder) {
return new ExtensionData<T>() {
@@ -145,18 +122,6 @@ public final class FacetUtil {
};
}
-
-
-
-// public static Hashtable<Class<? extends Facet>, Facet> getFacetsByType(final FacetHolder facetHolder) {
-// final Hashtable<Class<? extends Facet>, Facet> facetByType = new Hashtable<Class<? extends Facet>, Facet>();
-// final Class<? extends Facet>[] facetsFor = facetHolder.getFacetTypes();
-// for (final Class<? extends Facet> facetType : facetsFor) {
-// final Facet facet = facetHolder.getFacet(facetType);
-// facetByType.put(facetType, facet);
-// }
-// return facetByType;
-// }
public static void copyFacets(final FacetHolder source, final FacetHolder target) {
source.streamFacets()
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
index 9d799ee..f48d9616 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
@@ -80,11 +80,12 @@ public class FallbackFacetFactory extends FacetFactoryAbstract {
final int pagedStandalone = getPagedConfigSetting("standalone", PAGE_SIZE_STANDALONE_DEFAULT);
final PagedFacetFromConfiguration pagedFacet = new PagedFacetFromConfiguration(pagedStandalone, facetHolder);
- final Facet[] facets = new Facet[] { describedAsFacet,
- // commenting these out, think this whole isNoop business is a little bogus
- // new ImmutableFacetNever(holder),
- titleFacet, pagedFacet};
- FacetUtil.addFacets(facets);
+ FacetUtil.addFacet(describedAsFacet);
+ // commenting these out, think this whole isNoop business is a little bogus
+ //FacetUtil.addFacet(new ImmutableFacetNever(holder));
+ FacetUtil.addFacet(titleFacet);
+ FacetUtil.addFacet(pagedFacet);
+
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
index 6212d4f..2e0492e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.members.hidden;
+import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
+
import java.util.function.Predicate;
import java.util.stream.Stream;
@@ -82,7 +84,7 @@ public abstract class HiddenFacetAbstract extends WhereValueFacetAbstract implem
@Override
public <T extends Facet> T getFacet(final Class<T> facet) {
- return (T) this;
+ return uncheckedCast(this);
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
index e0391d3..8276e67 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
@@ -191,7 +191,9 @@ public class OneToManyAssociationDefault extends ObjectAssociationAbstract imple
}
if (readWrite()) {
if (ownerAdapter.representsPersistent() && referencedAdapter.isTransient()) {
- throw new IsisException("can't set a reference to a transient object from a persistent one: " + ownerAdapter.titleString(null) + " (persistent) -> " + referencedAdapter.titleString() + " (transient)");
+ throw new IsisException("can't set a reference to a transient object from a persistent one: "
+ + ownerAdapter.titleString(null)
+ + " (persistent) -> " + referencedAdapter.titleString() + " (transient)");
}
final CollectionAddToFacet facet = getFacet(CollectionAddToFacet.class);
facet.add(ownerAdapter, referencedAdapter, interactionInitiatedBy);