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/10/04 13:05:17 UTC
[isis] 02/03: ISIS-1976: remove guava from DN-4/5 plugins
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 eac84c28380aa19b7e0e8d7a945e5f146dbb6a58
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 4 14:09:59 2018 +0200
ISIS-1976: remove guava from DN-4/5 plugins
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../isis/applib/services/jdosupport/IsisJdoSupportDN4.java | 5 ++---
.../persistence/DataNucleusApplicationComponents4.java | 14 ++++++++------
.../runtime/system/persistence/IsisLifecycleListener.java | 5 ++---
.../runtime/system/persistence/PersistenceSession4.java | 5 ++---
.../PersistenceQueryFindUsingApplibQueryProcessor.java | 12 ++++++------
.../objectstore/transaction/PojoAdapterBuilder.java | 6 +++---
.../isis/applib/services/jdosupport/IsisJdoSupportDN5.java | 7 +++----
.../persistence/DataNucleusApplicationComponents5.java | 12 +++++++-----
.../runtime/system/persistence/IsisLifecycleListener.java | 5 ++---
.../runtime/system/persistence/PersistenceSession5.java | 5 ++---
.../PersistenceQueryFindUsingApplibQueryProcessor.java | 7 +++----
.../objectstore/transaction/PojoAdapterBuilder.java | 6 +++---
12 files changed, 43 insertions(+), 46 deletions(-)
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java
index c037d47..ed5f9b1 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java
@@ -35,8 +35,6 @@ import javax.jdo.Extent;
import javax.jdo.PersistenceManager;
import javax.jdo.datastore.JDOConnection;
-import com.google.common.collect.Maps;
-
import org.datanucleus.api.jdo.JDOPersistenceManager;
import org.datanucleus.query.typesafe.BooleanExpression;
import org.datanucleus.query.typesafe.TypesafeQuery;
@@ -46,6 +44,7 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -123,7 +122,7 @@ public class IsisJdoSupportDN4 implements IsisJdoSupport_v3_1 {
final ResultSet rs = statement.executeQuery(sql);
final ResultSetMetaData rsmd = rs.getMetaData();
while(rs.next()) {
- final Map<String,Object> row = Maps.newLinkedHashMap();
+ final Map<String,Object> row = _Maps.newLinkedHashMap();
final int columnCount = rsmd.getColumnCount();
for(int i=0; i<columnCount; i++) {
final Object val = rs.getObject(i+1);
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java
index f10f703..b573d78 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java
@@ -18,16 +18,16 @@
*/
package org.apache.isis.core.runtime.system.persistence;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import java.util.stream.Collectors;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManagerFactory;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Maps;
-
import org.datanucleus.PersistenceNucleusContext;
import org.datanucleus.PropertyNames;
import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
@@ -36,6 +36,7 @@ import org.datanucleus.metadata.MetaDataManager;
import org.datanucleus.store.StoreManager;
import org.datanucleus.store.schema.SchemaAwareStoreManager;
+import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.factory.InstanceUtil;
@@ -191,8 +192,9 @@ public class DataNucleusApplicationComponents4 implements ApplicationScopedCompo
}
private void configureAutoStart(final Set<String> persistableClassNameSet, final Map<String, String> datanucleusProps) {
- final String persistableClassNames = Joiner.on(',').join(persistableClassNameSet);
-
+ final String persistableClassNames =
+ stream(persistableClassNameSet).collect(Collectors.joining(","));
+
// ref: http://www.datanucleus.org/products/datanucleus/jdo/autostart.html
datanucleusProps.put(PropertyNames.PROPERTY_AUTOSTART_MECHANISM, "Classes");
datanucleusProps.put(PropertyNames.PROPERTY_AUTOSTART_MODE, "Checked");
@@ -255,7 +257,7 @@ public class DataNucleusApplicationComponents4 implements ApplicationScopedCompo
static Map<String, JdoNamedQuery> catalogNamedQueries(
Set<String> persistableClassNames, final SpecificationLoader specificationLoader) {
- final Map<String, JdoNamedQuery> namedQueryByName = Maps.newHashMap();
+ final Map<String, JdoNamedQuery> namedQueryByName = _Maps.newHashMap();
for (final String persistableClassName: persistableClassNames) {
final ObjectSpecification spec = specificationLoader.loadSpecification(persistableClassName);
final JdoQueryFacet facet = spec.getFacet(JdoQueryFacet.class);
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener.java
index 9713474..7be46c1 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener.java
@@ -30,10 +30,9 @@ import javax.jdo.listener.InstanceLifecycleEvent;
import javax.jdo.listener.LoadLifecycleListener;
import javax.jdo.listener.StoreLifecycleListener;
-import com.google.common.collect.Maps;
-
import org.datanucleus.enhancement.Persistable;
+import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
public class IsisLifecycleListener
@@ -190,7 +189,7 @@ SuspendableListener {
// PRE, POST
// }
- private static Map<Integer, LifecycleEventType> events = Maps.newHashMap();
+ private static Map<Integer, LifecycleEventType> events = _Maps.newHashMap();
private enum LifecycleEventType {
CREATE(0), LOAD(1), STORE(2), CLEAR(3), DELETE(4), DIRTY(5), DETACH(6), ATTACH(7);
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession4.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession4.java
index 96bc80e..a16c656 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession4.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession4.java
@@ -38,8 +38,6 @@ import javax.jdo.PersistenceManagerFactory;
import javax.jdo.identity.SingleFieldIdentity;
import javax.jdo.listener.InstanceLifecycleListener;
-import com.google.common.collect.Maps;
-
import org.datanucleus.enhancement.Persistable;
import org.datanucleus.exceptions.NucleusObjectNotFoundException;
import org.datanucleus.identity.DatastoreIdImpl;
@@ -50,6 +48,7 @@ import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.iactn.Interaction;
+import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -533,7 +532,7 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
}
private static Map<RootOid, Object> zip(final List<RootOid> rootOids, final Collection<Object> pojos) {
- final Map<RootOid,Object> pojoByOid = Maps.newLinkedHashMap();
+ final Map<RootOid,Object> pojoByOid = _Maps.newLinkedHashMap();
int i = 0;
for (final Object pojo : pojos) {
final RootOid rootOid = rootOids.get(i++);
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
index 37bc877..81a0fd5 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
@@ -24,6 +24,11 @@ import java.util.Map;
import javax.jdo.Query;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -31,11 +36,6 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession4;
import org.apache.isis.objectstore.jdo.datanucleus.metamodel.JdoPropertyUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.isis.commons.internal.collections._Lists;
-import com.google.common.collect.Maps;
public class PersistenceQueryFindUsingApplibQueryProcessor extends PersistenceQueryProcessorAbstract<PersistenceQueryFindUsingApplibQueryDefault> {
@@ -135,7 +135,7 @@ public class PersistenceQueryFindUsingApplibQueryProcessor extends PersistenceQu
}
private static Map<String, Object> unwrap(final Map<String, ObjectAdapter> argumentAdaptersByParameterName) {
- final Map<String, Object> argumentsByParameterName = Maps.newHashMap();
+ final Map<String, Object> argumentsByParameterName = _Maps.newHashMap();
for (final String parameterName : argumentAdaptersByParameterName.keySet()) {
final ObjectAdapter argumentAdapter = argumentAdaptersByParameterName.get(parameterName);
final Object argument = ObjectAdapter.Util.unwrapPojo(argumentAdapter);
diff --git a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
index 2aa948f..c81b763 100644
--- a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
+++ b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
@@ -21,8 +21,7 @@ package org.apache.isis.core.runtime.persistence.objectstore.transaction;
import java.util.Iterator;
-import com.google.common.base.Splitter;
-
+import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
@@ -127,7 +126,8 @@ public class PojoAdapterBuilder {
//test only
PojoAdapterBuilder withOid(String oidAndTitle) {
- final Iterator<String> iterator = Splitter.on("|").split(oidAndTitle).iterator();
+ final Iterator<String> iterator = _Strings.splitThenStream(oidAndTitle, "|").iterator();
+
if(!iterator.hasNext()) { return this; }
withObjectType(iterator.next());
if(!iterator.hasNext()) { return this; }
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java
index dab785b..8668909 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java
@@ -41,6 +41,8 @@ import org.apache.isis.applib.FatalException;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -48,9 +50,6 @@ import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.commons.internal.collections._Lists;
-import com.google.common.collect.Maps;
-
/**
* This service provides a number of utility methods to supplement/support the capabilities of the JDO Objectstore.
@@ -121,7 +120,7 @@ public class IsisJdoSupportDN5 implements IsisJdoSupport_v3_2 {
final ResultSet rs = statement.executeQuery(sql);
final ResultSetMetaData rsmd = rs.getMetaData();
while(rs.next()) {
- final Map<String,Object> row = Maps.newLinkedHashMap();
+ final Map<String,Object> row = _Maps.newLinkedHashMap();
final int columnCount = rsmd.getColumnCount();
for(int i=0; i<columnCount; i++) {
final Object val = rs.getObject(i+1);
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
index 0298cba..78b36b4 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
@@ -18,16 +18,16 @@
*/
package org.apache.isis.core.runtime.system.persistence;
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import java.util.stream.Collectors;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManagerFactory;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Maps;
-
import org.datanucleus.PersistenceNucleusContext;
import org.datanucleus.PropertyNames;
import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
@@ -36,6 +36,7 @@ import org.datanucleus.metadata.MetaDataManager;
import org.datanucleus.store.StoreManager;
import org.datanucleus.store.schema.SchemaAwareStoreManager;
+import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.factory.InstanceUtil;
@@ -191,7 +192,8 @@ public class DataNucleusApplicationComponents5 implements ApplicationScopedCompo
}
private void configureAutoStart(final Set<String> persistableClassNameSet, final Map<String, String> datanucleusProps) {
- final String persistableClassNames = Joiner.on(',').join(persistableClassNameSet);
+ final String persistableClassNames =
+ stream(persistableClassNameSet).collect(Collectors.joining(","));
// ref: http://www.datanucleus.org/products/datanucleus/jdo/autostart.html
datanucleusProps.put(PropertyNames.PROPERTY_AUTOSTART_MECHANISM, "Classes");
@@ -255,7 +257,7 @@ public class DataNucleusApplicationComponents5 implements ApplicationScopedCompo
static Map<String, JdoNamedQuery> catalogNamedQueries(
Set<String> persistableClassNames, final SpecificationLoader specificationLoader) {
- final Map<String, JdoNamedQuery> namedQueryByName = Maps.newHashMap();
+ final Map<String, JdoNamedQuery> namedQueryByName = _Maps.newHashMap();
for (final String persistableClassName: persistableClassNames) {
final ObjectSpecification spec = specificationLoader.loadSpecification(persistableClassName);
final JdoQueryFacet facet = spec.getFacet(JdoQueryFacet.class);
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener.java
index 9713474..7be46c1 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener.java
@@ -30,10 +30,9 @@ import javax.jdo.listener.InstanceLifecycleEvent;
import javax.jdo.listener.LoadLifecycleListener;
import javax.jdo.listener.StoreLifecycleListener;
-import com.google.common.collect.Maps;
-
import org.datanucleus.enhancement.Persistable;
+import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
public class IsisLifecycleListener
@@ -190,7 +189,7 @@ SuspendableListener {
// PRE, POST
// }
- private static Map<Integer, LifecycleEventType> events = Maps.newHashMap();
+ private static Map<Integer, LifecycleEventType> events = _Maps.newHashMap();
private enum LifecycleEventType {
CREATE(0), LOAD(1), STORE(2), CLEAR(3), DELETE(4), DIRTY(5), DETACH(6), ATTACH(7);
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
index 921b202..95c6c1f 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
@@ -38,8 +38,6 @@ import javax.jdo.PersistenceManagerFactory;
import javax.jdo.identity.SingleFieldIdentity;
import javax.jdo.listener.InstanceLifecycleListener;
-import com.google.common.collect.Maps;
-
import org.datanucleus.enhancement.Persistable;
import org.datanucleus.exceptions.NucleusObjectNotFoundException;
import org.datanucleus.identity.DatastoreIdImpl;
@@ -50,6 +48,7 @@ import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.iactn.Interaction;
+import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -532,7 +531,7 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
}
private static Map<RootOid, Object> zip(final List<RootOid> rootOids, final Collection<Object> pojos) {
- final Map<RootOid,Object> pojoByOid = Maps.newLinkedHashMap();
+ final Map<RootOid,Object> pojoByOid = _Maps.newLinkedHashMap();
int i = 0;
for (final Object pojo : pojos) {
final RootOid rootOid = rootOids.get(i++);
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
index e8a1c66..2e70bce 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
@@ -24,12 +24,11 @@ import java.util.Map;
import javax.jdo.Query;
-import org.apache.isis.commons.internal.collections._Lists;
-import com.google.common.collect.Maps;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -136,7 +135,7 @@ public class PersistenceQueryFindUsingApplibQueryProcessor extends PersistenceQu
}
private static Map<String, Object> unwrap(final Map<String, ObjectAdapter> argumentAdaptersByParameterName) {
- final Map<String, Object> argumentsByParameterName = Maps.newHashMap();
+ final Map<String, Object> argumentsByParameterName = _Maps.newHashMap();
for (final String parameterName : argumentAdaptersByParameterName.keySet()) {
final ObjectAdapter argumentAdapter = argumentAdaptersByParameterName.get(parameterName);
final Object argument = ObjectAdapter.Util.unwrapPojo(argumentAdapter);
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
index cbd3ba7..15a370d 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
@@ -21,8 +21,7 @@ package org.apache.isis.core.runtime.persistence.objectstore.transaction;
import java.util.Iterator;
-import com.google.common.base.Splitter;
-
+import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
@@ -126,7 +125,8 @@ public class PojoAdapterBuilder {
}
public PojoAdapterBuilder withOid(String oidAndTitle) {
- final Iterator<String> iterator = Splitter.on("|").split(oidAndTitle).iterator();
+ final Iterator<String> iterator = _Strings.splitThenStream(oidAndTitle, "|").iterator();
+
if(!iterator.hasNext()) { return this; }
withObjectType(iterator.next());
if(!iterator.hasNext()) { return this; }