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/08/31 15:31:38 UTC
[isis] 03/09: ISIS-1976: remove some deprecated features
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
commit 3c80e9a5d8f5a61da514308e6c5131631eea1f0e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 31 16:34:19 2018 +0200
ISIS-1976: remove some deprecated features
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../isis/core/metamodel/adapter/ObjectAdapter.java | 13 +------------
.../ActionInvocationFacetForDomainEventAbstract.java | 17 +++++++++++------
.../javautilcollection/JavaCollectionFacet.java | 3 ++-
.../isis/core/metamodel/spec/ObjectAdapterUtils.java | 2 --
4 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index 0d1a002..3aa0365 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -200,8 +200,7 @@ public interface ObjectAdapter extends Instance {
public final class Util {
- private Util() {
- }
+ private Util() {}
public static Object unwrap(final ObjectAdapter adapter) {
return adapter != null ? adapter.getObject() : null;
@@ -477,16 +476,6 @@ public interface ObjectAdapter extends Instance {
return Util::unwrap;
}
- @Deprecated
- public static com.google.common.base.Function<ObjectAdapter, Object> get_Object() {
- return new com.google.common.base.Function<ObjectAdapter, Object>() {
- @Override
- public Object apply(ObjectAdapter input) {
- return Util.unwrap(input);
- }
- };
- }
-
public static Function<Object, ObjectAdapter> adapterForUsing(final AdapterManager adapterManager) {
return adapterManager::adapterFor;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 3fdc0ba..bf94a59 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.actions.action.invocation;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.sql.Timestamp;
@@ -27,6 +29,12 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import com.google.common.base.Strings;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.RecoverableException;
@@ -76,11 +84,6 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember2;
import org.apache.isis.core.runtime.system.transaction.TransactionalClosure;
import org.apache.isis.schema.ixn.v1.ActionInvocationDto;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
public abstract class ActionInvocationFacetForDomainEventAbstract
extends ActionInvocationFacetAbstract
@@ -503,7 +506,9 @@ implements ImperativeFacet {
interactionInitiatedBy);
final Object visibleObjects =
CollectionUtils.copyOf(
- Lists.transform(visibleAdapters, ObjectAdapter.Functions.get_Object()),
+ stream(visibleAdapters)
+ .map(ObjectAdapter.Functions.getObject())
+ .collect(Collectors.toList()),
method.getReturnType());
if (visibleObjects != null) {
return getPersistenceSessionServiceInternal().adapterFor(visibleObjects);
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 e0502d9..e696609 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
@@ -42,7 +42,8 @@ public class JavaCollectionFacet extends CollectionFacetAbstract {
public Collection<ObjectAdapter> collection(final ObjectAdapter wrappedCollection) {
final Collection<?> collectionOfUnderlying = collectionOfUnderlying(wrappedCollection);
- //TODO [ahuber] java doc states, this is a live view, don't know if this is needed, or if a copy is sufficient
+ //TODO [ahuber] java doc states, this is a live view, don't know if this is needed,
+ // or if a copy is sufficient
return Collections2.transform(collectionOfUnderlying,
ObjectAdapter.Functions.adapter_ForUsing(getAdapterManager()));
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectAdapterUtils.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectAdapterUtils.java
index 9f54613..2433ae8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectAdapterUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectAdapterUtils.java
@@ -18,8 +18,6 @@ package org.apache.isis.core.metamodel.spec;
import java.util.List;
-import com.google.common.collect.Lists;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
/**