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/12 11:18:52 UTC

[servicecomb-java-chassis] branch master updated: [SCB-2563] common-access-log remove deprecated Deencapsulation method call (#3061)

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 c20d077be [SCB-2563] common-access-log remove deprecated Deencapsulation method call (#3061)
c20d077be is described below

commit c20d077be8447691a3a7b4d2f261c324e639ab7f
Author: TingTing Wang <19...@qq.com>
AuthorDate: Sun Jun 12 19:18:47 2022 +0800

    [SCB-2563] common-access-log remove deprecated Deencapsulation method call (#3061)
---
 .../servicecomb/common/accessLog/core/AccessLogGenerator.java    | 4 +++-
 .../core/parser/impl/VertxRestAccessLogPatternParser.java        | 9 ++++++++-
 .../common/accessLog/core/AccessLogGeneratorTest.java            | 5 ++---
 .../core/parser/impl/VertxRestAccessLogPatternParserTest.java    | 4 +---
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/AccessLogGenerator.java b/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/AccessLogGenerator.java
index 80c379cc8..d67247d92 100644
--- a/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/AccessLogGenerator.java
+++ b/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/AccessLogGenerator.java
@@ -19,6 +19,7 @@ package org.apache.servicecomb.common.accessLog.core;
 
 import java.util.List;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.servicecomb.common.accessLog.core.element.AccessLogItem;
 import org.apache.servicecomb.common.accessLog.core.parser.AccessLogPatternParser;
 import org.apache.servicecomb.common.accessLog.core.parser.impl.VertxRestAccessLogPatternParser;
@@ -64,7 +65,8 @@ public class AccessLogGenerator {
     return log.toString();
   }
 
-  private AccessLogItem<RoutingContext>[] getAccessLogItems() {
+  @VisibleForTesting
+  AccessLogItem<RoutingContext>[] getAccessLogItems() {
     return accessLogItems;
   }
 }
diff --git a/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParser.java b/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParser.java
index 14b8b4c6f..a763b3d3a 100644
--- a/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParser.java
+++ b/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParser.java
@@ -22,6 +22,7 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.servicecomb.common.accessLog.core.element.AccessLogItem;
 import org.apache.servicecomb.common.accessLog.core.element.impl.PlainTextAccessItem;
 import org.apache.servicecomb.common.accessLog.core.parser.AccessLogItemMeta;
@@ -78,7 +79,13 @@ public class VertxRestAccessLogPatternParser implements AccessLogPatternParser<R
     sortAccessLogItemMeta(this.metaList);
   }
 
-  private List<VertxRestAccessLogItemMeta> loadVertxRestLogItemMeta() {
+  @VisibleForTesting
+  List<VertxRestAccessLogItemMeta> getMetaList() {
+    return metaList;
+  }
+
+  @VisibleForTesting
+  List<VertxRestAccessLogItemMeta> loadVertxRestLogItemMeta() {
     return SPIServiceUtils.getOrLoadSortedService(VertxRestAccessLogItemMeta.class);
   }
 
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/AccessLogGeneratorTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/AccessLogGeneratorTest.java
index f5593b0b1..ee26be04c 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/AccessLogGeneratorTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/AccessLogGeneratorTest.java
@@ -40,7 +40,6 @@ import org.mockito.Mockito;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServerRequest;
 import io.vertx.ext.web.RoutingContext;
-import mockit.Deencapsulation;
 
 public class AccessLogGeneratorTest {
 
@@ -51,7 +50,7 @@ public class AccessLogGeneratorTest {
 
   @Test
   public void testConstructor() {
-    AccessLogItem<RoutingContext>[] elements = Deencapsulation.getField(LOG_GENERATOR, "accessLogItems");
+    AccessLogItem<RoutingContext>[] elements = LOG_GENERATOR.getAccessLogItems();
     Assertions.assertEquals(3, elements.length);
     Assertions.assertEquals(HttpMethodAccessItem.class, elements[0].getClass());
     Assertions.assertEquals(PlainTextAccessItem.class, elements[1].getClass());
@@ -100,7 +99,7 @@ public class AccessLogGeneratorTest {
 
   @Test
   public void testUserDefinedLogGenerator() {
-    AccessLogItem<RoutingContext>[] elements = Deencapsulation.getField(USER_DEFINED_LOG_GENERATOR, "accessLogItems");
+    AccessLogItem<RoutingContext>[] elements = USER_DEFINED_LOG_GENERATOR.getAccessLogItems();
     Assertions.assertEquals(3, elements.length);
     Assertions.assertEquals(RemoteHostAccessItem.class, elements[0].getClass());
     Assertions.assertEquals(PlainTextAccessItem.class, elements[1].getClass());
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParserTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParserTest.java
index 99ed8f6a2..7ce3478db 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParserTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParserTest.java
@@ -53,7 +53,6 @@ import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import io.vertx.ext.web.RoutingContext;
-import mockit.Deencapsulation;
 import mockit.Mock;
 import mockit.MockUp;
 
@@ -338,8 +337,7 @@ public class VertxRestAccessLogPatternParserTest {
 
     VertxRestAccessLogPatternParser parser = new VertxRestAccessLogPatternParser();
 
-    List<VertxRestAccessLogItemMeta> accessLogItemMetaList =
-        Deencapsulation.getField(parser, "metaList");
+    List<VertxRestAccessLogItemMeta> accessLogItemMetaList = parser.getMetaList();
 
     Assertions.assertEquals(7, accessLogItemMetaList.size());
     Assertions.assertEquals("%_", accessLogItemMetaList.get(0).getPrefix());