From 73fd389426086c765caca0d21d3bdc9eec8c3729 Mon Sep 17 00:00:00 2001 From: jinrongluo Date: Mon, 7 Feb 2022 18:09:09 -0500 Subject: [PATCH] [Issue #758] fix checkstyle issue --- .../eventmesh/common/utils/IPUtils.java | 14 +++++------ .../EventMeshHTTPConfiguration.java | 23 ++++++++++--------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/IPUtils.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/IPUtils.java index db6c770fdc..e477ea40e2 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/IPUtils.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/IPUtils.java @@ -17,6 +17,8 @@ package org.apache.eventmesh.common.utils; +import org.apache.commons.lang3.StringUtils; + import java.net.Inet6Address; import java.net.InetAddress; import java.net.MalformedURLException; @@ -31,16 +33,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import inet.ipaddr.HostName; -import inet.ipaddr.IPAddress; -import inet.ipaddr.IPAddressString; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import io.netty.channel.Channel; -import org.apache.commons.lang3.StringUtils; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import inet.ipaddr.HostName; +import inet.ipaddr.IPAddress; +import inet.ipaddr.IPAddressString; public class IPUtils { diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfiguration.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfiguration.java index 7482e5a93e..a71b814678 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfiguration.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfiguration.java @@ -17,22 +17,23 @@ package org.apache.eventmesh.runtime.configuration; -import com.google.common.base.Splitter; -import com.google.common.collect.Lists; -import inet.ipaddr.IPAddress; -import inet.ipaddr.IPAddressString; import org.apache.eventmesh.common.config.CommonConfiguration; import org.apache.eventmesh.common.config.ConfigurationWrapper; import org.apache.commons.lang3.StringUtils; -import com.google.common.base.Preconditions; -import org.apache.eventmesh.runtime.boot.EventMeshStartup; +import java.util.Collections; +import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collections; -import java.util.List; +import com.google.common.base.Preconditions; +import com.google.common.base.Splitter; +import com.google.common.collect.Lists; + +import inet.ipaddr.IPAddress; +import inet.ipaddr.IPAddressString; public class EventMeshHTTPConfiguration extends CommonConfiguration { @@ -281,15 +282,15 @@ private static List getBlacklist(String cidrs) { List cidrList = Splitter.on(",").omitEmptyStrings() .trimResults().splitToList(cidrs); - List iPAddresses = Lists.newArrayList(); + List ipAddresses = Lists.newArrayList(); for (String cidr : cidrList) { try { - iPAddresses.add(new IPAddressString(cidr).toAddress()); + ipAddresses.add(new IPAddressString(cidr).toAddress()); } catch (Exception e) { logger.warn("Invalid cidr={}", cidr, e); } } - return iPAddresses; + return ipAddresses; } static class ConfKeys {