This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit fae0e85aa62ace279e4282bafcbeeb590898039d Author: KomachiSion <[email protected]> AuthorDate: Mon Sep 3 18:00:58 2018 +0800 SCB-864 change Object back to String. --- .../main/java/org/apache/servicecomb/saga/core/SQLOperation.java | 8 ++++---- .../java/org/apache/servicecomb/saga/transports/SQLTransport.java | 2 +- .../apache/servicecomb/saga/format/JacksonSQLCompensation.java | 4 ++-- .../org/apache/servicecomb/saga/format/JacksonSQLOperation.java | 2 +- .../org/apache/servicecomb/saga/format/JacksonSQLTransaction.java | 2 +- .../servicecomb/saga/format/JacksonFromJsonFormatForSQLTest.java | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SQLOperation.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SQLOperation.java index 35dc9ef..0cfbf22 100644 --- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SQLOperation.java +++ b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SQLOperation.java @@ -23,18 +23,18 @@ import java.util.List; public class SQLOperation implements Operation { private final String sql; - private final List<List<Object>> params; + private final List<List<String>> params; - public SQLOperation(String sql, List<List<Object>> params) { + public SQLOperation(String sql, List<List<String>> params) { this.sql = sql; - this.params = params == null ? Collections.<List<Object>>emptyList() : params; + this.params = params == null ? Collections.<List<String>>emptyList() : params; } public String sql() { return sql; } - public List<List<Object>> params() { + public List<List<String>> params() { return params; } diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/transports/SQLTransport.java b/saga-core/src/main/java/org/apache/servicecomb/saga/transports/SQLTransport.java index 5d4c757..9438f65 100644 --- a/saga-core/src/main/java/org/apache/servicecomb/saga/transports/SQLTransport.java +++ b/saga-core/src/main/java/org/apache/servicecomb/saga/transports/SQLTransport.java @@ -24,6 +24,6 @@ import org.apache.servicecomb.saga.core.Transport; public interface SQLTransport extends Transport { - SagaResponse with(String datasource, String sql, List<List<Object>> params); + SagaResponse with(String datasource, String sql, List<List<String>> params); } diff --git a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLCompensation.java b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLCompensation.java index 5d2e6c1..27e54fb 100644 --- a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLCompensation.java +++ b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLCompensation.java @@ -28,14 +28,14 @@ public class JacksonSQLCompensation extends JacksonSQLOperation implements Compe private final int retries; - public JacksonSQLCompensation(String sql, List<List<Object>> params) { + public JacksonSQLCompensation(String sql, List<List<String>> params) { this(sql, params, DEFAULT_RETRIES); } @JsonCreator public JacksonSQLCompensation( @JsonProperty("sql") String sql, - @JsonProperty("params") List<List<Object>> params, + @JsonProperty("params") List<List<String>> params, @JsonProperty("retries") int retries) { super(sql, params); this.retries = retries <= 0? DEFAULT_RETRIES : retries; diff --git a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLOperation.java b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLOperation.java index d164cd9..c0ac765 100644 --- a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLOperation.java +++ b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLOperation.java @@ -32,7 +32,7 @@ public class JacksonSQLOperation extends SQLOperation implements TransportAware< @JsonIgnore private SQLTransport transport; - public JacksonSQLOperation(String sql, List<List<Object>> params) { + public JacksonSQLOperation(String sql, List<List<String>> params) { super(sql, params); } diff --git a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLTransaction.java b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLTransaction.java index 8176ed1..a11a731 100644 --- a/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLTransaction.java +++ b/saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLTransaction.java @@ -29,7 +29,7 @@ public class JacksonSQLTransaction extends JacksonSQLOperation implements Transa @JsonCreator public JacksonSQLTransaction( @JsonProperty("sql") String sql, - @JsonProperty("params") List<List<Object>> params) { + @JsonProperty("params") List<List<String>> params) { super(sql, params); } } diff --git a/saga-format/src/test/java/org/apache/servicecomb/saga/format/JacksonFromJsonFormatForSQLTest.java b/saga-format/src/test/java/org/apache/servicecomb/saga/format/JacksonFromJsonFormatForSQLTest.java index af15069..44c22c7 100644 --- a/saga-format/src/test/java/org/apache/servicecomb/saga/format/JacksonFromJsonFormatForSQLTest.java +++ b/saga-format/src/test/java/org/apache/servicecomb/saga/format/JacksonFromJsonFormatForSQLTest.java @@ -107,14 +107,14 @@ public class JacksonFromJsonFormatForSQLTest { private final SQLTransport sqlTransport = new SQLTransport() { @Override - public SagaResponse with(String datasource, String sql, List<List<Object>> params) { + public SagaResponse with(String datasource, String sql, List<List<String>> params) { if (null == sql || sql.trim().length() == 0) { return responseDefault; } - for (List<Object> each : params) { - for (Object param : each) { - sql = sql.replaceFirst("\\?", param.toString()); + for (List<String> each : params) { + for (String param : each) { + sql = sql.replaceFirst("\\?", param); } }
