You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by sh...@apache.org on 2022/06/19 11:01:07 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2582]bump apache version from 21 to 25 (#3096)
This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 1edccc7a2 [SCB-2582]bump apache version from 21 to 25 (#3096)
1edccc7a2 is described below
commit 1edccc7a21c8c39b1ee82984bfa15ad4c64d016c
Author: Matrix0xCC <my...@163.com>
AuthorDate: Sun Jun 19 19:01:01 2022 +0800
[SCB-2582]bump apache version from 21 to 25 (#3096)
---
.../TestNullFieldAndDefaultValueParam.java | 18 ++-
.../TestNullFieldAndDefaultValueParam.java | 129 ---------------------
.../SpringMVCObjectRestSchemaRestOnly.java | 4 +-
...TestNullFieldAndDefaultValueParamProducer.java} | 22 ++--
pom.xml | 2 +-
5 files changed, 21 insertions(+), 154 deletions(-)
diff --git a/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParam.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParam.java
similarity index 86%
rename from integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParam.java
rename to integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParam.java
index 41a78bdbb..12966840c 100644
--- a/integration-tests/it-common/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParam.java
+++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParam.java
@@ -127,15 +127,13 @@ public class TestNullFieldAndDefaultValueParam {
@Override
public String toString() {
- final StringBuilder sb = new StringBuilder("TestNullFieldAndDefaultValueParam{");
- sb.append("s1='").append(s1).append('\'');
- sb.append(", i1=").append(i1);
- sb.append(", s2='").append(s2).append('\'');
- sb.append(", i2=").append(i2);
- sb.append(", s3='").append(s3).append('\'');
- sb.append(", i3=").append(i3);
- sb.append(", rawRequest='").append(rawRequest).append('\'');
- sb.append('}');
- return sb.toString();
+ return "TestNullFieldAndDefaultValueParam{" + "s1='" + s1 + '\'' +
+ ", i1=" + i1 +
+ ", s2='" + s2 + '\'' +
+ ", i2=" + i2 +
+ ", s3='" + s3 + '\'' +
+ ", i3=" + i3 +
+ ", rawRequest='" + rawRequest + '\'' +
+ '}';
}
}
diff --git a/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParam.java b/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParam.java
deleted file mode 100644
index 001327956..000000000
--- a/integration-tests/it-edge/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParam.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.it.schema.objectparams;
-
-import java.util.Objects;
-
-public class TestNullFieldAndDefaultValueParam {
- private String s1;
-
- private int i1;
-
- private String s2 = "defaultS2";
-
- private int i2 = 22;
-
- private String s3;
-
- private int i3;
-
- private String rawRequest;
-
- public String getRawRequest() {
- return rawRequest;
- }
-
- public void setRawRequest(String rawRequest) {
- this.rawRequest = rawRequest;
- }
-
- public String getS1() {
- return s1;
- }
-
- public void setS1(String s1) {
- this.s1 = s1;
- }
-
- public int getI1() {
- return i1;
- }
-
- public void setI1(int i1) {
- this.i1 = i1;
- }
-
- public String getS2() {
- return s2;
- }
-
- public void setS2(String s2) {
- this.s2 = s2;
- }
-
- public int getI2() {
- return i2;
- }
-
- public void setI2(int i2) {
- this.i2 = i2;
- }
-
- public String getS3() {
- return s3;
- }
-
- public void setS3(String s3) {
- this.s3 = s3;
- }
-
- public int getI3() {
- return i3;
- }
-
- public void setI3(int i3) {
- this.i3 = i3;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- TestNullFieldAndDefaultValueParam that = (TestNullFieldAndDefaultValueParam) o;
- return i1 == that.i1 &&
- i2 == that.i2 &&
- i3 == that.i3 &&
- Objects.equals(s1, that.s1) &&
- Objects.equals(s2, that.s2) &&
- Objects.equals(s3, that.s3) &&
- Objects.equals(rawRequest, that.rawRequest);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(s1, i1, s2, i2, s3, i3, rawRequest);
- }
-
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder("TestNullFieldAndDefaultValueParam{");
- sb.append("s1='").append(s1).append('\'');
- sb.append(", i1=").append(i1);
- sb.append(", s2='").append(s2).append('\'');
- sb.append(", i2=").append(i2);
- sb.append(", s3='").append(s3).append('\'');
- sb.append(", i3=").append(i3);
- sb.append(", rawRequest='").append(rawRequest).append('\'');
- sb.append('}');
- return sb.toString();
- }
-}
diff --git a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/objectparams/SpringMVCObjectRestSchemaRestOnly.java b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/objectparams/SpringMVCObjectRestSchemaRestOnly.java
index 1a27661e4..e992e3388 100644
--- a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/objectparams/SpringMVCObjectRestSchemaRestOnly.java
+++ b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/objectparams/SpringMVCObjectRestSchemaRestOnly.java
@@ -43,8 +43,8 @@ public class SpringMVCObjectRestSchemaRestOnly {
*
*/
@PostMapping("testNullFieldAndDefaultValue")
- public TestNullFieldAndDefaultValueParam testNullFieldAndDefaultValue(
- @RequestBody TestNullFieldAndDefaultValueParam request) {
+ public TestNullFieldAndDefaultValueParamProducer testNullFieldAndDefaultValue(
+ @RequestBody TestNullFieldAndDefaultValueParamProducer request) {
String jsonRequest = Json.encode(request);
request.setRawRequest(jsonRequest);
LOGGER.info("return testNullFieldAndDefaultValue response: {}", request);
diff --git a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParam.java b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParamProducer.java
similarity index 80%
rename from integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParam.java
rename to integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParamProducer.java
index 0c306d8c8..5c02484a8 100644
--- a/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParam.java
+++ b/integration-tests/it-producer/src/main/java/org/apache/servicecomb/it/schema/objectparams/TestNullFieldAndDefaultValueParamProducer.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.it.schema.objectparams;
import java.util.Objects;
-public class TestNullFieldAndDefaultValueParam {
+public class TestNullFieldAndDefaultValueParamProducer {
private String s1;
private int i1;
@@ -98,7 +98,7 @@ public class TestNullFieldAndDefaultValueParam {
if (o == null || getClass() != o.getClass()) {
return false;
}
- TestNullFieldAndDefaultValueParam that = (TestNullFieldAndDefaultValueParam) o;
+ TestNullFieldAndDefaultValueParamProducer that = (TestNullFieldAndDefaultValueParamProducer) o;
return i1 == that.i1 &&
i2 == that.i2 &&
i3 == that.i3 &&
@@ -115,15 +115,13 @@ public class TestNullFieldAndDefaultValueParam {
@Override
public String toString() {
- final StringBuilder sb = new StringBuilder("TestNullFieldAndDefaultValueParam{");
- sb.append("s1='").append(s1).append('\'');
- sb.append(", i1=").append(i1);
- sb.append(", s2='").append(s2).append('\'');
- sb.append(", i2=").append(i2);
- sb.append(", s3='").append(s3).append('\'');
- sb.append(", i3=").append(i3);
- sb.append(", rawRequest='").append(rawRequest).append('\'');
- sb.append('}');
- return sb.toString();
+ return "TestNullFieldAndDefaultValueParam{" + "s1='" + s1 + '\'' +
+ ", i1=" + i1 +
+ ", s2='" + s2 + '\'' +
+ ", i2=" + i2 +
+ ", s3='" + s3 + '\'' +
+ ", i3=" + i3 +
+ ", rawRequest='" + rawRequest + '\'' +
+ '}';
}
}
diff --git a/pom.xml b/pom.xml
index 870030198..5a8a3f9ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>25</version>
</parent>