[isis] branch master updated: ISIS-2966: don't force command/execution loggers to be present by default

[ah...@apache.org]

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 36e573393e ISIS-2966: don't force command/execution loggers to be present by default
36e573393e is described below

commit 36e573393e5894e9516426324af7582fde4a3ea2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 14 08:55:41 2022 +0200

    ISIS-2966: don't force command/execution loggers to be present by
    default
---
 .../main/java/org/apache/isis/applib/IsisModuleApplib.java | 14 ++++++--------
 .../fixtures/applib/fixturescripts/FixtureScript.java      | 12 ++++++------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java b/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
index cbb0dd7c5b..ace398767f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
@@ -47,10 +47,6 @@ import org.apache.isis.applib.services.confview.ConfigurationMenu;
 import org.apache.isis.applib.services.confview.ConfigurationProperty;
 import org.apache.isis.applib.services.layout.LayoutServiceMenu;
 import org.apache.isis.applib.services.metamodel.MetaModelServiceMenu;
-import org.apache.isis.applib.services.publishing.log.CommandLogger;
-import org.apache.isis.applib.services.publishing.log.EntityChangesLogger;
-import org.apache.isis.applib.services.publishing.log.EntityPropertyChangeLogger;
-import org.apache.isis.applib.services.publishing.log.ExecutionLogger;
 import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
 import org.apache.isis.applib.services.session.SessionLoggingServiceLogging;
 import org.apache.isis.applib.services.sitemap.SitemapServiceMenu;
@@ -113,18 +109,20 @@ import org.apache.isis.schema.IsisModuleSchema;
 
         // @Service(s)
         CommandDtoProcessorServiceIdentity.class,
-        CommandLogger.class,
         ContentMappingServiceForCommandDto.class,
         ContentMappingServiceForCommandsDto.class,
-        EntityChangesLogger.class,
-        EntityPropertyChangeLogger.class,
-        ExecutionLogger.class,
         SessionLoggingServiceLogging.class,
         SudoService.class,
         UserService.class,
         UserMemento.UiSubscriber.class,
         RoleMemento.UiSubscriber.class,
 
+        // Execution/Change Loggers
+//      CommandLogger.class,
+//      EntityChangesLogger.class,
+//      EntityPropertyChangeLogger.class,
+//      ExecutionLogger.class,
+
 })
 public class IsisModuleApplib {
 
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
index 0b699f6662..17f419d875 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
@@ -59,7 +59,7 @@ import lombok.extern.log4j.Log4j2;
 
 /**
  * Responsible for setting up the system (or more likely a part of the system)
- * for the purpose of prototyping/demos or for integraton testing.
+ * for the purpose of prototyping/demos or for integration testing.
  *
  * @since 1.x {@index}
  */
@@ -68,7 +68,7 @@ public abstract class FixtureScript {
 
     public static final FixtureScript NOOP = new FixtureScript() {
         @Override
-        protected void execute(ExecutionContext executionContext) {
+        protected void execute(final ExecutionContext executionContext) {
         }
     };
 
@@ -690,7 +690,7 @@ public abstract class FixtureScript {
         final Class<T> cls = _Casts.uncheckedCast(defaultValue.getClass());
 
         final T value = readParam(parameterName, ec, cls);
-        if(value != null) { return (T) value; }
+        if(value != null) { return value; }
 
         // else default value
         return defaultValue;
@@ -710,7 +710,7 @@ public abstract class FixtureScript {
 
         // read from ExecutionContext
         T value = ec.getParameterAsT(parameterName, cls);
-        if(value != null) { return (T) value; }
+        if(value != null) { return value; }
 
         // else from fixture script
         Method method;
@@ -720,7 +720,7 @@ public abstract class FixtureScript {
         } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {
 
         }
-        if(value != null) { return (T) value; }
+        if(value != null) { return value; }
 
         if (cls == Boolean.class || cls == boolean.class) {
             try {
@@ -729,7 +729,7 @@ public abstract class FixtureScript {
             } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {
 
             }
-            if(value != null) { return (T) value; }
+            if(value != null) { return value; }
         }
 
         return null;