You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2021/11/04 18:33:14 UTC
[camel] branch main updated: Delete code commend out in commit
fd451173b0e9ef1cd505b90beefc4075512439b7 from pull request #5787.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 6ea85fd Delete code commend out in commit fd451173b0e9ef1cd505b90beefc4075512439b7 from pull request #5787.
6ea85fd is described below
commit 6ea85fdc5d42ce32c62f7e85d0fb79db2956fb4b
Author: PascalSchumacher <pa...@gmx.net>
AuthorDate: Thu Nov 4 19:30:52 2021 +0100
Delete code commend out in commit fd451173b0e9ef1cd505b90beefc4075512439b7 from pull request #5787.
---
.../java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java | 1 -
.../src/main/java/org/apache/camel/model/SagaDefinition.java | 5 -----
.../src/main/java/org/apache/camel/processor/saga/SagaProcessor.java | 3 ---
3 files changed, 9 deletions(-)
diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
index 687349f..f364cc0 100644
--- a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
+++ b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
@@ -1114,7 +1114,6 @@ public abstract class AbstractCamelCatalog {
|| key.startsWith("rest.")) {
int idx = key.indexOf('.');
String name = key.substring(0, idx);
- //String option = key.substring(idx + 1); // unused variable
if (value != null) {
MainModel model = mainModel();
if (model == null) {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
index 6db8864..b66d5c0 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
@@ -253,11 +253,6 @@ public class SagaDefinition extends OutputDefinition<SagaDefinition> {
return this;
}
- // for now commenting out - it's recursion
- /*public SagaDefinition propagation(String propagation) {
- return propagation(propagation);
- }*/
-
public SagaDefinition propagation(SagaPropagation propagation) {
setPropagation(propagation.name());
return this;
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
index e1659f3..b0c78c6 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
@@ -36,8 +36,6 @@ import org.apache.camel.util.ObjectHelper;
*/
public abstract class SagaProcessor extends DelegateAsyncProcessor implements Traceable, IdAware, RouteIdAware {
- //protected CamelContext camelContext; // unread field
-
protected CamelSagaService sagaService;
protected CamelSagaStep step;
@@ -50,7 +48,6 @@ public abstract class SagaProcessor extends DelegateAsyncProcessor implements Tr
public SagaProcessor(CamelContext camelContext, Processor childProcessor, CamelSagaService sagaService,
SagaCompletionMode completionMode, CamelSagaStep step) {
super(ObjectHelper.notNull(childProcessor, "childProcessor"));
- //this.camelContext = ObjectHelper.notNull(camelContext, "camelContext");
this.sagaService = ObjectHelper.notNull(sagaService, "sagaService");
this.completionMode = ObjectHelper.notNull(completionMode, "completionMode");
this.step = ObjectHelper.notNull(step, "step");