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-java-chassis.git
commit e749f347d082a576acc0d9feac7c72bec6a18f41
Author: yaohaishi <yaohai...@huawei.com>
AuthorDate: Mon Feb 12 14:05:08 2018 +0800
SCB-338 rename access log item
---
.../rest/vertx/accesslog/AccessLogGenerator.java | 20 +++----
.../{AccessLogElement.java => AccessLogItem.java} | 4 +-
.../accesslog/element/AccessLogItemFactory.java | 8 +--
.../element/creator/AccessLogItemCreator.java | 4 +-
.../PercentagePrefixConfigurableItemCreator.java | 24 ++++----
.../creator/SimpleAccessLogItemCreator.java | 68 +++++++++++-----------
.../impl/{CookieElement.java => CookieItem.java} | 18 +++---
...eElement.java => DatetimeConfigurableItem.java} | 10 ++--
...ndElement.java => DurationMillisecondItem.java} | 6 +-
...nSecondElement.java => DurationSecondItem.java} | 6 +-
...estElement.java => FirstLineOfRequestItem.java} | 18 +++---
.../{MethodElement.java => HttpMethodItem.java} | 6 +-
.../{StatusElement.java => HttpStatusItem.java} | 6 +-
.../{LocalHostElement.java => LocalHostItem.java} | 6 +-
.../{LocalPortElement.java => LocalPortItem.java} | 6 +-
.../{PlainTextElement.java => PlainTextItem.java} | 8 +--
...{QueryOnlyElement.java => QueryStringItem.java} | 6 +-
...{RemoteHostElement.java => RemoteHostItem.java} | 6 +-
...stHeaderElement.java => RequestHeaderItem.java} | 18 +++---
...otocolElement.java => RequestProtocolItem.java} | 6 +-
...eHeaderElement.java => ResponseHeaderItem.java} | 18 +++---
...esWrittenElement.java => ResponseSizeItem.java} | 8 +--
.../impl/{TraceIdElement.java => TraceIdItem.java} | 6 +-
.../{UriPathOnlyElement.java => UrlPathItem.java} | 6 +-
...QueryElement.java => UrlPathWithQueryItem.java} | 6 +-
.../vertx/accesslog/AccessLogGeneratorTest.java | 26 ++++-----
.../element/AccessLogItemFactoryTest.java | 22 +++----
...ercentagePrefixConfigurableItemCreatorTest.java | 42 ++++++-------
...{CookieElementTest.java => CookieItemTest.java} | 12 ++--
...Test.java => DatetimeConfigurableItemTest.java} | 32 +++++-----
...tTest.java => DurationMillisecondItemTest.java} | 6 +-
...lementTest.java => DurationSecondItemTest.java} | 10 ++--
...ntTest.java => FirstLineOfRequestItemTest.java} | 6 +-
...hodElementTest.java => HttpMethodItemTest.java} | 8 +--
...HostElementTest.java => LocalHostItemTest.java} | 14 ++---
...PortElementTest.java => LocalPortItemTest.java} | 8 +--
...TextElementTest.java => PlainTextItemTest.java} | 6 +-
...lyElementTest.java => QueryStringItemTest.java} | 10 ++--
...ostElementTest.java => RemoteHostItemTest.java} | 14 ++---
...ElementTest.java => RequestHeaderItemTest.java} | 16 ++---
...ementTest.java => RequestProtocolItemTest.java} | 12 ++--
...lementTest.java => ResponseHeaderItemTest.java} | 18 +++---
...nElementTest.java => ResponseSizeItemTest.java} | 10 ++--
...{StatusElementTest.java => StatusItemTest.java} | 8 +--
...raceIdElementTest.java => TraceIdItemTest.java} | 14 ++---
...thOnlyElementTest.java => UrlPathItemTest.java} | 8 +--
...mentTest.java => UrlPathWithQueryItemTest.java} | 12 ++--
47 files changed, 306 insertions(+), 306 deletions(-)
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
index 38b0d19..f9fcb9a 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGenerator.java
@@ -2,7 +2,7 @@ package org.apache.servicecomb.transport.rest.vertx.accesslog;
import java.util.List;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItemFactory;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogItemLocation;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogPatternParser;
@@ -16,32 +16,32 @@ public class AccessLogGenerator {
/**
* traversal this array to generate access log segment.
*/
- private AccessLogElement[] accessLogElements;
+ private AccessLogItem[] accessLogItems;
private AccessLogItemFactory accessLogItemFactory = new
AccessLogItemFactory();
public AccessLogGenerator(String rawPattern, AccessLogPatternParser
accessLogPatternParser) {
List<AccessLogItemLocation> locationList =
accessLogPatternParser.parsePattern(rawPattern);
- List<AccessLogElement> itemList =
accessLogItemFactory.createAccessLogItem(rawPattern, locationList);
- accessLogElements = new AccessLogElement[itemList.size()];
- accessLogElements = itemList.toArray(accessLogElements);
+ List<AccessLogItem> itemList =
accessLogItemFactory.createAccessLogItem(rawPattern, locationList);
+ accessLogItems = new AccessLogItem[itemList.size()];
+ accessLogItems = itemList.toArray(accessLogItems);
}
public String generateLog(AccessLogParam accessLogParam) {
StringBuilder log = new StringBuilder(128);
accessLogParam.setEndMillisecond(System.currentTimeMillis());
- AccessLogElement[] accessLogElements = getAccessLogElements();
- for (int i = 0; i < accessLogElements.length; ++i) {
- log.append(accessLogElements[i].getFormattedElement(accessLogParam));
+ AccessLogItem[] accessLogItems = getAccessLogItems();
+ for (int i = 0; i < accessLogItems.length; ++i) {
+ log.append(accessLogItems[i].getFormattedItem(accessLogParam));
}
return log.toString();
}
- private AccessLogElement[] getAccessLogElements() {
- return accessLogElements;
+ private AccessLogItem[] getAccessLogItems() {
+ return accessLogItems;
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItem.java
similarity index 92%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItem.java
index 2c15e31..2def319 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItem.java
@@ -22,12 +22,12 @@ import
org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
/**
* element should be printed into access log.
*/
-public interface AccessLogElement {
+public interface AccessLogItem {
/**
* find out specified content from {@link AccessLogParam}, format the
content and return it.
*
* @param accessLogParam
* @return
*/
- String getFormattedElement(AccessLogParam accessLogParam);
+ String getFormattedItem(AccessLogParam accessLogParam);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItemFactory.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItemFactory.java
index 949fee7..53b3f35 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItemFactory.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItemFactory.java
@@ -13,8 +13,8 @@ public class AccessLogItemFactory {
private List<AccessLogItemCreator> creatorList = Arrays
.asList(new SimpleAccessLogItemCreator(), new
PercentagePrefixConfigurableItemCreator());
- public List<AccessLogElement> createAccessLogItem(String rawPattern,
List<AccessLogItemLocation> locationList) {
- List<AccessLogElement> itemList = new ArrayList<>();
+ public List<AccessLogItem> createAccessLogItem(String rawPattern,
List<AccessLogItemLocation> locationList) {
+ List<AccessLogItem> itemList = new ArrayList<>();
for (AccessLogItemLocation location : locationList) {
setItemList(rawPattern, itemList, location);
}
@@ -22,8 +22,8 @@ public class AccessLogItemFactory {
return itemList;
}
- private void setItemList(String rawPattern, List<AccessLogElement> itemList,
AccessLogItemLocation location) {
- AccessLogElement item = null;
+ private void setItemList(String rawPattern, List<AccessLogItem> itemList,
AccessLogItemLocation location) {
+ AccessLogItem item = null;
for (AccessLogItemCreator creator : creatorList) {
item = creator.create(rawPattern, location);
if (null != item) {
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/AccessLogItemCreator.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/AccessLogItemCreator.java
index 73e5f25..1b51a6a 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/AccessLogItemCreator.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/AccessLogItemCreator.java
@@ -1,8 +1,8 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.creator;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogItemLocation;
public interface AccessLogItemCreator {
- AccessLogElement create(String rawPattern, AccessLogItemLocation location);
+ AccessLogItem create(String rawPattern, AccessLogItemLocation location);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/PercentagePrefixConfigurableItemCreator.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/PercentagePrefixConfigurableItemCreator.java
index fb0ac96..d2796b5 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/PercentagePrefixConfigurableItemCreator.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/PercentagePrefixConfigurableItemCreator.java
@@ -1,29 +1,29 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.creator;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.CookieElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DatetimeConfigurableElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.PlainTextElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.RequestHeaderElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.ResponseHeaderElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.CookieItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DatetimeConfigurableItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.PlainTextItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.RequestHeaderItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.ResponseHeaderItem;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogItemLocation;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.placeholder.AccessLogItemTypeEnum;
public class PercentagePrefixConfigurableItemCreator implements
AccessLogItemCreator {
@Override
- public AccessLogElement create(String rawPattern, AccessLogItemLocation
location) {
+ public AccessLogItem create(String rawPattern, AccessLogItemLocation
location) {
String config = getConfig(rawPattern, location);
switch (location.getPlaceHolder()) {
case DATETIME_CONFIGURABLE:
- return new DatetimeConfigurableElement(config);
+ return new DatetimeConfigurableItem(config);
case REQUEST_HEADER:
- return new RequestHeaderElement(config);
+ return new RequestHeaderItem(config);
case RESPONSE_HEADER:
- return new ResponseHeaderElement(config);
+ return new ResponseHeaderItem(config);
case COOKIE:
- return new CookieElement(config);
+ return new CookieItem(config);
case TEXT_PLAIN:
- return new PlainTextElement(config);
+ return new PlainTextItem(config);
default:
// unexpected situation
return null;
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/SimpleAccessLogItemCreator.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/SimpleAccessLogItemCreator.java
index 2db71be..5ce8e81 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/SimpleAccessLogItemCreator.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/SimpleAccessLogItemCreator.java
@@ -3,49 +3,49 @@ package
org.apache.servicecomb.transport.rest.vertx.accesslog.element.creator;
import java.util.HashMap;
import java.util.Map;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.BytesWrittenElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DatetimeConfigurableElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DurationMillisecondElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DurationSecondElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.FirstLineOfRequestElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.LocalHostElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.LocalPortElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.MethodElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.QueryOnlyElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.RemoteHostElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.StatusElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.TraceIdElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.UriPathIncludeQueryElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.UriPathOnlyElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.VersionOrProtocolElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.ResponseSizeItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DatetimeConfigurableItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DurationMillisecondItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DurationSecondItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.FirstLineOfRequestItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.LocalHostItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.LocalPortItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.HttpMethodItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.QueryStringItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.RemoteHostItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.HttpStatusItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.TraceIdItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.UrlPathWithQueryItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.UrlPathItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.RequestProtocolItem;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogItemLocation;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.placeholder.AccessLogItemTypeEnum;
public class SimpleAccessLogItemCreator implements AccessLogItemCreator {
- private static final Map<AccessLogItemTypeEnum, AccessLogElement>
SIMPLE_ACCESSLOG_ITEM_MAP = new HashMap<>();
+ private static final Map<AccessLogItemTypeEnum, AccessLogItem>
SIMPLE_ACCESSLOG_ITEM_MAP = new HashMap<>();
static {
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.HTTP_METHOD, new
MethodElement());
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.HTTP_STATUS, new
StatusElement());
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.DURATION_IN_SECOND,
new DurationSecondElement());
-
SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.DURATION_IN_MILLISECOND,
new DurationMillisecondElement());
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.REMOTE_HOSTNAME, new
RemoteHostElement());
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.LOCAL_HOSTNAME, new
LocalHostElement());
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.LOCAL_PORT, new
LocalPortElement());
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.RESPONSE_SIZE, new
BytesWrittenElement("0"));
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.RESPONSE_SIZE_CLF, new
BytesWrittenElement("-"));
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.FIRST_LINE_OF_REQUEST,
new FirstLineOfRequestElement());
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.URL_PATH, new
UriPathOnlyElement());
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.QUERY_STRING, new
QueryOnlyElement());
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.URL_PATH_WITH_QUERY,
new UriPathIncludeQueryElement());
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.REQUEST_PROTOCOL, new
VersionOrProtocolElement());
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.DATETIME_DEFAULT, new
DatetimeConfigurableElement());
- SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.SCB_TRACE_ID, new
TraceIdElement());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.HTTP_METHOD, new
HttpMethodItem());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.HTTP_STATUS, new
HttpStatusItem());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.DURATION_IN_SECOND,
new DurationSecondItem());
+
SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.DURATION_IN_MILLISECOND,
new DurationMillisecondItem());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.REMOTE_HOSTNAME, new
RemoteHostItem());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.LOCAL_HOSTNAME, new
LocalHostItem());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.LOCAL_PORT, new
LocalPortItem());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.RESPONSE_SIZE, new
ResponseSizeItem("0"));
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.RESPONSE_SIZE_CLF, new
ResponseSizeItem("-"));
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.FIRST_LINE_OF_REQUEST,
new FirstLineOfRequestItem());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.URL_PATH, new
UrlPathItem());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.QUERY_STRING, new
QueryStringItem());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.URL_PATH_WITH_QUERY,
new UrlPathWithQueryItem());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.REQUEST_PROTOCOL, new
RequestProtocolItem());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.DATETIME_DEFAULT, new
DatetimeConfigurableItem());
+ SIMPLE_ACCESSLOG_ITEM_MAP.put(AccessLogItemTypeEnum.SCB_TRACE_ID, new
TraceIdItem());
}
@Override
- public AccessLogElement create(String rawPattern, AccessLogItemLocation
location) {
+ public AccessLogItem create(String rawPattern, AccessLogItemLocation
location) {
return SIMPLE_ACCESSLOG_ITEM_MAP.get(location.getPlaceHolder());
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/CookieElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/CookieItem.java
similarity index 80%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/CookieElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/CookieItem.java
index 608b238..d6cd280 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/CookieElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/CookieItem.java
@@ -20,22 +20,22 @@ package
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import java.util.Set;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import io.vertx.ext.web.Cookie;
-public class CookieElement implements AccessLogElement {
+public class CookieItem implements AccessLogItem {
public static final String RESULT_NOT_FOUND = "-";
- private final String identifier;
+ private final String varName;
- public CookieElement(String identifier) {
- this.identifier = identifier;
+ public CookieItem(String varName) {
+ this.varName = varName;
}
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
Set<Cookie> cookieSet = accessLogParam.getRoutingContext().cookies();
if (null == cookieSet) {
return RESULT_NOT_FOUND;
@@ -43,7 +43,7 @@ public class CookieElement implements AccessLogElement {
String result = null;
for (Cookie cookie : cookieSet) {
- if (identifier.equals(cookie.getName())) {
+ if (varName.equals(cookie.getName())) {
result = cookie.getValue();
}
}
@@ -55,7 +55,7 @@ public class CookieElement implements AccessLogElement {
return result;
}
- public String getIdentifier() {
- return identifier;
+ public String getVarName() {
+ return varName;
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DatetimeConfigurableElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DatetimeConfigurableItem.java
similarity index 93%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DatetimeConfigurableElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DatetimeConfigurableItem.java
index 318ac7d..d139cce 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DatetimeConfigurableElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DatetimeConfigurableItem.java
@@ -23,13 +23,13 @@ import java.util.Locale;
import java.util.TimeZone;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import org.springframework.util.StringUtils;
/**
* Configurable datetime element.
*/
-public class DatetimeConfigurableElement implements AccessLogElement {
+public class DatetimeConfigurableItem implements AccessLogItem {
public static final String DEFAULT_DATETIME_PATTERN = "EEE, dd MMM yyyy
HH:mm:ss zzz";
@@ -46,7 +46,7 @@ public class DatetimeConfigurableElement implements
AccessLogElement {
/**
* all config is set to default value.
*/
- public DatetimeConfigurableElement() {
+ public DatetimeConfigurableItem() {
this(DEFAULT_DATETIME_PATTERN);
}
@@ -54,7 +54,7 @@ public class DatetimeConfigurableElement implements
AccessLogElement {
* the configurations not specified will get a default value.
* @param config the format of config is "PATTERN|TIMEZONE|LOCALE" or
"PATTERN". It depends on whether the config contains the separator "|"
*/
- public DatetimeConfigurableElement(String config) {
+ public DatetimeConfigurableItem(String config) {
String[] configArr = null;
if (config.contains("|")) {
configArr = splitConfig(config);
@@ -82,7 +82,7 @@ public class DatetimeConfigurableElement implements
AccessLogElement {
}
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
SimpleDateFormat dateFormat = getDatetimeFormat();
return dateFormat.format(new Date(accessLogParam.getStartMillisecond()));
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationMillisecondElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationMillisecondItem.java
similarity index 87%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationMillisecondElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationMillisecondItem.java
index 4d3b535..4978e7f 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationMillisecondElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationMillisecondItem.java
@@ -18,11 +18,11 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
-public class DurationMillisecondElement implements AccessLogElement {
+public class DurationMillisecondItem implements AccessLogItem {
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
return String.valueOf(accessLogParam.getEndMillisecond() -
accessLogParam.getStartMillisecond());
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationSecondElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationSecondItem.java
similarity index 87%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationSecondElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationSecondItem.java
index 4333228..dfa352d 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationSecondElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationSecondItem.java
@@ -18,11 +18,11 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
-public class DurationSecondElement implements AccessLogElement {
+public class DurationSecondItem implements AccessLogItem {
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
return String.valueOf((accessLogParam.getEndMillisecond() -
accessLogParam.getStartMillisecond()) / 1000);
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/FirstLineOfRequestElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/FirstLineOfRequestItem.java
similarity index 64%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/FirstLineOfRequestElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/FirstLineOfRequestItem.java
index d1295b2..d9a8eae 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/FirstLineOfRequestElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/FirstLineOfRequestItem.java
@@ -18,24 +18,24 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
-public class FirstLineOfRequestElement implements AccessLogElement {
- private static final MethodElement METHOD_ELEMENT = new MethodElement();
+public class FirstLineOfRequestItem implements AccessLogItem {
+ private static final HttpMethodItem METHOD_ELEMENT = new HttpMethodItem();
- private static final UriPathOnlyElement URI_PATH_ONLY_ELEMENT = new
UriPathOnlyElement();
+ private static final UrlPathItem URI_PATH_ONLY_ELEMENT = new UrlPathItem();
- private static final VersionOrProtocolElement VERSION_OR_PROTOCOL_ELEMENT =
new VersionOrProtocolElement();
+ private static final RequestProtocolItem VERSION_OR_PROTOCOL_ELEMENT = new
RequestProtocolItem();
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
StringBuilder result = new StringBuilder(64)
.append("\"")
- .append(METHOD_ELEMENT.getFormattedElement(accessLogParam))
+ .append(METHOD_ELEMENT.getFormattedItem(accessLogParam))
.append(" ")
- .append(URI_PATH_ONLY_ELEMENT.getFormattedElement(accessLogParam))
+ .append(URI_PATH_ONLY_ELEMENT.getFormattedItem(accessLogParam))
.append(" ")
-
.append(VERSION_OR_PROTOCOL_ELEMENT.getFormattedElement(accessLogParam))
+ .append(VERSION_OR_PROTOCOL_ELEMENT.getFormattedItem(accessLogParam))
.append("\"");
return result.toString();
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/MethodElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpMethodItem.java
similarity index 90%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/MethodElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpMethodItem.java
index ddbd6ff..cd57c6e 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/MethodElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpMethodItem.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import io.vertx.core.http.HttpMethod;
import io.vertx.core.http.HttpServerRequest;
@@ -26,12 +26,12 @@ import io.vertx.core.http.HttpServerRequest;
/**
* HTTP method
*/
-public class MethodElement implements AccessLogElement {
+public class HttpMethodItem implements AccessLogItem {
public static final String EMPTY_RESULT = "-";
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
HttpServerRequest request = accessLogParam.getRoutingContext().request();
if (null == request) {
return EMPTY_RESULT;
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/StatusElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpStatusItem.java
similarity index 89%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/StatusElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpStatusItem.java
index 17a571c..a408953 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/StatusElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpStatusItem.java
@@ -18,16 +18,16 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import io.vertx.core.http.HttpServerResponse;
-public class StatusElement implements AccessLogElement {
+public class HttpStatusItem implements AccessLogItem {
public static final String EMPTY_RESULT = "-";
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
HttpServerResponse response =
accessLogParam.getRoutingContext().response();
if (null == response) {
return EMPTY_RESULT;
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalHostElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalHostItem.java
similarity index 91%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalHostElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalHostItem.java
index 46c1fd8..55e0099 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalHostElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalHostItem.java
@@ -18,18 +18,18 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import org.springframework.util.StringUtils;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.net.SocketAddress;
-public class LocalHostElement implements AccessLogElement {
+public class LocalHostItem implements AccessLogItem {
public static final String EMPTY_RESULT = "-";
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
HttpServerRequest request = accessLogParam.getRoutingContext().request();
if (null == request) {
return EMPTY_RESULT;
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalPortElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalPortItem.java
similarity index 90%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalPortElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalPortItem.java
index eef4504..be1da62 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalPortElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalPortItem.java
@@ -18,17 +18,17 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.net.SocketAddress;
-public class LocalPortElement implements AccessLogElement {
+public class LocalPortItem implements AccessLogItem {
public static final String EMPTY_RESULT = "-";
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
HttpServerRequest request = accessLogParam.getRoutingContext().request();
if (null == request) {
return EMPTY_RESULT;
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/PlainTextElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/PlainTextItem.java
similarity index 85%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/PlainTextElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/PlainTextItem.java
index dfdd906..abf1460 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/PlainTextElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/PlainTextItem.java
@@ -18,20 +18,20 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
/**
* Print content as it is.
*/
-public class PlainTextElement implements AccessLogElement {
+public class PlainTextItem implements AccessLogItem {
private final String content;
- public PlainTextElement(String content) {
+ public PlainTextItem(String content) {
this.content = content;
}
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
return content;
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/QueryOnlyElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/QueryStringItem.java
similarity index 90%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/QueryOnlyElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/QueryStringItem.java
index e8bc989..de0f003 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/QueryOnlyElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/QueryStringItem.java
@@ -18,17 +18,17 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import org.springframework.util.StringUtils;
import io.vertx.core.http.HttpServerRequest;
-public class QueryOnlyElement implements AccessLogElement {
+public class QueryStringItem implements AccessLogItem {
public static final String EMPTY_RESULT = "-";
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
HttpServerRequest request = accessLogParam.getRoutingContext().request();
if (null == request) {
return EMPTY_RESULT;
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RemoteHostElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RemoteHostItem.java
similarity index 91%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RemoteHostElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RemoteHostItem.java
index b721685..c06291a 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RemoteHostElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RemoteHostItem.java
@@ -18,18 +18,18 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import org.springframework.util.StringUtils;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.net.SocketAddress;
-public class RemoteHostElement implements AccessLogElement {
+public class RemoteHostItem implements AccessLogItem {
public static final String EMPTY_RESULT = "-";
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
HttpServerRequest request = accessLogParam.getRoutingContext().request();
if (null == request) {
return EMPTY_RESULT;
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestHeaderElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestHeaderItem.java
similarity index 78%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestHeaderElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestHeaderItem.java
index aae8a90..12229cf 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestHeaderElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestHeaderItem.java
@@ -18,28 +18,28 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import io.vertx.core.MultiMap;
-public class RequestHeaderElement implements AccessLogElement {
+public class RequestHeaderItem implements AccessLogItem {
public static final String RESULT_NOT_FOUND = "-";
- private final String identifier;
+ private final String varName;
- public RequestHeaderElement(String identifier) {
- this.identifier = identifier;
+ public RequestHeaderItem(String varName) {
+ this.varName = varName;
}
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
MultiMap headers = accessLogParam.getRoutingContext().request().headers();
if (null == headers) {
return "-";
}
- String result = headers.get(identifier);
+ String result = headers.get(varName);
if (null == result) {
return RESULT_NOT_FOUND;
@@ -48,7 +48,7 @@ public class RequestHeaderElement implements AccessLogElement
{
return result;
}
- public String getIdentifier() {
- return identifier;
+ public String getVarName() {
+ return varName;
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/VersionOrProtocolElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestProtocolItem.java
similarity index 91%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/VersionOrProtocolElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestProtocolItem.java
index 1bd0e29..442d758 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/VersionOrProtocolElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestProtocolItem.java
@@ -18,17 +18,17 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.http.HttpVersion;
-public class VersionOrProtocolElement implements AccessLogElement {
+public class RequestProtocolItem implements AccessLogItem {
public static final String EMPTY_RESULT = "-";
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
HttpServerRequest request = accessLogParam.getRoutingContext().request();
if (null == request) {
return EMPTY_RESULT;
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseHeaderElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseHeaderItem.java
similarity index 80%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseHeaderElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseHeaderItem.java
index cbbc4ff..e891bc1 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseHeaderElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseHeaderItem.java
@@ -18,23 +18,23 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import io.vertx.core.MultiMap;
import io.vertx.core.http.HttpServerResponse;
-public class ResponseHeaderElement implements AccessLogElement {
+public class ResponseHeaderItem implements AccessLogItem {
public static final String RESULT_NOT_FOUND = "-";
- private final String identifier;
+ private final String varName;
- public ResponseHeaderElement(String identifier) {
- this.identifier = identifier;
+ public ResponseHeaderItem(String varName) {
+ this.varName = varName;
}
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
HttpServerResponse response =
accessLogParam.getRoutingContext().response();
if (null == response) {
return RESULT_NOT_FOUND;
@@ -45,7 +45,7 @@ public class ResponseHeaderElement implements
AccessLogElement {
return RESULT_NOT_FOUND;
}
- String result = headers.get(identifier);
+ String result = headers.get(varName);
if (null == result) {
return RESULT_NOT_FOUND;
}
@@ -53,7 +53,7 @@ public class ResponseHeaderElement implements
AccessLogElement {
return result;
}
- public String getIdentifier() {
- return identifier;
+ public String getVarName() {
+ return varName;
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/BytesWrittenElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseSizeItem.java
similarity index 87%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/BytesWrittenElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseSizeItem.java
index 2d88feb..8af7ac2 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/BytesWrittenElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseSizeItem.java
@@ -18,20 +18,20 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import io.vertx.core.http.HttpServerResponse;
-public class BytesWrittenElement implements AccessLogElement {
+public class ResponseSizeItem implements AccessLogItem {
// print zeroBytes when bytes is zero
private final String zeroBytes;
- public BytesWrittenElement(String zeroBytesPlaceholder) {
+ public ResponseSizeItem(String zeroBytesPlaceholder) {
zeroBytes = zeroBytesPlaceholder;
}
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
HttpServerResponse response =
accessLogParam.getRoutingContext().response();
if (null == response) {
return zeroBytes;
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/TraceIdElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/TraceIdItem.java
similarity index 92%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/TraceIdElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/TraceIdItem.java
index bfc4b3b..51e8108 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/TraceIdElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/TraceIdItem.java
@@ -21,15 +21,15 @@ import java.util.Map;
import org.apache.servicecomb.common.rest.RestProducerInvocation;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import org.springframework.util.StringUtils;
-public class TraceIdElement implements AccessLogElement {
+public class TraceIdItem implements AccessLogItem {
private static final String TRACE_ID_NOT_FOUND = "-";
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
Map<String, Object> data = accessLogParam.getRoutingContext().data();
if (null == data) {
return TRACE_ID_NOT_FOUND;
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UriPathOnlyElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UrlPathItem.java
similarity index 89%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UriPathOnlyElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UrlPathItem.java
index 9d58b5d..89bd0b4 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UriPathOnlyElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UrlPathItem.java
@@ -18,16 +18,16 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import io.vertx.core.http.HttpServerRequest;
-public class UriPathOnlyElement implements AccessLogElement {
+public class UrlPathItem implements AccessLogItem {
public static final String EMPTY_RESULT = "-";
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
HttpServerRequest request = accessLogParam.getRoutingContext().request();
if (null == request) {
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UriPathIncludeQueryElement.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UrlPathWithQueryItem.java
similarity index 89%
rename from
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UriPathIncludeQueryElement.java
rename to
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UrlPathWithQueryItem.java
index 7235d83..90b815a 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UriPathIncludeQueryElement.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UrlPathWithQueryItem.java
@@ -18,17 +18,17 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
import org.springframework.util.StringUtils;
import io.vertx.core.http.HttpServerRequest;
-public class UriPathIncludeQueryElement implements AccessLogElement {
+public class UrlPathWithQueryItem implements AccessLogItem {
public static final String EMPTY_RESULT = "-";
@Override
- public String getFormattedElement(AccessLogParam accessLogParam) {
+ public String getFormattedItem(AccessLogParam accessLogParam) {
HttpServerRequest request = accessLogParam.getRoutingContext().request();
if (null == request) {
return EMPTY_RESULT;
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGeneratorTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGeneratorTest.java
index 865ca6e..7546dc8 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGeneratorTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/AccessLogGeneratorTest.java
@@ -7,10 +7,10 @@ import java.util.Arrays;
import java.util.List;
import java.util.TimeZone;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DatetimeConfigurableElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.MethodElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.PlainTextElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DatetimeConfigurableItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.HttpMethodItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.PlainTextItem;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogItemLocation;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogPatternParser;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.placeholder.AccessLogItemTypeEnum;
@@ -25,11 +25,11 @@ import mockit.Deencapsulation;
public class AccessLogGeneratorTest {
- private static final AccessLogElement methodElement = new MethodElement();
+ private static final AccessLogItem methodElement = new HttpMethodItem();
- private static final AccessLogElement datetimeElement = new
DatetimeConfigurableElement();
+ private static final AccessLogItem datetimeElement = new
DatetimeConfigurableItem();
- private static final AccessLogElement plainTextElement = new
PlainTextElement(" - ");
+ private static final AccessLogItem plainTextElement = new PlainTextItem(" -
");
private static final AccessLogGenerator ACCESS_LOG_GENERATOR = new
AccessLogGenerator("%m - %t",
new AccessLogPatternParser() {
@@ -46,11 +46,11 @@ public class AccessLogGeneratorTest {
@Test
public void testConstructor() {
- AccessLogElement[] elements =
Deencapsulation.getField(ACCESS_LOG_GENERATOR, "accessLogElements");
+ AccessLogItem[] elements = Deencapsulation.getField(ACCESS_LOG_GENERATOR,
"accessLogElements");
assertEquals(3, elements.length);
- assertEquals(MethodElement.class, elements[0].getClass());
- assertEquals(PlainTextElement.class, elements[1].getClass());
- assertEquals(DatetimeConfigurableElement.class, elements[2].getClass());
+ assertEquals(HttpMethodItem.class, elements[0].getClass());
+ assertEquals(PlainTextItem.class, elements[1].getClass());
+ assertEquals(DatetimeConfigurableItem.class, elements[2].getClass());
}
@Test
@@ -60,8 +60,8 @@ public class AccessLogGeneratorTest {
long startMillisecond = 1416863450581L;
AccessLogParam accessLogParam = new
AccessLogParam().setStartMillisecond(startMillisecond)
.setRoutingContext(context);
- SimpleDateFormat simpleDateFormat = new
SimpleDateFormat(DatetimeConfigurableElement.DEFAULT_DATETIME_PATTERN,
- DatetimeConfigurableElement.DEFAULT_LOCALE);
+ SimpleDateFormat simpleDateFormat = new
SimpleDateFormat(DatetimeConfigurableItem.DEFAULT_DATETIME_PATTERN,
+ DatetimeConfigurableItem.DEFAULT_LOCALE);
simpleDateFormat.setTimeZone(TimeZone.getDefault());
Mockito.when(context.request()).thenReturn(request);
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItemFactoryTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItemFactoryTest.java
index ce534a8..1d95e9c 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItemFactoryTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/AccessLogItemFactoryTest.java
@@ -3,11 +3,11 @@ package
org.apache.servicecomb.transport.rest.vertx.accesslog.element;
import java.util.Arrays;
import java.util.List;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DatetimeConfigurableElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.PlainTextElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.QueryOnlyElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.RequestHeaderElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.UriPathIncludeQueryElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DatetimeConfigurableItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.PlainTextItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.QueryStringItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.RequestHeaderItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.UrlPathWithQueryItem;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogItemLocation;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.placeholder.AccessLogItemTypeEnum;
import org.junit.Assert;
@@ -26,12 +26,12 @@ public class AccessLogItemFactoryTest {
@Test
public void testCreateAccessLogItem() {
- List<AccessLogElement> itemList = new
AccessLogItemFactory().createAccessLogItem(PATTERN, locationList);
+ List<AccessLogItem> itemList = new
AccessLogItemFactory().createAccessLogItem(PATTERN, locationList);
Assert.assertEquals(5, itemList.size());
- Assert.assertEquals(PlainTextElement.class, itemList.get(0).getClass());
- Assert.assertEquals(DatetimeConfigurableElement.class,
itemList.get(1).getClass());
- Assert.assertEquals(QueryOnlyElement.class, itemList.get(2).getClass());
- Assert.assertEquals(UriPathIncludeQueryElement.class,
itemList.get(3).getClass());
- Assert.assertEquals(RequestHeaderElement.class,
itemList.get(4).getClass());
+ Assert.assertEquals(PlainTextItem.class, itemList.get(0).getClass());
+ Assert.assertEquals(DatetimeConfigurableItem.class,
itemList.get(1).getClass());
+ Assert.assertEquals(QueryStringItem.class, itemList.get(2).getClass());
+ Assert.assertEquals(UrlPathWithQueryItem.class,
itemList.get(3).getClass());
+ Assert.assertEquals(RequestHeaderItem.class, itemList.get(4).getClass());
}
}
\ No newline at end of file
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/PercentagePrefixConfigurableItemCreatorTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/PercentagePrefixConfigurableItemCreatorTest.java
index e23e942..eb14330 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/PercentagePrefixConfigurableItemCreatorTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/creator/PercentagePrefixConfigurableItemCreatorTest.java
@@ -1,11 +1,11 @@
package org.apache.servicecomb.transport.rest.vertx.accesslog.element.creator;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.CookieElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DatetimeConfigurableElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.PlainTextElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.RequestHeaderElement;
-import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.ResponseHeaderElement;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.AccessLogItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.CookieItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.DatetimeConfigurableItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.PlainTextItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.RequestHeaderItem;
+import
org.apache.servicecomb.transport.rest.vertx.accesslog.element.impl.ResponseHeaderItem;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.parser.AccessLogItemLocation;
import
org.apache.servicecomb.transport.rest.vertx.accesslog.placeholder.AccessLogItemTypeEnum;
import org.junit.Assert;
@@ -21,10 +21,10 @@ public class PercentagePrefixConfigurableItemCreatorTest {
AccessLogItemLocation location = new
AccessLogItemLocation().setStart(5).setEnd(38).setPlaceHolder(
AccessLogItemTypeEnum.DATETIME_CONFIGURABLE);
- AccessLogElement item = CREATOR.create(PATTERN, location);
+ AccessLogItem item = CREATOR.create(PATTERN, location);
- Assert.assertEquals(DatetimeConfigurableElement.class, item.getClass());
- Assert.assertEquals("EEE, dd MMM yyyy HH:mm:ss zzz",
((DatetimeConfigurableElement) item).getPattern());
+ Assert.assertEquals(DatetimeConfigurableItem.class, item.getClass());
+ Assert.assertEquals("EEE, dd MMM yyyy HH:mm:ss zzz",
((DatetimeConfigurableItem) item).getPattern());
}
@Test
@@ -32,10 +32,10 @@ public class PercentagePrefixConfigurableItemCreatorTest {
AccessLogItemLocation location = new
AccessLogItemLocation().setStart(39).setEnd(51).setPlaceHolder(
AccessLogItemTypeEnum.REQUEST_HEADER);
- AccessLogElement item = CREATOR.create(PATTERN, location);
+ AccessLogItem item = CREATOR.create(PATTERN, location);
- Assert.assertEquals(RequestHeaderElement.class, item.getClass());
- Assert.assertEquals("VARNAME1", ((RequestHeaderElement)
item).getIdentifier());
+ Assert.assertEquals(RequestHeaderItem.class, item.getClass());
+ Assert.assertEquals("VARNAME1", ((RequestHeaderItem) item).getVarName());
}
@@ -44,10 +44,10 @@ public class PercentagePrefixConfigurableItemCreatorTest {
AccessLogItemLocation location = new
AccessLogItemLocation().setStart(52).setEnd(64).setPlaceHolder(
AccessLogItemTypeEnum.RESPONSE_HEADER);
- AccessLogElement item = CREATOR.create(PATTERN, location);
+ AccessLogItem item = CREATOR.create(PATTERN, location);
- Assert.assertEquals(ResponseHeaderElement.class, item.getClass());
- Assert.assertEquals("VARNAME2", ((ResponseHeaderElement)
item).getIdentifier());
+ Assert.assertEquals(ResponseHeaderItem.class, item.getClass());
+ Assert.assertEquals("VARNAME2", ((ResponseHeaderItem) item).getVarName());
}
@Test
@@ -55,10 +55,10 @@ public class PercentagePrefixConfigurableItemCreatorTest {
AccessLogItemLocation location = new
AccessLogItemLocation().setStart(65).setEnd(77).setPlaceHolder(
AccessLogItemTypeEnum.COOKIE);
- AccessLogElement item = CREATOR.create(PATTERN, location);
+ AccessLogItem item = CREATOR.create(PATTERN, location);
- Assert.assertEquals(CookieElement.class, item.getClass());
- Assert.assertEquals("VARNAME3", ((CookieElement) item).getIdentifier());
+ Assert.assertEquals(CookieItem.class, item.getClass());
+ Assert.assertEquals("VARNAME3", ((CookieItem) item).getVarName());
}
@Test
@@ -66,9 +66,9 @@ public class PercentagePrefixConfigurableItemCreatorTest {
AccessLogItemLocation location = new
AccessLogItemLocation().setStart(0).setEnd(5)
.setPlaceHolder(AccessLogItemTypeEnum.TEXT_PLAIN);
- AccessLogElement item = CREATOR.create(PATTERN, location);
+ AccessLogItem item = CREATOR.create(PATTERN, location);
- Assert.assertEquals(PlainTextElement.class, item.getClass());
- Assert.assertEquals("test ", ((PlainTextElement)
item).getFormattedElement(null));
+ Assert.assertEquals(PlainTextItem.class, item.getClass());
+ Assert.assertEquals("test ", ((PlainTextItem)
item).getFormattedItem(null));
}
}
\ No newline at end of file
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/CookieElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/CookieItemTest.java
similarity index 90%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/CookieElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/CookieItemTest.java
index 60b599b..62df16a 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/CookieElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/CookieItemTest.java
@@ -28,11 +28,11 @@ import io.vertx.ext.web.Cookie;
import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.impl.CookieImpl;
-public class CookieElementTest {
+public class CookieItemTest {
public static final String COOKIE_NAME = "cookieName";
- private static final CookieElement ELEMENT = new CookieElement(COOKIE_NAME);
+ private static final CookieItem ELEMENT = new CookieItem(COOKIE_NAME);
@Test
public void getFormattedElement() {
@@ -47,7 +47,7 @@ public class CookieElementTest {
Mockito.when(mockContext.cookies()).thenReturn(cookieSet);
param.setRoutingContext(mockContext);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
Assert.assertEquals(cookieValue, result);
}
@@ -62,7 +62,7 @@ public class CookieElementTest {
Mockito.when(mockContext.cookies()).thenReturn(cookieSet);
param.setRoutingContext(mockContext);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
Assert.assertEquals("-", result);
}
@@ -76,7 +76,7 @@ public class CookieElementTest {
Mockito.when(mockContext.cookies()).thenReturn(null);
param.setRoutingContext(mockContext);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
Assert.assertEquals("-", result);
}
@@ -94,7 +94,7 @@ public class CookieElementTest {
Mockito.when(mockContext.cookies()).thenReturn(cookieSet);
param.setRoutingContext(mockContext);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
Assert.assertEquals("-", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DatetimeConfigurableElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DatetimeConfigurableItemTest.java
similarity index 78%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DatetimeConfigurableElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DatetimeConfigurableItemTest.java
index 0da04a6..f9945ce 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DatetimeConfigurableElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DatetimeConfigurableItemTest.java
@@ -26,82 +26,82 @@ import java.util.TimeZone;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
import org.junit.Test;
-public class DatetimeConfigurableElementTest {
+public class DatetimeConfigurableItemTest {
private static final long START_MILLISECOND = 1416863450581L;
@Test
public void getFormattedElement() {
- DatetimeConfigurableElement element = new DatetimeConfigurableElement(
+ DatetimeConfigurableItem element = new DatetimeConfigurableItem(
"EEE, yyyy MMM dd HH:mm:ss zzz|GMT-08|zh-CN");
AccessLogParam accessLogParam = new
AccessLogParam().setStartMillisecond(START_MILLISECOND);
- String result = element.getFormattedElement(accessLogParam);
+ String result = element.getFormattedItem(accessLogParam);
assertEquals("星期一, 2014 十一月 24 13:10:50 GMT-08:00", result);
}
@Test
public void getFormattedElementOnNoPattern() {
- DatetimeConfigurableElement element = new DatetimeConfigurableElement(
+ DatetimeConfigurableItem element = new DatetimeConfigurableItem(
"|GMT+08|zh-CN");
AccessLogParam accessLogParam = new
AccessLogParam().setStartMillisecond(START_MILLISECOND);
- String result = element.getFormattedElement(accessLogParam);
+ String result = element.getFormattedItem(accessLogParam);
assertEquals("星期二, 25 十一月 2014 05:10:50 GMT+08:00", result);
}
@Test
public void getFormattedElementOnNoTimezone() {
- DatetimeConfigurableElement element = new DatetimeConfigurableElement(
+ DatetimeConfigurableItem element = new DatetimeConfigurableItem(
"yyyy/MM/dd zzz||zh-CN");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd zzz",
Locale.forLanguageTag("zh-CN"));
simpleDateFormat.setTimeZone(TimeZone.getDefault());
AccessLogParam accessLogParam = new
AccessLogParam().setStartMillisecond(START_MILLISECOND);
- String result = element.getFormattedElement(accessLogParam);
+ String result = element.getFormattedItem(accessLogParam);
assertEquals(simpleDateFormat.format(START_MILLISECOND), result);
}
@Test
public void getFormattedElementOnNoLocale() {
- DatetimeConfigurableElement element = new DatetimeConfigurableElement(
+ DatetimeConfigurableItem element = new DatetimeConfigurableItem(
"EEE, dd MMM yyyy HH:mm:ss zzz|GMT+08|");
AccessLogParam accessLogParam = new
AccessLogParam().setStartMillisecond(START_MILLISECOND);
- String result = element.getFormattedElement(accessLogParam);
+ String result = element.getFormattedItem(accessLogParam);
assertEquals("Tue, 25 Nov 2014 05:10:50 GMT+08:00", result);
}
@Test
public void getFormattedElementOnNoConfig() {
- DatetimeConfigurableElement element = new DatetimeConfigurableElement(
+ DatetimeConfigurableItem element = new DatetimeConfigurableItem(
"||");
- SimpleDateFormat simpleDateFormat = new
SimpleDateFormat(DatetimeConfigurableElement.DEFAULT_DATETIME_PATTERN,
+ SimpleDateFormat simpleDateFormat = new
SimpleDateFormat(DatetimeConfigurableItem.DEFAULT_DATETIME_PATTERN,
Locale.US);
simpleDateFormat.setTimeZone(TimeZone.getDefault());
AccessLogParam accessLogParam = new
AccessLogParam().setStartMillisecond(START_MILLISECOND);
- String result = element.getFormattedElement(accessLogParam);
+ String result = element.getFormattedItem(accessLogParam);
assertEquals(simpleDateFormat.format(START_MILLISECOND), result);
}
@Test
public void testConstructorWithNoArg() {
- DatetimeConfigurableElement element = new DatetimeConfigurableElement();
+ DatetimeConfigurableItem element = new DatetimeConfigurableItem();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("EEE, dd MMM yyyy
HH:mm:ss zzz", Locale.US);
simpleDateFormat.setTimeZone(TimeZone.getDefault());
AccessLogParam accessLogParam = new
AccessLogParam().setStartMillisecond(START_MILLISECOND);
- String result = element.getFormattedElement(accessLogParam);
+ String result = element.getFormattedItem(accessLogParam);
assertEquals("EEE, dd MMM yyyy HH:mm:ss zzz", element.getPattern());
assertEquals(Locale.US, element.getLocale());
@@ -111,12 +111,12 @@ public class DatetimeConfigurableElementTest {
@Test
public void testConstructorWithNoSeparator() {
- DatetimeConfigurableElement element = new
DatetimeConfigurableElement("yyyy/MM/dd HH:mm:ss zzz");
+ DatetimeConfigurableItem element = new
DatetimeConfigurableItem("yyyy/MM/dd HH:mm:ss zzz");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd
HH:mm:ss zzz", Locale.US);
simpleDateFormat.setTimeZone(TimeZone.getDefault());
AccessLogParam accessLogParam = new
AccessLogParam().setStartMillisecond(START_MILLISECOND);
- String result = element.getFormattedElement(accessLogParam);
+ String result = element.getFormattedItem(accessLogParam);
assertEquals("yyyy/MM/dd HH:mm:ss zzz", element.getPattern());
assertEquals(Locale.US, element.getLocale());
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationMillisecondElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationMillisecondItemTest.java
similarity index 86%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationMillisecondElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationMillisecondItemTest.java
index 3374a8f..ac3283f 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationMillisecondElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationMillisecondItemTest.java
@@ -22,15 +22,15 @@ import static org.junit.Assert.assertEquals;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
import org.junit.Test;
-public class DurationMillisecondElementTest {
+public class DurationMillisecondItemTest {
- public static final DurationMillisecondElement ELEMENT = new
DurationMillisecondElement();
+ public static final DurationMillisecondItem ELEMENT = new
DurationMillisecondItem();
@Test
public void getFormattedElement() {
AccessLogParam param = new
AccessLogParam().setStartMillisecond(1L).setEndMillisecond(2L);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("1", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationSecondElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationSecondItemTest.java
similarity index 84%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationSecondElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationSecondItemTest.java
index 10ea544..f25d53f 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationSecondElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/DurationSecondItemTest.java
@@ -22,15 +22,15 @@ import static org.junit.Assert.assertEquals;
import org.apache.servicecomb.transport.rest.vertx.accesslog.AccessLogParam;
import org.junit.Test;
-public class DurationSecondElementTest {
+public class DurationSecondItemTest {
- public static final DurationSecondElement ELEMENT = new
DurationSecondElement();
+ public static final DurationSecondItem ELEMENT = new DurationSecondItem();
@Test
public void getFormattedElementOn999ms() {
AccessLogParam param = new
AccessLogParam().setStartMillisecond(1L).setEndMillisecond(1000L);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("0", result);
}
@@ -39,7 +39,7 @@ public class DurationSecondElementTest {
public void getFormattedElementOn1000ms() {
AccessLogParam param = new
AccessLogParam().setStartMillisecond(1L).setEndMillisecond(1001L);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("1", result);
}
@@ -48,7 +48,7 @@ public class DurationSecondElementTest {
public void getFormattedElementOn1001ms() {
AccessLogParam param = new
AccessLogParam().setStartMillisecond(1L).setEndMillisecond(1002L);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("1", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/FirstLineOfRequestElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/FirstLineOfRequestItemTest.java
similarity index 90%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/FirstLineOfRequestElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/FirstLineOfRequestItemTest.java
index 84d1bce..39ecd7c 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/FirstLineOfRequestElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/FirstLineOfRequestItemTest.java
@@ -28,9 +28,9 @@ import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.http.HttpVersion;
import io.vertx.ext.web.RoutingContext;
-public class FirstLineOfRequestElementTest {
+public class FirstLineOfRequestItemTest {
- public static final FirstLineOfRequestElement ELEMENT = new
FirstLineOfRequestElement();
+ public static final FirstLineOfRequestItem ELEMENT = new
FirstLineOfRequestItem();
@Test
public void getFormattedElement() {
@@ -45,7 +45,7 @@ public class FirstLineOfRequestElementTest {
Mockito.when(request.path()).thenReturn(uri);
Mockito.when(request.version()).thenReturn(HttpVersion.HTTP_1_1);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("\"DELETE " + uri + " HTTP/1.1\"", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/MethodElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpMethodItemTest.java
similarity index 89%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/MethodElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpMethodItemTest.java
index 3fcccec..5ca705d 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/MethodElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/HttpMethodItemTest.java
@@ -26,7 +26,7 @@ import io.vertx.core.http.HttpMethod;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.ext.web.RoutingContext;
-public class MethodElementTest {
+public class HttpMethodItemTest {
@Test
public void getFormattedElement() {
@@ -36,7 +36,7 @@ public class MethodElementTest {
Mockito.when(request.method()).thenReturn(HttpMethod.DELETE);
AccessLogParam param = new
AccessLogParam().setRoutingContext(routingContext);
- Assert.assertEquals("DELETE", new
MethodElement().getFormattedElement(param));
+ Assert.assertEquals("DELETE", new
HttpMethodItem().getFormattedItem(param));
}
@Test
@@ -46,7 +46,7 @@ public class MethodElementTest {
Mockito.when(routingContext.request()).thenReturn(null);
- Assert.assertEquals("-", new MethodElement().getFormattedElement(param));
+ Assert.assertEquals("-", new HttpMethodItem().getFormattedItem(param));
}
@Test
@@ -58,6 +58,6 @@ public class MethodElementTest {
Mockito.when(routingContext.request()).thenReturn(request);
Mockito.when(request.method()).thenReturn(null);
- Assert.assertEquals("-", new MethodElement().getFormattedElement(param));
+ Assert.assertEquals("-", new HttpMethodItem().getFormattedItem(param));
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalHostElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalHostItemTest.java
similarity index 90%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalHostElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalHostItemTest.java
index 7dd62c9..b12a3aa 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalHostElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalHostItemTest.java
@@ -27,9 +27,9 @@ import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.net.SocketAddress;
import io.vertx.ext.web.RoutingContext;
-public class LocalHostElementTest {
+public class LocalHostItemTest {
- public static final LocalHostElement ELEMENT = new LocalHostElement();
+ public static final LocalHostItem ELEMENT = new LocalHostItem();
@Test
public void getFormattedElement() {
@@ -44,7 +44,7 @@ public class LocalHostElementTest {
Mockito.when(request.localAddress()).thenReturn(localAddress);
Mockito.when(localAddress.host()).thenReturn(localHost);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals(localHost, result);
}
@@ -57,7 +57,7 @@ public class LocalHostElementTest {
param.setRoutingContext(context);
Mockito.when(context.request()).thenReturn(null);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
@@ -72,7 +72,7 @@ public class LocalHostElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.localAddress()).thenReturn(null);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
@@ -89,7 +89,7 @@ public class LocalHostElementTest {
Mockito.when(request.localAddress()).thenReturn(localAddress);
Mockito.when(localAddress.host()).thenReturn(null);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
@@ -107,7 +107,7 @@ public class LocalHostElementTest {
Mockito.when(request.localAddress()).thenReturn(localAddress);
Mockito.when(localAddress.host()).thenReturn(localHost);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalPortElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalPortItemTest.java
similarity index 90%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalPortElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalPortItemTest.java
index d944489..e4a2971 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalPortElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/LocalPortItemTest.java
@@ -27,7 +27,7 @@ import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.net.SocketAddress;
import io.vertx.ext.web.RoutingContext;
-public class LocalPortElementTest {
+public class LocalPortItemTest {
@Test
public void getFormattedElement() {
@@ -41,7 +41,7 @@ public class LocalPortElementTest {
Mockito.when(request.localAddress()).thenReturn(localAddress);
Mockito.when(localAddress.port()).thenReturn(8080);
- String result = new LocalPortElement().getFormattedElement(param);
+ String result = new LocalPortItem().getFormattedItem(param);
assertEquals("8080", result);
}
@@ -54,7 +54,7 @@ public class LocalPortElementTest {
param.setRoutingContext(context);
Mockito.when(context.request()).thenReturn(null);
- String result = new LocalPortElement().getFormattedElement(param);
+ String result = new LocalPortItem().getFormattedItem(param);
assertEquals("-", result);
}
@@ -69,7 +69,7 @@ public class LocalPortElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.localAddress()).thenReturn(null);
- String result = new LocalPortElement().getFormattedElement(param);
+ String result = new LocalPortItem().getFormattedItem(param);
assertEquals("-", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/PlainTextElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/PlainTextItemTest.java
similarity index 85%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/PlainTextElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/PlainTextItemTest.java
index 09779ea..e4f812f 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/PlainTextElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/PlainTextItemTest.java
@@ -21,11 +21,11 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
-public class PlainTextElementTest {
+public class PlainTextItemTest {
@Test
public void getFormattedElement() {
- PlainTextElement element = new PlainTextElement("contentTest");
- assertEquals("contentTest", element.getFormattedElement(null));
+ PlainTextItem element = new PlainTextItem("contentTest");
+ assertEquals("contentTest", element.getFormattedItem(null));
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/QueryOnlyElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/QueryStringItemTest.java
similarity index 89%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/QueryOnlyElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/QueryStringItemTest.java
index 6f07e1e..ec5bbbe 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/QueryOnlyElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/QueryStringItemTest.java
@@ -26,7 +26,7 @@ import org.mockito.Mockito;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.ext.web.RoutingContext;
-public class QueryOnlyElementTest {
+public class QueryStringItemTest {
@Test
public void getFormattedElement() {
@@ -39,7 +39,7 @@ public class QueryOnlyElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.query()).thenReturn(query);
- String result = new QueryOnlyElement().getFormattedElement(param);
+ String result = new QueryStringItem().getFormattedItem(param);
assertEquals(query, result);
}
@@ -52,7 +52,7 @@ public class QueryOnlyElementTest {
param.setRoutingContext(context);
Mockito.when(context.request()).thenReturn(null);
- String result = new QueryOnlyElement().getFormattedElement(param);
+ String result = new QueryStringItem().getFormattedItem(param);
assertEquals("-", result);
}
@@ -67,7 +67,7 @@ public class QueryOnlyElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.query()).thenReturn(null);
- String result = new QueryOnlyElement().getFormattedElement(param);
+ String result = new QueryStringItem().getFormattedItem(param);
assertEquals("-", result);
}
@@ -83,7 +83,7 @@ public class QueryOnlyElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.query()).thenReturn(query);
- String result = new QueryOnlyElement().getFormattedElement(param);
+ String result = new QueryStringItem().getFormattedItem(param);
assertEquals("-", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RemoteHostElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RemoteHostItemTest.java
similarity index 90%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RemoteHostElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RemoteHostItemTest.java
index 2f305e5..c542f18 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RemoteHostElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RemoteHostItemTest.java
@@ -27,9 +27,9 @@ import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.net.SocketAddress;
import io.vertx.ext.web.RoutingContext;
-public class RemoteHostElementTest {
+public class RemoteHostItemTest {
- public static final RemoteHostElement ELEMENT = new RemoteHostElement();
+ public static final RemoteHostItem ELEMENT = new RemoteHostItem();
@Test
public void getFormattedElement() {
@@ -44,7 +44,7 @@ public class RemoteHostElementTest {
Mockito.when(request.remoteAddress()).thenReturn(address);
Mockito.when(address.host()).thenReturn(remoteHost);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals(remoteHost, result);
}
@@ -57,7 +57,7 @@ public class RemoteHostElementTest {
param.setRoutingContext(context);
Mockito.when(context.request()).thenReturn(null);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
@@ -73,7 +73,7 @@ public class RemoteHostElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.remoteAddress()).thenReturn(null);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
@@ -91,7 +91,7 @@ public class RemoteHostElementTest {
Mockito.when(request.remoteAddress()).thenReturn(address);
Mockito.when(address.host()).thenReturn(null);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
@@ -110,7 +110,7 @@ public class RemoteHostElementTest {
Mockito.when(request.remoteAddress()).thenReturn(address);
Mockito.when(address.host()).thenReturn(remoteHost);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestHeaderElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestHeaderItemTest.java
similarity index 85%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestHeaderElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestHeaderItemTest.java
index 0d30ba7..34105ff 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestHeaderElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestHeaderItemTest.java
@@ -27,11 +27,11 @@ import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.http.impl.headers.VertxHttpHeaders;
import io.vertx.ext.web.RoutingContext;
-public class RequestHeaderElementTest {
+public class RequestHeaderItemTest {
- private static final String HEADER_IDENTIFIER = "headerIdentifier";
+ private static final String VAR_NAME = "varName";
- private static final RequestHeaderElement ELEMENT = new
RequestHeaderElement(HEADER_IDENTIFIER);
+ private static final RequestHeaderItem ELEMENT = new
RequestHeaderItem(VAR_NAME);
@Test
public void getFormattedElement() {
@@ -40,15 +40,15 @@ public class RequestHeaderElementTest {
HttpServerRequest mockRequest = Mockito.mock(HttpServerRequest.class);
VertxHttpHeaders headers = new VertxHttpHeaders();
String testValue = "testValue";
- headers.add(HEADER_IDENTIFIER, testValue);
+ headers.add(VAR_NAME, testValue);
Mockito.when(mockContext.request()).thenReturn(mockRequest);
Mockito.when(mockRequest.headers()).thenReturn(headers);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals(testValue, result);
- assertEquals(ELEMENT.getIdentifier(), HEADER_IDENTIFIER);
+ assertEquals(ELEMENT.getVarName(), VAR_NAME);
}
@Test
@@ -60,7 +60,7 @@ public class RequestHeaderElementTest {
Mockito.when(mockContext.request()).thenReturn(mockRequest);
Mockito.when(mockRequest.headers()).thenReturn(null);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
@@ -77,7 +77,7 @@ public class RequestHeaderElementTest {
Mockito.when(mockContext.request()).thenReturn(mockRequest);
Mockito.when(mockRequest.headers()).thenReturn(headers);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/VersionOrProtocolElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestProtocolItemTest.java
similarity index 85%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/VersionOrProtocolElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestProtocolItemTest.java
index cc8efc1..cdaf991 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/VersionOrProtocolElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/RequestProtocolItemTest.java
@@ -27,7 +27,7 @@ import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.http.HttpVersion;
import io.vertx.ext.web.RoutingContext;
-public class VersionOrProtocolElementTest {
+public class RequestProtocolItemTest {
@Test
public void getFormattedElement() {
@@ -39,15 +39,15 @@ public class VersionOrProtocolElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.version()).thenReturn(HttpVersion.HTTP_1_1);
- String result = new VersionOrProtocolElement().getFormattedElement(param);
+ String result = new RequestProtocolItem().getFormattedItem(param);
assertEquals("HTTP/1.1", result);
Mockito.when(request.version()).thenReturn(HttpVersion.HTTP_1_0);
- result = new VersionOrProtocolElement().getFormattedElement(param);
+ result = new RequestProtocolItem().getFormattedItem(param);
assertEquals("HTTP/1.0", result);
Mockito.when(request.version()).thenReturn(HttpVersion.HTTP_2);
- result = new VersionOrProtocolElement().getFormattedElement(param);
+ result = new RequestProtocolItem().getFormattedItem(param);
assertEquals("HTTP/2.0", result);
}
@@ -59,7 +59,7 @@ public class VersionOrProtocolElementTest {
param.setRoutingContext(context);
Mockito.when(context.request()).thenReturn(null);
- String result = new VersionOrProtocolElement().getFormattedElement(param);
+ String result = new RequestProtocolItem().getFormattedItem(param);
assertEquals("-", result);
}
@@ -75,7 +75,7 @@ public class VersionOrProtocolElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.version()).thenReturn(null);
- String result = new VersionOrProtocolElement().getFormattedElement(param);
+ String result = new RequestProtocolItem().getFormattedItem(param);
assertEquals("-", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseHeaderElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseHeaderItemTest.java
similarity index 85%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseHeaderElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseHeaderItemTest.java
index 72753c9..3f4f6ad 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseHeaderElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseHeaderItemTest.java
@@ -27,11 +27,11 @@ import io.vertx.core.http.HttpServerResponse;
import io.vertx.core.http.impl.headers.VertxHttpHeaders;
import io.vertx.ext.web.RoutingContext;
-public class ResponseHeaderElementTest {
+public class ResponseHeaderItemTest {
- private static final String IDENTIFIER = "identifier";
+ private static final String VAR_NAME = "varName";
- private static final ResponseHeaderElement ELEMENT = new
ResponseHeaderElement(IDENTIFIER);
+ private static final ResponseHeaderItem ELEMENT = new
ResponseHeaderItem(VAR_NAME);
@Test
public void getFormattedElement() {
@@ -42,15 +42,15 @@ public class ResponseHeaderElementTest {
String headerValue = "headerValue";
param.setRoutingContext(mockContext);
- headers.add(IDENTIFIER, headerValue);
+ headers.add(VAR_NAME, headerValue);
Mockito.when(mockContext.response()).thenReturn(mockResponse);
Mockito.when(mockResponse.headers()).thenReturn(headers);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals(headerValue, result);
- assertEquals(ELEMENT.getIdentifier(), IDENTIFIER);
+ assertEquals(ELEMENT.getVarName(), VAR_NAME);
}
@Test
@@ -63,7 +63,7 @@ public class ResponseHeaderElementTest {
Mockito.when(mockContext.response()).thenReturn(mockResponse);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
@@ -77,7 +77,7 @@ public class ResponseHeaderElementTest {
Mockito.when(mockContext.response()).thenReturn(null);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
@@ -96,7 +96,7 @@ public class ResponseHeaderElementTest {
Mockito.when(mockContext.response()).thenReturn(mockResponse);
Mockito.when(mockResponse.headers()).thenReturn(headers);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/BytesWrittenElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseSizeItemTest.java
similarity index 89%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/BytesWrittenElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseSizeItemTest.java
index a85e080..1a76314 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/BytesWrittenElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/ResponseSizeItemTest.java
@@ -26,9 +26,9 @@ import org.mockito.Mockito;
import io.vertx.core.http.HttpServerResponse;
import io.vertx.ext.web.RoutingContext;
-public class BytesWrittenElementTest {
+public class ResponseSizeItemTest {
- private static final BytesWrittenElement ELEMENT = new
BytesWrittenElement("0");
+ private static final ResponseSizeItem ELEMENT = new ResponseSizeItem("0");
@Test
public void getFormattedElement() {
@@ -41,7 +41,7 @@ public class BytesWrittenElementTest {
Mockito.when(mockContext.response()).thenReturn(mockResponse);
Mockito.when(mockResponse.bytesWritten()).thenReturn(bytesWritten);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals(String.valueOf(bytesWritten), result);
}
@@ -54,7 +54,7 @@ public class BytesWrittenElementTest {
param.setRoutingContext(mockContext);
Mockito.when(mockContext.response()).thenReturn(null);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("0", result);
}
@@ -71,7 +71,7 @@ public class BytesWrittenElementTest {
Mockito.when(mockContext.response()).thenReturn(mockResponse);
Mockito.when(mockResponse.bytesWritten()).thenReturn(bytesWritten);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("0", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/StatusElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/StatusItemTest.java
similarity index 89%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/StatusElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/StatusItemTest.java
index 4aaab27..e14deb2 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/StatusElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/StatusItemTest.java
@@ -26,9 +26,9 @@ import org.mockito.Mockito;
import io.vertx.core.http.HttpServerResponse;
import io.vertx.ext.web.RoutingContext;
-public class StatusElementTest {
+public class StatusItemTest {
- public static final StatusElement STATUS_ELEMENT = new StatusElement();
+ public static final HttpStatusItem STATUS_ELEMENT = new HttpStatusItem();
@Test
public void getFormattedElement() {
@@ -41,7 +41,7 @@ public class StatusElementTest {
Mockito.when(context.response()).thenReturn(response);
Mockito.when(response.getStatusCode()).thenReturn(statusCode);
- String result = STATUS_ELEMENT.getFormattedElement(param);
+ String result = STATUS_ELEMENT.getFormattedItem(param);
assertEquals("200", result);
}
@@ -55,7 +55,7 @@ public class StatusElementTest {
param.setRoutingContext(context);
Mockito.when(context.response()).thenReturn(null);
- String result = STATUS_ELEMENT.getFormattedElement(param);
+ String result = STATUS_ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/TraceIdElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/TraceIdItemTest.java
similarity index 90%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/TraceIdElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/TraceIdItemTest.java
index 86ededf..670365f 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/TraceIdElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/TraceIdItemTest.java
@@ -33,8 +33,8 @@ import org.mockito.Mockito;
import io.vertx.ext.web.RoutingContext;
import mockit.Deencapsulation;
-public class TraceIdElementTest {
- private static final TraceIdElement ELEMENT = new TraceIdElement();
+public class TraceIdItemTest {
+ private static final TraceIdItem ELEMENT = new TraceIdItem();
@Test
public void testGetFormattedElement() {
@@ -52,7 +52,7 @@ public class TraceIdElementTest {
param.setRoutingContext(routingContext);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
Assert.assertThat(result, is(traceIdTest));
}
@@ -71,11 +71,11 @@ public class TraceIdElementTest {
param.setRoutingContext(routingContext);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
Assert.assertThat(result, is("-"));
Mockito.when(invocation.getContext(Const.TRACE_ID_NAME)).thenReturn(null);
- result = ELEMENT.getFormattedElement(param);
+ result = ELEMENT.getFormattedItem(param);
Assert.assertThat(result, is("-"));
}
@@ -88,7 +88,7 @@ public class TraceIdElementTest {
Mockito.when(routingContext.data()).thenReturn(data);
param.setRoutingContext(routingContext);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
Assert.assertThat(result, is("-"));
}
@@ -100,7 +100,7 @@ public class TraceIdElementTest {
param.setRoutingContext(routingContext);
Mockito.when(routingContext.data()).thenReturn(null);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
Assert.assertThat(result, is("-"));
}
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UriPathOnlyElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UrlPathItemTest.java
similarity index 90%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UriPathOnlyElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UrlPathItemTest.java
index 05eace9..41885d0 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UriPathOnlyElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UrlPathItemTest.java
@@ -25,7 +25,7 @@ import org.mockito.Mockito;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.ext.web.RoutingContext;
-public class UriPathOnlyElementTest {
+public class UrlPathItemTest {
@Test
public void getFormattedElement() {
@@ -38,7 +38,7 @@ public class UriPathOnlyElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.path()).thenReturn(uri);
- String result = new UriPathOnlyElement().getFormattedElement(param);
+ String result = new UrlPathItem().getFormattedItem(param);
Assert.assertEquals(uri, result);
}
@@ -51,7 +51,7 @@ public class UriPathOnlyElementTest {
param.setRoutingContext(context);
Mockito.when(context.request()).thenReturn(null);
- String result = new UriPathOnlyElement().getFormattedElement(param);
+ String result = new UrlPathItem().getFormattedItem(param);
Assert.assertEquals("-", result);
}
@@ -66,7 +66,7 @@ public class UriPathOnlyElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.path()).thenReturn(null);
- String result = new UriPathOnlyElement().getFormattedElement(param);
+ String result = new UrlPathItem().getFormattedItem(param);
Assert.assertEquals("-", result);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UriPathIncludeQueryElementTest.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UrlPathWithQueryItemTest.java
similarity index 88%
rename from
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UriPathIncludeQueryElementTest.java
rename to
transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UrlPathWithQueryItemTest.java
index 90fafa5..9b8f5ce 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UriPathIncludeQueryElementTest.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/accesslog/element/impl/UrlPathWithQueryItemTest.java
@@ -26,9 +26,9 @@ import org.mockito.Mockito;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.ext.web.RoutingContext;
-public class UriPathIncludeQueryElementTest {
+public class UrlPathWithQueryItemTest {
- public static final UriPathIncludeQueryElement ELEMENT = new
UriPathIncludeQueryElement();
+ public static final UrlPathWithQueryItem ELEMENT = new
UrlPathWithQueryItem();
@Test
public void getFormattedElement() {
@@ -41,7 +41,7 @@ public class UriPathIncludeQueryElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.uri()).thenReturn(uri);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals(uri, result);
}
@@ -55,7 +55,7 @@ public class UriPathIncludeQueryElementTest {
param.setRoutingContext(context);
Mockito.when(context.request()).thenReturn(null);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
@@ -70,7 +70,7 @@ public class UriPathIncludeQueryElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.uri()).thenReturn(null);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
@@ -87,7 +87,7 @@ public class UriPathIncludeQueryElementTest {
Mockito.when(context.request()).thenReturn(request);
Mockito.when(request.uri()).thenReturn(uri);
- String result = ELEMENT.getFormattedElement(param);
+ String result = ELEMENT.getFormattedItem(param);
assertEquals("-", result);
}
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
