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 2022/04/13 09:31:50 UTC
[isis] 02/02: ISIS-3003: harmonize logical type names
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 d530bd8b2c33cd3af7a2182dea2ac5a9382e363d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 13 11:31:42 2022 +0200
ISIS-3003: harmonize logical type names
---
.../model/IsisModuleExtCommandLogApplib.java | 3 +++
.../primary/IsisModuleExtCommandReplayPrimary.java | 2 +-
.../IsisModuleExtCommandReplaySecondary.java | 4 ++--
.../analyser/CommandReplayAnalyserException.java | 3 ++-
.../analyser/CommandReplayAnalyserResult.java | 3 ++-
.../analysis/CommandReplayAnalysisService.java | 3 ++-
.../secondary/fetch/CommandFetcher.java | 21 +++++++++++++--------
.../ui/CommandReplayOnSecondaryService.java | 18 +++++++++++-------
.../isis/testdomain/rest/RestServiceStressTest.java | 5 +++--
9 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/model/IsisModuleExtCommandLogApplib.java b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/model/IsisModuleExtCommandLogApplib.java
index f6a9576baa..1ef3cdad46 100644
--- a/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/model/IsisModuleExtCommandLogApplib.java
+++ b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/model/IsisModuleExtCommandLogApplib.java
@@ -44,4 +44,7 @@ extends ModuleWithFixtures {
public abstract static class PropertyDomainEvent<S,T>
extends org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> { }
+ public static final String NAMESPACE_PRIMARY = "isis.ext.commandReplayPrimary";
+ public static final String NAMESPACE_SECONDARY = "isis.ext.commandReplaySecondary";
+
}
diff --git a/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.java b/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.java
index 3b78177d29..e27ac96411 100644
--- a/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.java
+++ b/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.java
@@ -50,7 +50,7 @@ import org.apache.isis.extensions.commandreplay.primary.ui.CommandReplayOnPrimar
@Profile("primary")
public class IsisModuleExtCommandReplayPrimary {
- public static final String NAMESPACE = "isis.ext.commandReplayPrimary";
+ public static final String NAMESPACE = IsisModuleExtCommandLogApplib.NAMESPACE_PRIMARY;
public abstract static class ActionDomainEvent<S>
extends org.apache.isis.applib.events.domain.ActionDomainEvent<S> { }
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.java
index f8e52459f6..c48fa2810c 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.java
@@ -78,7 +78,7 @@ import lombok.val;
@Profile("secondary")
public class IsisModuleExtCommandReplaySecondary {
- public static final String NAMESPACE = "isis.ext.commandReplaySecondary";
+ public static final String NAMESPACE = IsisModuleExtCommandLogApplib.NAMESPACE_SECONDARY;
public abstract static class ActionDomainEvent<S>
extends org.apache.isis.applib.events.domain.ActionDomainEvent<S> { }
@@ -102,7 +102,7 @@ public class IsisModuleExtCommandReplaySecondary {
}
@Bean(name = "ReplicateAndReplayTrigger" )
- public SimpleTriggerFactoryBean replicateAndReplayTriggerFactory(@Qualifier("ReplicateAndReplayJob") JobDetail job) {
+ public SimpleTriggerFactoryBean replicateAndReplayTriggerFactory(@Qualifier("ReplicateAndReplayJob") final JobDetail job) {
val triggerFactory = new SimpleTriggerFactoryBean();
triggerFactory.setJobDetail(job);
val config = isisConfiguration.getExtensions().getCommandReplay().getQuartzReplicateAndReplayJob();
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
index 1bbd919ee1..c7dac55636 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
@@ -31,6 +31,7 @@ import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
+import org.apache.isis.extensions.commandreplay.secondary.IsisModuleExtCommandReplaySecondary;
import org.apache.isis.schema.common.v2.InteractionType;
import lombok.RequiredArgsConstructor;
@@ -40,7 +41,7 @@ import lombok.val;
* @since 2.0 {@index}
*/
@Service
-@Named("isis.ext.commandReplaySecondary.CommandReplayAnalyserException")
+@Named(IsisModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayAnalyserException")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
@RequiredArgsConstructor
public class CommandReplayAnalyserException implements CommandReplayAnalyser {
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java
index 063cce71d8..88a73fd7b0 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java
@@ -30,6 +30,7 @@ import org.apache.isis.applib.services.commanddto.conmap.UserDataKeys;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
+import org.apache.isis.extensions.commandreplay.secondary.IsisModuleExtCommandReplaySecondary;
import org.apache.isis.schema.common.v2.InteractionType;
import lombok.RequiredArgsConstructor;
@@ -39,7 +40,7 @@ import lombok.val;
* @since 2.0 {@index}
*/
@Service
-@Named("isis.ext.commandReplaySecondary.CommandReplayAnalyserResult")
+@Named(IsisModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayAnalyserResult")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
@RequiredArgsConstructor
public class CommandReplayAnalyserResult implements CommandReplayAnalyser {
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java
index 4e99d85854..335129802e 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java
@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
+import org.apache.isis.extensions.commandreplay.secondary.IsisModuleExtCommandReplaySecondary;
import org.apache.isis.extensions.commandreplay.secondary.analyser.CommandReplayAnalyser;
import lombok.extern.log4j.Log4j2;
@@ -35,7 +36,7 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0 {@index}
*/
@Service
-@Named("isis.ext.commandReplaySecondary.CommandReplayAnalysisService")
+@Named(IsisModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayAnalysisService")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
@Log4j2
public class CommandReplayAnalysisService {
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
index 758a42426f..87f469d496 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
@@ -33,7 +33,9 @@ import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.client.SuppressionType;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.jaxb.JaxbService.Simple;
+import org.apache.isis.extensions.commandlog.model.IsisModuleExtCommandLogApplib;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
+import org.apache.isis.extensions.commandreplay.secondary.IsisModuleExtCommandReplaySecondary;
import org.apache.isis.extensions.commandreplay.secondary.SecondaryStatus;
import org.apache.isis.extensions.commandreplay.secondary.StatusException;
import org.apache.isis.extensions.commandreplay.secondary.config.SecondaryConfig;
@@ -50,15 +52,15 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0 {@index}
*/
@Service()
-@Named("isis.ext.commandReplaySecondary.CommandFetcher")
+@Named(IsisModuleExtCommandReplaySecondary.NAMESPACE + ".CommandFetcher")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
@Log4j2
public class CommandFetcher {
static final String URL_SUFFIX =
- "services/isisExtensionsCommandReplayPrimary."
- + "CommandRetrievalService/actions/findCommandsOnPrimaryFrom/invoke";
-
+ "services/"
+ + IsisModuleExtCommandLogApplib.NAMESPACE_PRIMARY
+ + ".CommandRetrievalService/actions/findCommandsOnPrimaryFrom/invoke";
/**
* Replicates a single command.
@@ -99,8 +101,12 @@ public class CommandFetcher {
return commandsDto;
}
-
+ //TODO simplify
private String buildUri(final UUID interactionId) {
+
+// val args = client.arguments()
+// .build();
+
val uri =
interactionId != null
? String.format(
@@ -153,7 +159,7 @@ public class CommandFetcher {
final SecondaryConfig secondaryConfig,
final boolean useRequestDebugLogging) {
- RestfulClientConfig clientConfig = new RestfulClientConfig();
+ val clientConfig = new RestfulClientConfig();
clientConfig.setRestfulBase(secondaryConfig.getPrimaryBaseUrlRestful());
// setup basic-auth
clientConfig.setUseBasicAuth(true);
@@ -162,8 +168,7 @@ public class CommandFetcher {
// setup request/response debug logging
clientConfig.setUseRequestDebugLogging(useRequestDebugLogging);
- RestfulClient client = RestfulClient.ofConfig(clientConfig);
-
+ val client = RestfulClient.ofConfig(clientConfig);
return client;
}
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java
index dc5bcb1bee..cc80224022 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java
@@ -24,7 +24,14 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.*;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
@@ -40,23 +47,20 @@ import lombok.val;
* @since 2.0 {@index}
*/
@DomainService(
- nature = NatureOfService.VIEW,
- logicalTypeName = CommandReplayOnSecondaryService.LOGICAL_TYPE_NAME
+ nature = NatureOfService.VIEW
)
+@Named(IsisModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayOnSecondaryService")
@DomainServiceLayout(
named = "Activity",
menuBar = DomainServiceLayout.MenuBar.SECONDARY
)
-@Named(CommandReplayOnSecondaryService.LOGICAL_TYPE_NAME)
@javax.annotation.Priority(PriorityPrecedence.EARLY)
@RequiredArgsConstructor
//@Log4j2
public class CommandReplayOnSecondaryService {
- public static final String LOGICAL_TYPE_NAME = IsisModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayOnSecondaryService";
-
@Inject CommandModelRepository<? extends CommandModel> commandModelRepository;
- @Inject final JaxbService jaxbService;
+ @Inject JaxbService jaxbService;
public static abstract class ActionDomainEvent<T> extends IsisModuleExtCommandReplaySecondary.ActionDomainEvent<T> { }
diff --git a/regressiontests/stable-rest/src/test/java/org/apache/isis/testdomain/rest/RestServiceStressTest.java b/regressiontests/stable-rest/src/test/java/org/apache/isis/testdomain/rest/RestServiceStressTest.java
index 5baa51396d..37238d1cbd 100644
--- a/regressiontests/stable-rest/src/test/java/org/apache/isis/testdomain/rest/RestServiceStressTest.java
+++ b/regressiontests/stable-rest/src/test/java/org/apache/isis/testdomain/rest/RestServiceStressTest.java
@@ -23,8 +23,8 @@ import java.util.stream.IntStream;
import javax.inject.Inject;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
@@ -52,13 +52,14 @@ import lombok.extern.log4j.Log4j2;
Configuration_usingJdo.class,
IsisModuleViewerRestfulObjectsJaxrsResteasy4.class
})
+@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
@Log4j2
class RestServiceStressTest {
@LocalServerPort int port; // just for reference (not used)
@Inject RestEndpointService restService;
- @Test @Disabled("test works, though don't enable when building")
+ @Test
void bookOfTheWeek_stressTest() {
assertTrue(restService.getPort()>0);