fix(#1408): Incorporate YAKS Cucumber steps into Citrus

Author: christophd

.gitleaks.toml

@@ -4,5 +4,11 @@
   # Ignore based on any subset of the file path
   paths = [
     # Ignore all example certs
+    '''tools\/cucumber-steps\/citrus-cucumber-http\/src\/main\/resources\/keystore\/.*\.pem$''',
+    '''tools\/cucumber-steps\/citrus-cucumber-http\/src\/main\/resources\/keystore\/.*\.key$''',
+    '''tools\/cucumber-steps\/citrus-cucumber-http\/src\/main\/resources\/keystore\/.*\.jks$''',
+    '''tools\/cucumber-steps\/citrus-cucumber-http\/src\/main\/resources\/keystore\/.*\.crt$''',
+    '''tools\/cucumber-steps\/citrus-cucumber-http\/src\/main\/resources\/keystore\/.*\.cert$''',
+    '''tools\/cucumber-steps\/citrus-cucumber-http\/src\/main\/resources\/keystore\/.*\.p12$''',
     '''endpoints\/citrus-ssh\/src\/main\/resources\/org\/citrusframework\/ssh\/.*\.pem$''',
   ]

Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION := 4.7.0-SNAPSHOT
+VERSION := 4.9.0-SNAPSHOT
 RELEASE_GIT_REMOTE := origin
 GIT_COMMIT := $(shell git rev-list -1 HEAD)
 

connectors/citrus-agent-connector/src/main/java/org/citrusframework/agent/connector/actions/AgentActionBuilder.java

@@ -18,7 +18,7 @@
 
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.agent.connector.CitrusAgentSettings;
-import org.springframework.util.Assert;
+import org.citrusframework.util.ObjectHelper;
 
 public class AgentActionBuilder implements TestActionBuilder.DelegatingTestActionBuilder<AgentAction>,
         org.citrusframework.actions.agent.AgentActionBuilder<AgentAction, AgentActionBuilder> {
@@ -56,7 +56,7 @@ public AgentRunAction.Builder run() {
 
     @Override
     public AgentAction build() {
-        Assert.notNull(delegate, "Missing delegate action to build");
+        ObjectHelper.assertNotNull(delegate, "Missing delegate action to build");
         delegate.agent(agentName);
         return delegate.build();
     }

connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/KnativeActionBuilder.java

@@ -34,7 +34,7 @@
 import org.citrusframework.knative.actions.eventing.VerifyBrokerAction;
 import org.citrusframework.knative.actions.messaging.CreateChannelAction;
 import org.citrusframework.knative.actions.messaging.CreateSubscriptionAction;
-import org.springframework.util.Assert;
+import org.citrusframework.util.ObjectHelper;
 
 public class KnativeActionBuilder implements TestActionBuilder.DelegatingTestActionBuilder<KnativeAction>,
         org.citrusframework.actions.knative.KnativeActionBuilder<KnativeAction, KnativeActionBuilder> {
@@ -109,7 +109,7 @@ public BrokerActionBuilder brokers() {
 
     @Override
     public KnativeAction build() {
-        Assert.notNull(delegate, "Missing delegate action to build");
+        ObjectHelper.assertNotNull(delegate, "Missing delegate action to build");
         if (kubernetesClient != null) {
             delegate.client(kubernetesClient);
         }

connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/KnativeServiceConfiguration.java

@@ -80,7 +80,7 @@ protected Message handleMessageInternal(Message message) {
                 Assert.assertEquals(message.getHeader("Ce-Specversion"), "1.0");
                 Assert.assertEquals(message.getHeader("Ce-Subject"), "hello");
                 Assert.assertEquals(message.getHeader("Ce-Type"), "greeting");
-                Assert.assertEquals(message.getHeader("Ce-Source"), "https://github.com/citrusframework/yaks");
+                Assert.assertEquals(message.getHeader("Ce-Source"), "https://github.com/citrusframework/citrus");
                 Assert.assertEquals(message.getHeader("Content-Type").toString(), MediaType.APPLICATION_JSON_UTF8_VALUE);
                 Assert.assertEquals(message.getPayload(String.class), "{\"msg\": \"Hello Knative!\"}");
 

connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/KubernetesSettings.java

@@ -174,7 +174,7 @@ public static String getClusterWildcardDomain() {
     }
 
     /**
-     * Cluster type that YAKS is running on.
+     * Cluster type that Citrus is running on.
      * @return
      */
     public static ClusterType getClusterType() {

connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/KubernetesActionBuilder.java

@@ -28,7 +28,7 @@
 import org.citrusframework.actions.kubernetes.KubernetesServiceActionBuilder;
 import org.citrusframework.exceptions.CitrusRuntimeException;
 import org.citrusframework.kubernetes.endpoint.KubernetesEndpointConfiguration;
-import org.springframework.util.Assert;
+import org.citrusframework.util.ObjectHelper;
 
 public class KubernetesActionBuilder implements TestActionBuilder.DelegatingTestActionBuilder<KubernetesAction>,
         org.citrusframework.actions.kubernetes.KubernetesActionBuilder<KubernetesAction, KubernetesActionBuilder> {
@@ -54,7 +54,6 @@ public static KubernetesActionBuilder kubernetes() {
 
     /**
      * Use a custom Kubernetes client.
-     * @param kubernetesClient
      */
     public KubernetesActionBuilder client(KubernetesClient kubernetesClient) {
         this.kubernetesClient = kubernetesClient;
@@ -123,7 +122,7 @@ public KubernetesExecuteAction.Builder execute() {
     }
     @Override
     public KubernetesAction build() {
-        Assert.notNull(delegate, "Missing delegate action to build");
+        ObjectHelper.assertNotNull(delegate, "Missing delegate action to build");
         if (kubernetesClient != null) {
             delegate.client(kubernetesClient);
         }

connectors/citrus-testcontainers/src/main/java/org/citrusframework/testcontainers/aws2/LocalStackContainer.java

@@ -72,6 +72,12 @@ public LocalStackContainer(String image, String version, AwsService... services)
         waitingFor(Wait.forLogMessage(".*Ready\\.\n", 1));
     }
 
+    public LocalStackContainer withNewServices(AwsService... services) {
+        this.services.clear();
+        this.services.addAll(Arrays.asList(services));
+        return self();
+    }
+
     public LocalStackContainer withServices(AwsService... services) {
         this.services.addAll(Arrays.asList(services));
         return self();

connectors/citrus-testcontainers/src/main/java/org/citrusframework/testcontainers/aws2/StartLocalStackAction.java

@@ -160,6 +160,10 @@ protected void prepareBuild() {
             LocalStackContainer localStack;
             if (referenceResolver != null && referenceResolver.isResolvable(containerName, LocalStackContainer.class)) {
                 localStack = referenceResolver.resolve(containerName, LocalStackContainer.class);
+
+                if  (!localStack.isRunning()) {
+                    localStack.withNewServices(services.toArray(AwsService[]::new));
+                }
             } else {
                 localStack = new LocalStackContainer(image, localStackVersion)
                         .withServices(services.toArray(AwsService[]::new))

endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessage.java

@@ -519,7 +519,7 @@ public HttpMessage cookie(final Cookie cookie) {
     /**
      * Reads request from complete request dump.
      *
-     * <p>Note that this method is called from YAKS.
+     * <p>Note that this method is called from Citrus.
      *
      * @param requestData The request dump to parse
      * @return The parsed dump as HttpMessage
@@ -551,7 +551,7 @@ public static HttpMessage fromRequestData(final String requestData) {
     /**
      * Reads response from complete response dump.
      *
-     * <p>Note that this method is called from YAKS.
+     * <p>Note that this method is called from Citrus.
      *
      * @param responseData The response dump to parse
      * @return The parsed dump as HttpMessage