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/02/28 16:40:39 UTC
[isis] branch master updated: ISIS-1841 further replace guava uses
in applib
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 a98337a ISIS-1841 further replace guava uses in applib
a98337a is described below
commit a98337ad8ffd1261815b7a3e9e1b0445c65175ea
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Feb 28 17:40:35 2018 +0100
ISIS-1841 further replace guava uses in applib
---
.../main/java/org/apache/isis/applib/ModuleOrBuilderAbstract.java | 4 +---
.../main/java/org/apache/isis/applib/domain/DomainObjectList.java | 5 ++---
.../main/java/org/apache/isis/applib/fixtures/LogonFixture.java | 8 +++-----
.../isis/schema/utils/jaxbadapters/PersistentEntitiesAdapter.java | 5 ++---
4 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/ModuleOrBuilderAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/ModuleOrBuilderAbstract.java
index 5f905c6..c138c77 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/ModuleOrBuilderAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/ModuleOrBuilderAbstract.java
@@ -26,8 +26,6 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlTransient;
-import com.google.common.collect.Sets;
-
import org.apache.isis.applib.internal.collections._Lists;
import org.apache.isis.applib.internal.collections._Maps;
import org.apache.isis.applib.internal.collections._Sets;
@@ -60,7 +58,7 @@ abstract class ModuleOrBuilderAbstract<B extends ModuleOrBuilderAbstract<B>> {
}
public B withAdditionalDependencies(final Module... dependencies) {
- return withAdditionalDependencies(Sets.newHashSet(dependencies));
+ return withAdditionalDependencies(_Sets.unmodifiable(dependencies));
}
void withTransitiveFrom(final Module module) {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java b/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
index 34e485b..d97b524 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
@@ -24,8 +24,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import com.google.common.collect.Lists;
-
import org.apache.isis.applib.IsisApplibModule;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
@@ -34,6 +32,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.internal.collections._Lists;
import org.apache.isis.schema.utils.jaxbadapters.PersistentEntitiesAdapter;
@XmlRootElement(name = "list")
@@ -158,7 +157,7 @@ public class DomainObjectList {
public static class ObjectsDomainEvent extends CollectionDomainEvent<Object> { }
@XmlJavaTypeAdapter(PersistentEntitiesAdapter.class)
- private List<Object> objects = Lists.newArrayList();
+ private List<Object> objects = _Lists.newArrayList();
@Collection(
domainEvent = ObjectsDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
index a200c00..ce4e5e4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
@@ -21,10 +21,8 @@ package org.apache.isis.applib.fixtures;
import java.util.List;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
import org.apache.isis.applib.fixturescripts.FixtureScript;
+import org.apache.isis.applib.internal.collections._Lists;
/**
* Indicates that the demo or test should be run as the specified user, with the
@@ -54,7 +52,7 @@ public class LogonFixture implements InstallableFixture {
*/
@Deprecated
public LogonFixture(final String username, final String... roles) {
- this(username, Lists.newArrayList(roles));
+ this(username, _Lists.unmodifiable(roles));
}
/**
@@ -63,7 +61,7 @@ public class LogonFixture implements InstallableFixture {
@Deprecated
public LogonFixture(final String username, final List<String> roles) {
this.username = username;
- this.roles = ImmutableList.copyOf(roles);
+ this.roles = _Lists.unmodifiable(roles);
}
/**
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntitiesAdapter.java b/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntitiesAdapter.java
index b976212..3e2e2a1 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntitiesAdapter.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntitiesAdapter.java
@@ -21,8 +21,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.xml.bind.annotation.adapters.XmlAdapter;
-import com.google.common.collect.Lists;
-
+import org.apache.isis.applib.internal.collections._Lists;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.schema.common.v1.OidDto;
@@ -33,7 +32,7 @@ public class PersistentEntitiesAdapter extends XmlAdapter<OidsDto, List<Object>>
@Override
public List<Object> unmarshal(final OidsDto oidsDto) {
- List<Object> domainObjects = Lists.newArrayList();
+ List<Object> domainObjects = _Lists.newArrayList();
for (final OidDto oidDto : oidsDto.getOid()) {
final Bookmark bookmark = Bookmark.from(oidDto);
Object domainObject = bookmarkService.lookup(bookmark, BookmarkService.FieldResetPolicy.DONT_RESET);
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.