This is an automated email from the ASF dual-hosted git repository.
liubao 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 4bb4f3c18 Bump log4j2.version from 2.24.1 to 2.24.2 (#4640)
4bb4f3c18 is described below
commit 4bb4f3c18a2151878a31c40e2bd230a0a3f5de9b
Author: SweetWuXiaoMei <[email protected]>
AuthorDate: Tue Dec 31 17:57:23 2024 +0800
Bump log4j2.version from 2.24.1 to 2.24.2 (#4640)
---
.../apache/servicecomb/core/TestInvocation.java | 30 ++++++++++------------
.../consumer/src/main/resources/application.yml | 1 -
demo/demo-edge/README.md | 2 --
.../test-client/src/main/resources/application.yml | 2 --
.../demo-zeroconfig-registry-tests/pom.xml | 1 -
.../consumer/src/main/resources/application.yml | 2 --
dependencies/default/pom.xml | 2 +-
7 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/core/src/test/java/org/apache/servicecomb/core/TestInvocation.java
b/core/src/test/java/org/apache/servicecomb/core/TestInvocation.java
index 4cf335cd3..80b6bbda4 100644
--- a/core/src/test/java/org/apache/servicecomb/core/TestInvocation.java
+++ b/core/src/test/java/org/apache/servicecomb/core/TestInvocation.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.core;
import java.util.Arrays;
-import java.util.Map;
import org.apache.servicecomb.core.definition.InvocationRuntimeType;
import org.apache.servicecomb.core.definition.OperationMeta;
@@ -49,7 +48,6 @@ import mockit.MockUp;
import mockit.Mocked;
public class TestInvocation {
- Invocation invocation;
@Mocked
Endpoint endpoint;
@@ -60,9 +58,6 @@ public class TestInvocation {
@Mocked
InvocationRuntimeType invocationRuntimeType;
- @Mocked
- Map<String, Object> arguments;
-
static long nanoTime = 123;
@BeforeClass
@@ -95,7 +90,7 @@ public class TestInvocation {
};
EventManager.register(subscriber);
- Invocation invocation = new Invocation(endpoint, operationMeta, arguments);
+ Invocation invocation = new Invocation(endpoint, operationMeta, null);
invocation.onStart();
Assertions.assertSame(invocation, result.value);
@@ -115,7 +110,7 @@ public class TestInvocation {
};
EventManager.register(subscriber);
- Invocation invocation = new Invocation(endpoint, operationMeta, arguments);
+ Invocation invocation = new Invocation(endpoint, operationMeta, null);
Assertions.assertFalse(invocation.isFinished());
Response response = Response.succResp(null);
invocation.onFinish(response);
@@ -134,19 +129,19 @@ public class TestInvocation {
@Test
public void isConsumer_yes() {
- Invocation invocation = new Invocation(endpoint, operationMeta, arguments);
+ Invocation invocation = new Invocation(endpoint, operationMeta, null);
Assertions.assertFalse(invocation.isConsumer());
}
@Test
public void isConsumer_no(@Mocked ReferenceConfig referenceConfig) {
- Invocation invocation = new Invocation(referenceConfig, operationMeta,
invocationRuntimeType, arguments);
+ Invocation invocation = new Invocation(referenceConfig, operationMeta,
invocationRuntimeType, null);
Assertions.assertTrue(invocation.isConsumer());
}
@Test
public void localContext(@Mocked ReferenceConfig referenceConfig) {
- Invocation invocation = new Invocation(referenceConfig, operationMeta,
invocationRuntimeType, arguments);
+ Invocation invocation = new Invocation(referenceConfig, operationMeta,
invocationRuntimeType, null);
invocation.addLocalContext("k", 1);
Assertions.assertSame(invocation.getHandlerContext(),
invocation.getLocalContext());
@@ -155,7 +150,7 @@ public class TestInvocation {
@Test
public void traceId_fromContext(@Mocked ReferenceConfig referenceConfig) {
- Invocation invocation = new Invocation(referenceConfig, operationMeta,
invocationRuntimeType, arguments);
+ Invocation invocation = new Invocation(referenceConfig, operationMeta,
invocationRuntimeType, null);
invocation.addContext(CoreConst.TRACE_ID_NAME, "abc");
invocation.onStart();
@@ -173,7 +168,7 @@ public class TestInvocation {
result = "abc";
}
};
- Invocation invocation = new Invocation(referenceConfig, operationMeta,
invocationRuntimeType, arguments);
+ Invocation invocation = new Invocation(referenceConfig, operationMeta,
invocationRuntimeType, null);
invocation.onStart();
@@ -189,7 +184,7 @@ public class TestInvocation {
result = "abc";
}
};
- Invocation invocation = new Invocation(endpoint, operationMeta, arguments);
+ Invocation invocation = new Invocation(endpoint, operationMeta, null);
invocation.onStart(requestEx);
@@ -199,6 +194,7 @@ public class TestInvocation {
@Test
public void traceId_producerCreateTraceId(@Mocked Endpoint endpoint, @Mocked
HttpServletRequestEx requestEx) {
+
TraceIdGenerator generator =
SPIServiceUtils.getTargetService(TraceIdGenerator.class,
BraveTraceIdGenerator.class);
new Expectations(generator) {
{
@@ -206,7 +202,7 @@ public class TestInvocation {
result = "abc";
}
};
- Invocation invocation = new Invocation(endpoint, operationMeta, arguments);
+ Invocation invocation = new Invocation(endpoint, operationMeta, null);
invocation.onStart(requestEx);
@@ -250,7 +246,7 @@ public class TestInvocation {
}
};
EventManager.getEventBus().register(listener);
- Invocation invocation = new Invocation(endpoint, operationMeta, arguments);
+ Invocation invocation = new Invocation(endpoint, operationMeta, null);
mockNonaTime();
invocation.onBusinessMethodStart();
EventManager.getEventBus().unregister(listener);
@@ -265,12 +261,12 @@ public class TestInvocation {
public void marker(@Mocked ReferenceConfig referenceConfig) {
Invocation.INVOCATION_ID.set(0);
- Invocation invocation = new Invocation(referenceConfig, operationMeta,
invocationRuntimeType, arguments);
+ Invocation invocation = new Invocation(referenceConfig, operationMeta,
invocationRuntimeType, null);
invocation.addContext(CoreConst.TRACE_ID_NAME, "abc");
invocation.onStart();
Assertions.assertEquals("abc", invocation.getTraceIdLogger().getName());
- invocation = new Invocation(referenceConfig, operationMeta,
invocationRuntimeType, arguments);
+ invocation = new Invocation(referenceConfig, operationMeta,
invocationRuntimeType, null);
invocation.addContext(CoreConst.TRACE_ID_NAME, "abc");
invocation.onStart();
Assertions.assertEquals("abc", invocation.getTraceIdLogger().getName());
diff --git a/demo/demo-cse-v1/consumer/src/main/resources/application.yml
b/demo/demo-cse-v1/consumer/src/main/resources/application.yml
index aa66a2ec7..11f739de4 100644
--- a/demo/demo-cse-v1/consumer/src/main/resources/application.yml
+++ b/demo/demo-cse-v1/consumer/src/main/resources/application.yml
@@ -135,4 +135,3 @@ servicecomb:
secretKey: ${CREDENTIALS_SK}
akskCustomCipher: default
project: cn-south-1
-
diff --git a/demo/demo-edge/README.md b/demo/demo-edge/README.md
index 60a3bbf11..b5a552e06 100644
--- a/demo/demo-edge/README.md
+++ b/demo/demo-edge/README.md
@@ -15,5 +15,3 @@
* 2.0.0: /business/v1/add, /business/v1/dec, /business/v2/add,
/business/v2/dec
Together with router, /business/v1/add will go correctly to 1.0.0 or
1.1.0, and /business/v2/add will go correctly to 2.0.0. Without router,
/business/v2/add may route to 1.0.0 or 1.1.0 and NOT FOUND is reported.
-
-
diff --git a/demo/demo-etcd/test-client/src/main/resources/application.yml
b/demo/demo-etcd/test-client/src/main/resources/application.yml
index 4245a4d2c..adcf259e9 100644
--- a/demo/demo-etcd/test-client/src/main/resources/application.yml
+++ b/demo/demo-etcd/test-client/src/main/resources/application.yml
@@ -33,5 +33,3 @@ test2: applition
test3: service
test4: version
test5: tag
-
-
diff --git
a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/pom.xml
b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/pom.xml
index 8876f7754..47d2859d0 100644
--- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/pom.xml
+++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/pom.xml
@@ -171,4 +171,3 @@
</profile>
</profiles>
</project>
-
diff --git a/demo/demo-zookeeper/consumer/src/main/resources/application.yml
b/demo/demo-zookeeper/consumer/src/main/resources/application.yml
index 80087f7c6..100797f83 100644
--- a/demo/demo-zookeeper/consumer/src/main/resources/application.yml
+++ b/demo/demo-zookeeper/consumer/src/main/resources/application.yml
@@ -34,5 +34,3 @@ servicecomb:
highway:
address: 0.0.0.0:7092
-
-
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index 663f8e427..903e25ad7 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -63,7 +63,7 @@
<junit.version>4.13.2</junit.version>
<junit5.version>5.11.3</junit5.version>
<log4j.version>1.2.17</log4j.version>
- <log4j2.version>2.24.1</log4j2.version>
+ <log4j2.version>2.24.2</log4j2.version>
<maven-model.version>3.9.9</maven-model.version>
<micrometer.version>1.14.1</micrometer.version>
<mockito.version>5.14.2</mockito.version>
