[SCB-2563] common-access-log remove deprecated Deencapsulation method call (#3061)
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 80c379c..d67247d 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 @@
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 @@
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 14b8b4c..a763b3d 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.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 @@
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 f5593b0..ee26be0 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 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 @@
@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 @@
@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 99ed8f6..7ce3478 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.mockito.Mockito;
import io.vertx.ext.web.RoutingContext;
-import mockit.Deencapsulation;
import mockit.Mock;
import mockit.MockUp;
@@ -338,8 +337,7 @@
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());
