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 2019/09/27 08:55:12 UTC
[isis] branch v2 updated: ISIS-2158: fixes several bugs introduced
with previous commit
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
The following commit(s) were added to refs/heads/v2 by this push:
new e979d2f ISIS-2158: fixes several bugs introduced with previous commit
e979d2f is described below
commit e979d2f1381fb2f12c9068f74d0e5d6ccd1d5858
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 27 10:55:03 2019 +0200
ISIS-2158: fixes several bugs introduced with previous commit
---
.../isis/commons/internal/base/_Strings.java | 5 +-
.../SpringServiceProvisioningTest.java | 8 +-
.../bootstrapping/builtin-requestscoped.json | 10 ---
.../bootstrapping/builtin-requestscoped.list | 8 ++
.../bootstrapping/builtin-singleton.json | 75 ------------------
.../bootstrapping/builtin-singleton.list | 90 ++++++++++++++++++++++
6 files changed, 106 insertions(+), 90 deletions(-)
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
index 5db2260..c12d96f 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
@@ -44,6 +44,7 @@ import static org.apache.isis.commons.internal.base._Strings_SplitIterator.split
import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
import static org.apache.isis.commons.internal.base._With.requires;
import static org.apache.isis.commons.internal.base._With.requiresNotEmpty;
+import static org.apache.isis.commons.internal.functions._Predicates.not;
/**
* <h1>- internal use only -</h1>
@@ -520,7 +521,7 @@ public final class _Strings {
public static Stream<String> splitThenStreamTrimmed(@Nullable String input, String separator) {
return splitThenStream(input, separator)
.map(String::trim)
- .filter(String::isEmpty);
+ .filter(not(String::isEmpty));
}
/**
@@ -531,7 +532,7 @@ public final class _Strings {
public static Stream<String> splitThenStreamTrimmed(@Nullable CharSequence input, Pattern delimiterPattern) {
return splitThenStream(input, delimiterPattern)
.map(String::trim)
- .filter(String::isEmpty);
+ .filter(not(String::isEmpty));
}
}
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
index be426ab..b618d3f 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
@@ -19,7 +19,6 @@
package org.apache.isis.testdomain.bootstrapping;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import java.util.TreeSet;
import java.util.stream.Collectors;
@@ -38,6 +37,7 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import static org.apache.isis.commons.internal.collections._Collections.toStringJoiningNewLine;
import static org.apache.isis.commons.internal.collections._Sets.intersectSorted;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import lombok.val;
@@ -68,11 +68,13 @@ class SpringServiceProvisioningTest {
.map(Class::getName)
.collect(Collectors.toCollection(TreeSet::new));
- val singletonListing = _Resources.loadAsString(
- this.getClass(), "builtin-IsisBoot.json", StandardCharsets.UTF_8);
+ val singletonListing = _Resources.loadAsStringUtf8(this.getClass(), "builtin-singleton.list");
val expectedSingletons = _Strings.splitThenStreamTrimmed(singletonListing, "\n")
+ .filter(entry->!entry.startsWith("#"))
.collect(Collectors.toCollection(TreeSet::new));
+ assertFalse(expectedSingletons.isEmpty());
+
val servicesFound = toStringJoiningNewLine(managedServices);
System.out.println("--- Beans discovered by Isis ---");
System.out.println(servicesFound);
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.json b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.json
deleted file mode 100644
index a4f90ff..0000000
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- "org.apache.isis.applib.services.command.CommandContext",
- "org.apache.isis.applib.services.iactn.InteractionContext",
- "org.apache.isis.applib.services.queryresultscache.QueryResultsCacheInternal",
- "org.apache.isis.applib.services.scratchpad.Scratchpad",
- "org.apache.isis.core.runtime.services.changes.ChangedObjectsServiceInternal",
- "org.apache.isis.core.runtime.services.metrics.MetricsServiceDefault",
- "org.apache.isis.core.runtime.services.publish.PublishingServiceInternalDefault",
- "org.apache.isis.objectstore.jdo.datanucleus.service.support.TimestampService"
-]
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
new file mode 100644
index 0000000..13a4d7e
--- /dev/null
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
@@ -0,0 +1,8 @@
+org.apache.isis.applib.services.command.CommandContext
+org.apache.isis.applib.services.iactn.InteractionContext
+org.apache.isis.applib.services.queryresultscache.QueryResultsCacheInternal
+org.apache.isis.applib.services.scratchpad.Scratchpad
+org.apache.isis.runtime.services.changes.ChangedObjectsServiceInternal
+org.apache.isis.runtime.services.metrics.MetricsServiceDefault
+org.apache.isis.runtime.services.publish.PublishingServiceInternalDefault
+org.apache.isis.objectstore.jdo.datanucleus.service.support.TimestampService
\ No newline at end of file
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.json b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.json
deleted file mode 100644
index 24b3fc5..0000000
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.json
+++ /dev/null
@@ -1,75 +0,0 @@
-[
- "org.apache.isis.applib.conmap.ContentMappingServiceForCommandDto",
- "org.apache.isis.applib.conmap.ContentMappingServiceForCommandDto$CopyOverFromCommand",
- "org.apache.isis.applib.conmap.ContentMappingServiceForCommandsDto",
- "org.apache.isis.applib.fixturescripts.ExecutionParametersService",
- "org.apache.isis.applib.mixins.dto.DtoMappingHelper",
- "org.apache.isis.applib.services.audit.AuditerServiceLogging",
- "org.apache.isis.applib.services.classdiscovery.ClassDiscoveryServiceDefault",
- "org.apache.isis.applib.services.clock.ClockService",
- "org.apache.isis.applib.services.confview.ConfigurationMenu",
- "org.apache.isis.applib.services.exceprecog.jdo.ExceptionRecognizerCompositeForJdoObjectStore",
- "org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault",
- "org.apache.isis.applib.services.h2.H2ManagerMenu",
- "org.apache.isis.applib.services.hsqldb.HsqlDbManagerMenu",
- "org.apache.isis.applib.services.jaxb.JaxbServiceDefault",
- "org.apache.isis.applib.services.jdosupport.IsisJdoSupportDN5",
- "org.apache.isis.applib.services.layout.LayoutServiceMenu",
- "org.apache.isis.applib.services.metamodel.MetaModelServicesMenu",
- "org.apache.isis.applib.services.publish.PublisherServiceLogging",
- "org.apache.isis.applib.services.queryresultscache.QueryResultsCacheControlInternal",
- "org.apache.isis.applib.services.routing.RoutingServiceDefault",
- "org.apache.isis.applib.services.swagger.SwaggerServiceMenu",
- "org.apache.isis.applib.services.tablecol.TableColumnOrderService$Default",
- "org.apache.isis.applib.services.urlencoding.UrlEncodingServiceWithCompression",
- "org.apache.isis.config.builder.IsisConfigurationDefault",
- "org.apache.isis.config.services.view.ConfigurationViewServiceDefault",
- "org.apache.isis.core.integtestsupport.components.HeadlessTransactionSupportDefault",
- "org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureFactory",
- "org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureRepositoryDefault",
- "org.apache.isis.core.metamodel.services.bookmarks.BookmarkServiceInternalDefault",
- "org.apache.isis.core.metamodel.services.exceprecog.ExceptionRecognizerDocDefault",
- "org.apache.isis.core.metamodel.services.factory.FactoryServiceInternalDefault",
- "org.apache.isis.core.metamodel.services.grid.GridLoaderServiceDefault",
- "org.apache.isis.core.metamodel.services.grid.GridServiceDefault",
- "org.apache.isis.core.metamodel.services.grid.bootstrap3.GridSystemServiceBS3",
- "org.apache.isis.core.metamodel.services.layout.LayoutServiceDefault",
- "org.apache.isis.core.metamodel.services.message.MessageServiceNoop",
- "org.apache.isis.core.metamodel.services.metamodel.MetaModelServiceDefault",
- "org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternalNoop",
- "org.apache.isis.core.metamodel.services.registry.ServiceRegistryDefault",
- "org.apache.isis.core.metamodel.services.repository.RepositoryServiceInternalDefault",
- "org.apache.isis.core.metamodel.services.swagger.SwaggerServiceDefault",
- "org.apache.isis.core.metamodel.services.title.TitleServiceDefault",
- "org.apache.isis.core.metamodel.services.user.UserServiceDefault",
- "org.apache.isis.core.metamodel.services.user.UserServiceDefault$SudoServiceSpi",
- "org.apache.isis.core.metamodel.specloader.SpecificationLoader",
- "org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandard",
- "org.apache.isis.core.runtime.services.auditing.AuditingServiceInternal",
- "org.apache.isis.core.runtime.services.authsess.AuthenticationSessionProviderDefault",
- "org.apache.isis.core.runtime.services.background.BackgroundServiceDefault",
- "org.apache.isis.core.runtime.services.background.CommandExecutorServiceDefault",
- "org.apache.isis.core.runtime.services.command.CommandDtoServiceInternalDefault",
- "org.apache.isis.core.runtime.services.command.CommandServiceDefault",
- "org.apache.isis.core.runtime.services.email.EmailServiceDefault",
- "org.apache.isis.core.runtime.services.homepage.HomePageProviderServiceDefault",
- "org.apache.isis.core.runtime.services.i18n.po.TranslationServicePo",
- "org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu",
- "org.apache.isis.core.runtime.services.ixn.InteractionDtoServiceInternalDefault",
- "org.apache.isis.core.runtime.services.menubars.MenuBarsLoaderServiceDefault",
- "org.apache.isis.core.runtime.services.menubars.bootstrap3.MenuBarsServiceBS3",
- "org.apache.isis.core.runtime.services.message.MessageServiceDefault",
- "org.apache.isis.core.runtime.services.persistsession.PersistenceSessionServiceInternalDefault",
- "org.apache.isis.core.runtime.services.sessmgmt.SessionManagementServiceDefault",
- "org.apache.isis.core.runtime.services.sse.EventStreamServiceDefault",
- "org.apache.isis.core.runtime.services.sudo.SudoServiceDefault",
- "org.apache.isis.core.runtime.services.userprof.UserProfileServiceDefault",
- "org.apache.isis.core.runtime.services.userreg.EmailNotificationServiceDefault",
- "org.apache.isis.core.runtime.services.xactn.TransactionServiceDefault",
- "org.apache.isis.core.runtime.services.xmlsnapshot.XmlSnapshotServiceDefault",
- "org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory5",
- "org.apache.isis.core.runtime.system.session.IsisSessionFactory",
- "org.apache.isis.security.authentication.standard.AuthenticationManagerStandard",
- "org.apache.isis.core.wrapper.WrapperFactoryDefault",
- "org.apache.isis.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo"
-]
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
new file mode 100644
index 0000000..d45a8f7
--- /dev/null
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
@@ -0,0 +1,90 @@
+org.apache.isis.applib.conmap.ContentMappingServiceForCommandDto
+org.apache.isis.applib.conmap.ContentMappingServiceForCommandDto$CopyOverFromCommand
+org.apache.isis.applib.conmap.ContentMappingServiceForCommandsDto
+org.apache.isis.applib.mixins.dto.DtoMappingHelper
+org.apache.isis.applib.services.audit.AuditerServiceLogging
+org.apache.isis.applib.services.clock.ClockService
+org.apache.isis.applib.services.command.CommandContext
+org.apache.isis.applib.services.confview.ConfigurationMenu
+org.apache.isis.applib.services.iactn.InteractionContext
+org.apache.isis.applib.services.jaxb.JaxbServiceDefault
+org.apache.isis.applib.services.layout.LayoutServiceMenu
+org.apache.isis.applib.services.metamodel.MetaModelServicesMenu
+org.apache.isis.applib.services.publish.PublisherServiceLogging
+org.apache.isis.applib.services.queryresultscache.QueryResultsCacheInternal
+org.apache.isis.applib.services.scratchpad.Scratchpad
+org.apache.isis.applib.services.swagger.SwaggerServiceMenu
+org.apache.isis.applib.services.tablecol.TableColumnOrderService$Default
+org.apache.isis.applib.services.urlencoding.UrlEncodingServiceWithCompression
+org.apache.isis.config.beans.WebAppConfigBean
+#org.apache.isis.extensions.fixtures.FixturesEventService
+#org.apache.isis.extensions.fixtures.FixturesLifecyleService
+#org.apache.isis.extensions.fixtures.fixturescripts.ExecutionParametersService
+#org.apache.isis.extensions.fixtures.fixturespec.FixtureScriptsDefault
+#org.apache.isis.extensions.fixtures.legacy.queryresultscache.QueryResultsCacheControlInternal
+org.apache.isis.jdo.jdosupport.IsisJdoSupportDN5
+org.apache.isis.jdo.metrics.MetricsServiceDefault
+org.apache.isis.jdo.persistence.IsisPlatformTransactionManagerForJdo
+org.apache.isis.metamodel.services.ServiceInjectorDefault
+org.apache.isis.metamodel.services.appfeat.ApplicationFeatureFactory
+org.apache.isis.metamodel.services.appfeat.ApplicationFeatureRepositoryDefault
+org.apache.isis.metamodel.services.events.MetamodelEventService
+org.apache.isis.metamodel.services.exceprecog.ExceptionRecognizerDocDefault
+org.apache.isis.metamodel.services.grid.GridLoaderServiceDefault
+org.apache.isis.metamodel.services.grid.GridReaderUsingJaxb
+org.apache.isis.metamodel.services.grid.GridServiceDefault
+org.apache.isis.metamodel.services.grid.bootstrap3.GridSystemServiceBS3
+org.apache.isis.metamodel.services.layout.LayoutServiceDefault
+org.apache.isis.metamodel.services.metamodel.MetaModelServiceDefault
+org.apache.isis.metamodel.services.registry.ServiceRegistryDefault
+org.apache.isis.metamodel.services.repository.RepositoryServiceJdo
+org.apache.isis.metamodel.services.swagger.SwaggerServiceDefault
+org.apache.isis.metamodel.services.title.TitleServiceDefault
+org.apache.isis.metamodel.services.user.UserServiceDefault
+org.apache.isis.metamodel.services.user.UserServiceDefault$SudoServiceSpi
+org.apache.isis.metamodel.specloader.InjectorMethodEvaluatorDefault
+org.apache.isis.metamodel.specloader.MetaModelValidatorServiceDefault
+org.apache.isis.metamodel.specloader.ProgrammingModelServiceDefault
+org.apache.isis.metamodel.specloader.SpecificationLoaderDefault
+org.apache.isis.runtime.services.authsess.AuthenticationSessionProviderDefault
+org.apache.isis.runtime.services.background.BackgroundServiceDefault
+org.apache.isis.runtime.services.background.CommandExecutorServiceDefault
+org.apache.isis.runtime.services.bookmarks.BookmarkServiceInternalDefault
+org.apache.isis.runtime.services.command.CommandDtoServiceInternalDefault
+org.apache.isis.runtime.services.command.CommandServiceDefault
+org.apache.isis.runtime.services.confmenu.ConfigurationViewServiceDefault
+org.apache.isis.runtime.services.email.EmailServiceDefault
+org.apache.isis.runtime.services.eventbus.EventBusServiceSpring
+org.apache.isis.runtime.services.factory.FactoryServiceInternalDefault
+org.apache.isis.runtime.services.homepage.HomePageResolverServiceDefault
+org.apache.isis.runtime.services.hsqldb.HsqlDbManagerMenu
+org.apache.isis.runtime.services.i18n.po.TranslationServicePo
+org.apache.isis.runtime.services.i18n.po.TranslationServicePoMenu
+org.apache.isis.runtime.services.ixn.InteractionDtoServiceInternalDefault
+org.apache.isis.runtime.services.menubars.MenuBarsLoaderServiceDefault
+org.apache.isis.runtime.services.menubars.bootstrap3.MenuBarsServiceBS3
+org.apache.isis.runtime.services.message.MessageServiceDefault
+org.apache.isis.runtime.services.persist.ObjectAdapterServiceDefault
+org.apache.isis.runtime.services.publish.PublishingServiceInternalDefault
+org.apache.isis.runtime.services.routing.RoutingServiceDefault
+org.apache.isis.runtime.services.sessmgmt.SessionManagementServiceDefault
+org.apache.isis.runtime.services.sse.EventStreamServiceDefault
+org.apache.isis.runtime.services.sudo.SudoServiceDefault
+org.apache.isis.runtime.services.userprof.UserProfileServiceDefault
+org.apache.isis.runtime.services.userreg.EmailNotificationServiceDefault
+org.apache.isis.runtime.services.xactn.TransactionServiceSpring
+org.apache.isis.runtime.services.xmlsnapshot.XmlSnapshotServiceDefault
+org.apache.isis.runtime.system.context.session.RuntimeEventService
+org.apache.isis.runtime.system.persistence.JdoPersistenceLifecycleService
+org.apache.isis.runtime.system.persistence.events.PersistenceEventService
+org.apache.isis.runtime.system.persistence.events.TimestampService
+org.apache.isis.runtime.system.session.IsisSessionFactoryDefault
+org.apache.isis.runtime.system.transaction.AuditingServiceInternal
+org.apache.isis.runtime.system.transaction.ChangedObjectsServiceInternal
+org.apache.isis.runtime.system.transaction.PersistenceSessionServiceInternalDefault
+org.apache.isis.security.authentication.bypass.AuthenticatorBypass
+org.apache.isis.security.authentication.manager.AuthorizationManagerStandard
+org.apache.isis.security.authentication.standard.AuthenticationManagerStandard
+org.apache.isis.security.authorization.bypass.AuthorizorBypass
+#org.apache.isis.testdomain.jdo.InventoryResource
+org.apache.isis.wrapper.WrapperFactoryDefault
\ No newline at end of file