This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5953a08 CAMEL-13507: Fix header resolution for LRA saga routes
5953a08 is described below
commit 5953a0825ed0c4e7d698c86959e4ed899ba3844c
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Fri May 17 09:17:31 2019 +0100
CAMEL-13507: Fix header resolution for LRA saga routes
---
.../src/main/java/org/apache/camel/service/lra/LRAClient.java | 3 ---
.../src/main/java/org/apache/camel/service/lra/LRAConstants.java | 3 ---
.../main/java/org/apache/camel/service/lra/LRASagaCoordinator.java | 3 ---
.../src/main/java/org/apache/camel/service/lra/LRASagaRoutes.java | 7 ++-----
.../src/main/java/org/apache/camel/service/lra/LRASagaStep.java | 3 ---
.../src/main/java/org/apache/camel/service/lra/LRAUrlBuilder.java | 3 ---
.../src/test/java/org/apache/camel/service/lra/LRAFailuresIT.java | 1 -
.../src/test/java/org/apache/camel/service/lra/LRAManualIT.java | 1 -
.../src/test/java/org/apache/camel/service/lra/LRATimeoutIT.java | 1 -
9 files changed, 2 insertions(+), 23 deletions(-)
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
index cf05f87..ec4c3cb 100644
---
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
+++
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java
@@ -38,9 +38,6 @@ import static
org.apache.camel.service.lra.LRAConstants.HEADER_TIME_LIMIT;
import static
org.apache.camel.service.lra.LRAConstants.PARTICIPANT_PATH_COMPENSATE;
import static
org.apache.camel.service.lra.LRAConstants.PARTICIPANT_PATH_COMPLETE;
-/**
- *
- */
public class LRAClient {
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAConstants.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAConstants.java
index ad4bf88..1c3feea 100644
---
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAConstants.java
+++
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAConstants.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.service.lra;
-/**
- *
- */
public final class LRAConstants {
public static final String DEFAULT_COORDINATOR_CONTEXT_PATH =
"/lra-coordinator";
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaCoordinator.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaCoordinator.java
index f534ae8..58c4063 100644
---
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaCoordinator.java
+++
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaCoordinator.java
@@ -24,9 +24,6 @@ import org.apache.camel.saga.CamelSagaCoordinator;
import org.apache.camel.saga.CamelSagaStep;
import org.apache.camel.util.ObjectHelper;
-/**
- *
- */
public class LRASagaCoordinator implements CamelSagaCoordinator {
private LRASagaService sagaService;
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaRoutes.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaRoutes.java
index 3a71603..b333965 100644
---
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaRoutes.java
+++
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaRoutes.java
@@ -27,9 +27,6 @@ import static
org.apache.camel.service.lra.LRAConstants.PARTICIPANT_PATH_COMPLET
import static org.apache.camel.service.lra.LRAConstants.URL_COMPENSATION_KEY;
import static org.apache.camel.service.lra.LRAConstants.URL_COMPLETION_KEY;
-/**
- *
- */
public class LRASagaRoutes extends RouteBuilder {
private LRASagaService sagaService;
@@ -47,7 +44,7 @@ public class LRASagaRoutes extends RouteBuilder {
.process(this::verifyRequest)
.choice()
.when(header(URL_COMPENSATION_KEY).isNotNull())
- .toD("header." + URL_COMPENSATION_KEY)
+ .toD("${header." + URL_COMPENSATION_KEY + "}")
.end();
rest(sagaService.getLocalParticipantContextPath())
@@ -56,7 +53,7 @@ public class LRASagaRoutes extends RouteBuilder {
.process(this::verifyRequest)
.choice()
.when(header(URL_COMPLETION_KEY).isNotNull())
- .toD("header." + URL_COMPLETION_KEY)
+ .toD("${header." + URL_COMPLETION_KEY + "}")
.end();
}
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaStep.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaStep.java
index 863b87b..45d4566 100644
---
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaStep.java
+++
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRASagaStep.java
@@ -26,9 +26,6 @@ import org.apache.camel.Expression;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.saga.CamelSagaStep;
-/**
- *
- */
public final class LRASagaStep {
private Optional<Endpoint> compensation;
diff --git
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAUrlBuilder.java
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAUrlBuilder.java
index 9440499..ea270ee 100644
---
a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAUrlBuilder.java
+++
b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAUrlBuilder.java
@@ -27,9 +27,6 @@ import org.apache.camel.Endpoint;
import static org.apache.camel.service.lra.LRAConstants.URL_COMPENSATION_KEY;
import static org.apache.camel.service.lra.LRAConstants.URL_COMPLETION_KEY;
-/**
- *
- */
public class LRAUrlBuilder {
private String host;
diff --git
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAFailuresIT.java
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAFailuresIT.java
index 704f865..ad4f9d0 100644
---
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAFailuresIT.java
+++
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAFailuresIT.java
@@ -20,7 +20,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
import org.junit.Test;
public class LRAFailuresIT extends AbstractLRATestSupport {
diff --git
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAManualIT.java
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAManualIT.java
index b8130d2..7cc6ec5 100644
---
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAManualIT.java
+++
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAManualIT.java
@@ -23,7 +23,6 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.SagaCompletionMode;
-import org.junit.Ignore;
import org.junit.Test;
public class LRAManualIT extends AbstractLRATestSupport {
diff --git
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRATimeoutIT.java
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRATimeoutIT.java
index e2fb580..1a16a12 100644
---
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRATimeoutIT.java
+++
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRATimeoutIT.java
@@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.SagaCompletionMode;
-import org.junit.Ignore;
import org.junit.Test;
public class LRATimeoutIT extends AbstractLRATestSupport {
