From 8c7b2475ec4d770386d86a7e8d9f35266cce6c15 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Wed, 1 Dec 2021 14:35:36 -0700 Subject: [PATCH 01/32] updated log4j from version 1 to 2 --- .../ansible/roles/traffic-router/defaults/main.yml | 8 ++++---- .../traffic_router/protocol/LanguidPoller.java | 2 +- .../traffic_router/protocol/LanguidProtocol.java | 2 +- .../traffic_router/protocol/RouterNioEndpoint.java | 2 +- .../secure/CertificateDataConverter.java | 2 +- .../traffic_router/secure/CertificateDataListener.java | 2 +- .../traffic_router/secure/CertificateDecoder.java | 2 +- .../traffic_router/secure/CertificateRegistry.java | 2 +- .../traffic_router/secure/KeyManager.java | 2 +- .../traffic_router/tomcat/TomcatLifecycleListener.java | 2 +- .../traffic_router/utils/HttpsProperties.java | 2 +- traffic_router/core/src/main/conf/log4j.properties | 8 ++++---- .../traffic_router/core/config/CertificateChecker.java | 2 +- .../traffic_router/core/config/ConfigHandler.java | 2 +- .../traffic_router/core/dns/DnsSecKeyPairImpl.java | 2 +- .../traffic_router/core/dns/NameServer.java | 2 +- .../traffic_router/core/dns/NameServerMain.java | 2 +- .../traffic_router/core/dns/SignatureManager.java | 2 +- .../traffic_router/core/dns/SignedZoneKey.java | 2 +- .../traffic_router/core/dns/ZoneManager.java | 2 +- .../traffic_router/core/dns/ZoneSignerImpl.java | 2 +- .../traffic_router/core/dns/ZoneUtils.java | 2 +- .../core/dns/protocol/AbstractProtocol.java | 2 +- .../traffic_router/core/dns/protocol/TCP.java | 2 +- .../traffic_router/core/dns/protocol/UDP.java | 2 +- .../traffic_router/core/ds/DeliveryService.java | 2 +- .../core/ds/LetsEncryptDnsChallengeWatcher.java | 2 +- .../traffic_router/core/ds/SteeringRegistry.java | 2 +- .../traffic_router/core/ds/SteeringWatcher.java | 2 +- .../traffic_router/core/edge/CacheLocation.java | 2 +- .../traffic_control/traffic_router/core/edge/Node.java | 2 +- .../traffic_router/core/edge/Resolver.java | 2 +- .../traffic_router/core/http/RouterFilter.java | 2 +- .../core/loc/AbstractServiceUpdater.java | 2 +- .../traffic_router/core/loc/AnonymousIp.java | 2 +- .../core/loc/AnonymousIpConfigUpdater.java | 2 +- .../core/loc/AnonymousIpDatabaseService.java | 2 +- .../core/loc/AnonymousIpDatabaseUpdater.java | 2 +- .../traffic_router/core/loc/AnonymousIpWhitelist.java | 2 +- .../core/loc/FederationMappingBuilder.java | 2 +- .../traffic_router/core/loc/FederationsWatcher.java | 2 +- .../core/loc/MaxmindGeolocationService.java | 2 +- .../traffic_router/core/loc/NetworkNode.java | 2 +- .../traffic_router/core/loc/RegionalGeo.java | 2 +- .../traffic_router/core/loc/RegionalGeoRule.java | 2 +- .../traffic_router/core/loc/RegionalGeoUpdater.java | 2 +- .../core/monitor/TrafficMonitorWatcher.java | 2 +- .../traffic_router/core/router/TrafficRouter.java | 2 +- .../core/router/TrafficRouterManager.java | 2 +- .../traffic_router/core/secure/CertificatesClient.java | 2 +- .../traffic_router/core/secure/CertificatesPoller.java | 2 +- .../core/secure/CertificatesPublisher.java | 2 +- .../core/util/AbstractResourceWatcher.java | 2 +- .../traffic_router/core/util/DataExporter.java | 2 +- .../traffic_router/core/util/Fetcher.java | 2 +- .../traffic_router/core/util/LanguidState.java | 2 +- .../core/util/PeriodicResourceUpdater.java | 2 +- traffic_router/core/src/test/conf/log4j.properties | 10 +++++----- .../traffic_control/traffic_router/core/TestBase.java | 10 +++++----- .../traffic_router/core/TrafficRouterStart.java | 8 ++++---- .../core/dns/protocol/AbstractProtocolTest.java | 2 +- .../core/external/ExternalTestSuite.java | 8 ++++---- .../traffic_router/core/loc/GeoTest.java | 2 +- .../traffic_router/core/loc/NetworkNodeTest.java | 2 +- .../core/router/StatelessTrafficRouterTest.java | 2 +- .../core/util/AbstractResourceWatcherTest.java | 2 +- .../neustar/NeustarGeolocationService.java | 2 +- .../neustar/configuration/NeustarConfiguration.java | 2 +- .../neustar/configuration/ServiceRefresher.java | 2 +- .../TrafficRouterConfigurationListener.java | 2 +- .../traffic_router/neustar/data/HttpClient.java | 2 +- .../neustar/data/NeustarDatabaseUpdater.java | 2 +- .../traffic_router/neustar/data/TarExtractor.java | 2 +- .../traffic_router/neustar/files/FilesMover.java | 2 +- .../src/test/java/data/NeustarDatabaseUpdaterTest.java | 8 ++++---- .../neustar/src/test/java/data/TarExtractorTest.java | 6 +++--- .../geolocation/NeustarGeolocationServiceTest.java | 4 ++-- .../traffic_router/secure/BindPrivateKey.java | 2 +- .../traffic_router/secure/Pkcs1KeySpecDecoder.java | 2 +- .../traffic_control/traffic_router/secure/Pkcs8.java | 2 +- 80 files changed, 106 insertions(+), 106 deletions(-) diff --git a/infrastructure/ansible/roles/traffic-router/defaults/main.yml b/infrastructure/ansible/roles/traffic-router/defaults/main.yml index 7689e12c8c..705ffd3fc9 100644 --- a/infrastructure/ansible/roles/traffic-router/defaults/main.yml +++ b/infrastructure/ansible/roles/traffic-router/defaults/main.yml @@ -129,22 +129,22 @@ tr_cache_config_json_refresh_period: 60000 # log4j.properties tr_log4j_opts: - "# ACCESS is set to be a Syslog Appender" - - log4j.appender.ACCESS=org.apache.log4j.RollingFileAppender + - log4j.appender.ACCESS=org.apache.logging.log4j.RollingFileAppender - "log4j.appender.ACCESS.File={{tr_log_dir}}/access.log" - log4j.appender.ACCESS.MaxFileSize=200MB - log4j.appender.ACCESS.MaxBackupIndex=10 - - "# ACCESS uses PatternLayout." - - log4j.appender.ACCESS.layout=org.apache.log4j.PatternLayout + - log4j.appender.ACCESS.layout=org.apache.logging.log4j.PatternLayout - log4j.appender.ACCESS.layout.ConversionPattern=%m%n - log4j.appender.ACCESS.threshold=INFO - - - log4j.appender.A1=org.apache.log4j.RollingFileAppender + - log4j.appender.A1=org.apache.logging.log4j.RollingFileAppender - "log4j.appender.A1.file={{tr_log_dir}}/traffic_router.log" - log4j.appender.A1.maxFileSize=100MB - - "# A1 uses PatternLayout." - - log4j.appender.A1.layout=org.apache.log4j.PatternLayout + - log4j.appender.A1.layout=org.apache.logging.log4j.PatternLayout - log4j.appender.A1.layout.ConversionPattern=%-5p %d{yyyy-MM-dd'T'HH:mm:ss.SSS} [%t] %c - %m%n - log4j.appender.A1.threshold=ALL - diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidPoller.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidPoller.java index 9a8650d826..1496bfe379 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidPoller.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidPoller.java @@ -15,7 +15,7 @@ package org.apache.traffic_control.traffic_router.protocol; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.lang.management.ManagementFactory; import javax.management.MBeanServer; diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidProtocol.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidProtocol.java index b9d4103724..51796c350c 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidProtocol.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidProtocol.java @@ -17,7 +17,7 @@ import org.apache.coyote.http11.Http11NioProtocol; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; public class LanguidProtocol extends Http11NioProtocol implements RouterProtocolHandler { private static final Logger log = Logger.getLogger(LanguidProtocol.class); diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterNioEndpoint.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterNioEndpoint.java index 5a5957a951..7037cb9ca7 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterNioEndpoint.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterNioEndpoint.java @@ -18,7 +18,7 @@ import org.apache.traffic_control.traffic_router.secure.CertificateRegistry; import org.apache.traffic_control.traffic_router.secure.HandshakeData; import org.apache.traffic_control.traffic_router.secure.KeyManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.apache.tomcat.jni.SSL; import org.apache.tomcat.util.net.NioChannel; import org.apache.tomcat.util.net.NioEndpoint; diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataConverter.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataConverter.java index dacd17c4b4..12f84531f1 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataConverter.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataConverter.java @@ -16,7 +16,7 @@ package org.apache.traffic_control.traffic_router.secure; import org.apache.traffic_control.traffic_router.shared.CertificateData; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateCrtKey; import java.math.BigInteger; diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataListener.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataListener.java index 841e7be53d..21dd7a7f35 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataListener.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataListener.java @@ -16,7 +16,7 @@ package org.apache.traffic_control.traffic_router.secure; import org.apache.traffic_control.traffic_router.shared.CertificateData; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import javax.management.AttributeChangeNotification; import javax.management.Notification; diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDecoder.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDecoder.java index 22f165558f..c991dd42ef 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDecoder.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDecoder.java @@ -15,7 +15,7 @@ package org.apache.traffic_control.traffic_router.secure; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.io.ByteArrayInputStream; import java.security.cert.CertificateFactory; diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateRegistry.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateRegistry.java index 942c46c8a5..0958c6fe58 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateRegistry.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateRegistry.java @@ -18,7 +18,7 @@ import org.apache.traffic_control.traffic_router.protocol.RouterNioEndpoint; import org.apache.traffic_control.traffic_router.shared.CertificateData; import org.apache.traffic_control.traffic_router.utils.HttpsProperties; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.BasicConstraints; import org.bouncycastle.asn1.x509.ExtendedKeyUsage; diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/KeyManager.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/KeyManager.java index 18dacb2af5..47662ca50b 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/KeyManager.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/KeyManager.java @@ -15,7 +15,7 @@ package org.apache.traffic_control.traffic_router.secure; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import javax.net.ssl.ExtendedSSLSession; import javax.net.ssl.SNIServerName; diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java index 4af1c2490f..059b5a9233 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java @@ -21,7 +21,7 @@ import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import javax.management.MBeanServer; diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/utils/HttpsProperties.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/utils/HttpsProperties.java index 6bfd663a17..0f525f6860 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/utils/HttpsProperties.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/utils/HttpsProperties.java @@ -15,7 +15,7 @@ package org.apache.traffic_control.traffic_router.utils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.nio.file.Files; import java.nio.file.Paths; diff --git a/traffic_router/core/src/main/conf/log4j.properties b/traffic_router/core/src/main/conf/log4j.properties index 0771a5b76d..e5a4d46980 100644 --- a/traffic_router/core/src/main/conf/log4j.properties +++ b/traffic_router/core/src/main/conf/log4j.properties @@ -14,22 +14,22 @@ # # ACCESS is set to be a Syslog Appender -log4j.appender.ACCESS=org.apache.log4j.RollingFileAppender +log4j.appender.ACCESS=org.apache.logging.log4j.RollingFileAppender log4j.appender.ACCESS.File=/opt/traffic_router/var/log/access.log log4j.appender.ACCESS.MaxFileSize=200MB log4j.appender.ACCESS.MaxBackupIndex=10 # ACCESS uses PatternLayout. -log4j.appender.ACCESS.layout=org.apache.log4j.PatternLayout +log4j.appender.ACCESS.layout=org.apache.logging.log4j.PatternLayout log4j.appender.ACCESS.layout.ConversionPattern=%m%n log4j.appender.ACCESS.threshold=INFO -log4j.appender.A1=org.apache.log4j.RollingFileAppender +log4j.appender.A1=org.apache.logging.log4j.RollingFileAppender log4j.appender.A1.file=/opt/traffic_router/var/log/traffic_router.log log4j.appender.A1.maxFileSize=100MB # A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout=org.apache.logging.log4j.PatternLayout log4j.appender.A1.layout.ConversionPattern=%-5p %d{yyyy-MM-dd'T'HH:mm:ss.SSS} [%t] %c - %m%n log4j.appender.A1.threshold=ALL diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/CertificateChecker.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/CertificateChecker.java index 8e95350eab..d67532adfc 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/CertificateChecker.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/CertificateChecker.java @@ -18,7 +18,7 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import org.apache.traffic_control.traffic_router.shared.CertificateData; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.util.Iterator; import java.util.List; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java index d30f84d760..6af391adb0 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java @@ -49,7 +49,7 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; import org.apache.traffic_control.traffic_router.core.edge.Cache; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java index a1dbdff102..a8ed2beeda 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java @@ -19,7 +19,7 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.traffic_control.traffic_router.secure.BindPrivateKey; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.xbill.DNS.DNSKEYRecord; import org.xbill.DNS.DNSSEC; import org.xbill.DNS.Master; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java index 73f2242b44..f47c633627 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java @@ -18,7 +18,7 @@ import java.net.InetAddress; import java.util.*; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.xbill.DNS.DClass; import org.xbill.DNS.ExtendedFlags; import org.xbill.DNS.Flags; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java index 48db476240..17cfff9fe6 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.apache.traffic_control.traffic_router.core.dns.protocol.Protocol; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java index db71f00264..86eb212184 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java @@ -39,7 +39,7 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.xbill.DNS.DSRecord; import org.xbill.DNS.Name; import org.xbill.DNS.Record; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java index d874d19742..c6b9fbf00c 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.OptionalLong; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.xbill.DNS.Name; import org.xbill.DNS.RRSIGRecord; import org.xbill.DNS.Record; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java index 674b8cf464..1608a7a19d 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java @@ -51,7 +51,7 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.xbill.DNS.AAAARecord; import org.xbill.DNS.ARecord; import org.xbill.DNS.CNAMERecord; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java index 8338541c37..3bd3646fc9 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java @@ -15,7 +15,7 @@ package org.apache.traffic_control.traffic_router.core.dns; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.xbill.DNS.DNSKEYRecord; import org.xbill.DNS.DNSSEC; import org.xbill.DNS.DSRecord; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java index 3fc63c5a08..8eab9a2036 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java @@ -24,7 +24,7 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import org.xbill.DNS.Record; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; public class ZoneUtils { private static final Logger LOGGER = Logger.getLogger(ZoneUtils.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java index 2def349518..b5b716b63b 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java @@ -18,7 +18,7 @@ import org.apache.traffic_control.traffic_router.core.dns.DNSAccessEventBuilder; import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; import org.apache.traffic_control.traffic_router.core.dns.NameServer; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.xbill.DNS.Message; import org.xbill.DNS.Rcode; import org.xbill.DNS.Section; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java index 28718332ac..675ba408e8 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java @@ -24,7 +24,7 @@ import java.net.Socket; import java.nio.channels.Channels; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.xbill.DNS.Message; import org.xbill.DNS.WireParseException; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java index 3d3a6b8110..7143b04bdc 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java @@ -20,7 +20,7 @@ import java.net.DatagramSocket; import java.net.InetAddress; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.xbill.DNS.Message; import org.xbill.DNS.OPTRecord; import org.xbill.DNS.WireParseException; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java index b9f6648494..aab0360984 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java @@ -40,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.core.edge.Cache; import org.apache.traffic_control.traffic_router.core.edge.InetRecord; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java index 5ebc89c0b5..8b438c95c1 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.io.*; import java.time.Instant; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistry.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistry.java index dc17f0d12c..49ad6fba08 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistry.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistry.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.io.IOException; import java.util.Collection; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringWatcher.java index 2666311c0d..e84b4358b5 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringWatcher.java @@ -16,7 +16,7 @@ package org.apache.traffic_control.traffic_router.core.ds; import org.apache.traffic_control.traffic_router.core.util.AbstractResourceWatcher; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; public class SteeringWatcher extends AbstractResourceWatcher { private static final Logger LOGGER = Logger.getLogger(SteeringWatcher.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java index 246d35490f..f9455a6f5a 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java @@ -25,7 +25,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.geolocation.Geolocation; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java index 6d4214a578..6f01bcabbf 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java @@ -31,7 +31,7 @@ import org.apache.traffic_control.traffic_router.core.hash.DefaultHashable; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; public class Node extends DefaultHashable { private static final Logger LOGGER = Logger.getLogger(Node.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Resolver.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Resolver.java index 32e84dad6f..1663b1ca62 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Resolver.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Resolver.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; public class Resolver { private static final Logger LOGGER = Logger.getLogger(Resolver.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/RouterFilter.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/RouterFilter.java index 0a678f337a..affc10ad68 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/RouterFilter.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/RouterFilter.java @@ -22,7 +22,7 @@ import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java index 797774e97a..60701a6198 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java @@ -35,7 +35,7 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java index 5a57e62289..34c22f33da 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.net.InetAddresses; import com.maxmind.geoip2.model.AnonymousIpResponse; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.core.edge.Cache; import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java index 9ea329e41c..998faaf835 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java @@ -17,7 +17,7 @@ import java.io.File; import java.io.IOException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; public class AnonymousIpConfigUpdater extends AbstractServiceUpdater { private static final Logger LOGGER = Logger.getLogger(AnonymousIpConfigUpdater.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java index 3237b3db76..e2d6228c91 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java @@ -18,7 +18,7 @@ import java.io.IOException; import java.net.InetAddress; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.exception.GeoIp2Exception; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java index 9fde250ee1..256b96d47a 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java @@ -17,7 +17,7 @@ import java.io.File; import java.io.IOException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; @SuppressWarnings({ "PMD.AvoidDuplicateLiterals" }) public class AnonymousIpDatabaseUpdater extends AbstractServiceUpdater { diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java index 206469d4b7..df41fe2bc0 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java @@ -14,7 +14,7 @@ package org.apache.traffic_control.traffic_router.core.loc; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java index a13d68e97d..4b61c62f0b 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java @@ -21,7 +21,7 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.io.IOException; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsWatcher.java index 02029ee1a8..a075a00dd9 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsWatcher.java @@ -16,7 +16,7 @@ package org.apache.traffic_control.traffic_router.core.loc; import org.apache.traffic_control.traffic_router.core.util.AbstractResourceWatcher; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; public class FederationsWatcher extends AbstractResourceWatcher { private static final Logger LOGGER = Logger.getLogger(FederationsWatcher.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java index d17dc0131c..18828aa09b 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.net.InetAddress; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.exception.AddressNotFoundException; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java index ab394c11dc..6d23cfae6d 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java @@ -36,7 +36,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; public class NetworkNode implements Comparable { private static final Logger LOGGER = Logger.getLogger(NetworkNode.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java index 96ef82c1c5..760ba3325c 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java @@ -31,7 +31,7 @@ import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.io.File; import java.net.MalformedURLException; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRule.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRule.java index 053a4eae5a..a0b4b963b2 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRule.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRule.java @@ -15,7 +15,7 @@ package org.apache.traffic_control.traffic_router.core.loc; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.util.List; import java.util.Set; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java index b0f23a481f..c31a3d7597 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java @@ -18,7 +18,7 @@ import java.io.File; import java.io.IOException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; public class RegionalGeoUpdater extends AbstractServiceUpdater { private static final Logger LOGGER = Logger.getLogger(RegionalGeoUpdater.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java index 42373c0fb9..53fffcc9ed 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java @@ -29,7 +29,7 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.core.config.ConfigHandler; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouter.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouter.java index 79b0a8deee..0cea791021 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouter.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouter.java @@ -56,7 +56,7 @@ import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; import org.apache.traffic_control.traffic_router.geolocation.GeolocationService; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.web.util.UriComponentsBuilder; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java index 4a56752433..b8d68a4305 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java @@ -23,7 +23,7 @@ import org.apache.traffic_control.traffic_router.core.ds.SteeringRegistry; import org.apache.traffic_control.traffic_router.core.loc.FederationRegistry; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; import org.apache.traffic_control.traffic_router.core.dns.NameServer; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClient.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClient.java index f8ae18c826..c3df97bc63 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClient.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClient.java @@ -21,7 +21,7 @@ import org.apache.traffic_control.traffic_router.shared.CertificateData; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.net.HttpURLConnection; import java.util.ArrayList; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPoller.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPoller.java index 29cb3c2cf2..2649fc0c81 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPoller.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPoller.java @@ -18,7 +18,7 @@ import org.apache.traffic_control.traffic_router.configuration.ConfigurationListener; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import org.apache.traffic_control.traffic_router.shared.CertificateData; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPublisher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPublisher.java index 514fe30cd1..5a59897673 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPublisher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPublisher.java @@ -27,7 +27,7 @@ import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import javax.management.Attribute; import javax.management.ObjectName; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java index 07d419048b..44450504e0 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java @@ -18,7 +18,7 @@ import org.apache.traffic_control.traffic_router.core.config.WatcherConfig; import org.apache.traffic_control.traffic_router.core.loc.AbstractServiceUpdater; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.io.File; import java.io.FileReader; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java index 8016518429..dcfd8a049c 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java @@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.google.common.cache.CacheStats; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.core.edge.Cache; import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java index d91b3720c2..f5362bc7f3 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java @@ -37,7 +37,7 @@ import javax.net.ssl.X509TrustManager; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; public class Fetcher { diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java index fc1f7755da..93ae4710b5 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java @@ -20,7 +20,7 @@ import java.util.Iterator; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java index 0b490c97e6..eee8bcb885 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java @@ -34,7 +34,7 @@ import java.util.zip.GZIPInputStream; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.asynchttpclient.AsyncCompletionHandler; import org.asynchttpclient.AsyncHttpClient; diff --git a/traffic_router/core/src/test/conf/log4j.properties b/traffic_router/core/src/test/conf/log4j.properties index da8bdbe4ca..5d41d91f7c 100644 --- a/traffic_router/core/src/test/conf/log4j.properties +++ b/traffic_router/core/src/test/conf/log4j.properties @@ -14,25 +14,25 @@ # # ACCESS is set to be a Syslog Appender -log4j.appender.ACCESS=org.apache.log4j.RollingFileAppender +log4j.appender.ACCESS=org.apache.logging.log4j.RollingFileAppender log4j.appender.ACCESS.File=/opt/traffic_router/var/log/access.log log4j.appender.ACCESS.MaxFileSize=200MB log4j.appender.ACCESS.MaxBackupIndex=10 # ACCESS uses PatternLayout. -log4j.appender.ACCESS.layout=org.apache.log4j.PatternLayout +log4j.appender.ACCESS.layout=org.apache.logging.log4j.PatternLayout log4j.appender.ACCESS.layout.ConversionPattern=%m%n log4j.appender.ACCESS.threshold=INFO # A1 is set to be a RollingFileAppender. -#log4j.appender.A1=org.apache.log4j.ConsoleAppender +#log4j.appender.A1=org.apache.logging.log4j.ConsoleAppender -log4j.appender.A1=org.apache.log4j.RollingFileAppender +log4j.appender.A1=org.apache.logging.log4j.RollingFileAppender log4j.appender.A1.file=${deploy.dir}/var/log/traffic_router.log log4j.appender.A1.maxFileSize=100MB # A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout=org.apache.logging.log4j.PatternLayout log4j.appender.A1.layout.ConversionPattern=%-5p %d{yyyy-MM-dd'T'HH:mm:ss.SSS} [%t] %c - %m%n log4j.appender.A1.threshold=ALL diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java index 6f1b072d4a..debe31412a 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java @@ -18,11 +18,11 @@ import org.apache.traffic_control.traffic_router.core.external.HttpDataServer; import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificates; import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; -import org.apache.log4j.PatternLayout; +import org.apache.logging.log4j.ConsoleAppender; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.PatternLayout; import org.springframework.context.ApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java index c8a5aa6e23..634e2b2ad2 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java @@ -15,10 +15,10 @@ package org.apache.traffic_control.traffic_router.core; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; -import org.apache.log4j.PatternLayout; +import org.apache.logging.log4j.ConsoleAppender; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.PatternLayout; public class TrafficRouterStart { diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java index 0d34031b3d..893b17a7e0 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java @@ -18,7 +18,7 @@ import org.apache.traffic_control.traffic_router.core.dns.DNSAccessEventBuilder; import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; import org.apache.traffic_control.traffic_router.core.dns.NameServer; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java index a4e45099fa..642ba64ab7 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java @@ -18,10 +18,10 @@ import org.apache.traffic_control.traffic_router.core.CatalinaTrafficRouter; import org.apache.traffic_control.traffic_router.core.util.ExternalTest; import org.apache.catalina.LifecycleException; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; -import org.apache.log4j.PatternLayout; +import org.apache.logging.log4j.ConsoleAppender; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.PatternLayout; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/GeoTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/GeoTest.java index 380f2f7c16..23d5e4ab22 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/GeoTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/GeoTest.java @@ -16,7 +16,7 @@ package org.apache.traffic_control.traffic_router.core.loc; import org.apache.traffic_control.traffic_router.core.util.IntegrationTest; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java index 7552edbe8c..3f53a4324f 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java @@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.junit.Before; import org.junit.Test; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java index c8bb6e8eb7..5384d1b0db 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java @@ -16,7 +16,7 @@ package org.apache.traffic_control.traffic_router.core.router; import org.apache.traffic_control.traffic_router.core.util.IntegrationTest; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java index 562d11ccdd..7818099cce 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java @@ -24,7 +24,7 @@ import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/NeustarGeolocationService.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/NeustarGeolocationService.java index 80e252df4f..3a13e6061b 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/NeustarGeolocationService.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/NeustarGeolocationService.java @@ -22,7 +22,7 @@ import com.quova.bff.reader.exception.AddressNotFoundException; import com.quova.bff.reader.io.GPDatabaseReader; import com.quova.bff.reader.model.GeoPointResponse; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java index 31ab478eb8..12996900cd 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java @@ -21,7 +21,7 @@ import org.apache.traffic_control.traffic_router.neustar.files.FilesMover; import org.apache.traffic_control.traffic_router.configuration.ConfigurationListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java index 50bdf0751b..a7f8920764 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java @@ -17,7 +17,7 @@ import org.apache.traffic_control.traffic_router.neustar.NeustarGeolocationService; import org.apache.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class ServiceRefresher implements Runnable { diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java index 386a92bffb..49cb785582 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java @@ -16,7 +16,7 @@ package org.apache.traffic_control.traffic_router.neustar.configuration; import org.apache.traffic_control.traffic_router.configuration.ConfigurationListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/HttpClient.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/HttpClient.java index cacee3d197..0d184c8ac4 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/HttpClient.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/HttpClient.java @@ -19,7 +19,7 @@ import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.io.IOException; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java index cfc9007bba..938321a836 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java @@ -22,7 +22,7 @@ import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import java.io.File; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/TarExtractor.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/TarExtractor.java index 43700a5280..e014dbd657 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/TarExtractor.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/TarExtractor.java @@ -17,7 +17,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.io.File; import java.io.FileOutputStream; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/files/FilesMover.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/files/FilesMover.java index fc6a2ba511..47306aefc2 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/files/FilesMover.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/files/FilesMover.java @@ -15,7 +15,7 @@ package org.apache.traffic_control.traffic_router.neustar.files; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.io.File; import java.io.IOException; diff --git a/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java b/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java index dd50d229ec..0e7b4a20a3 100644 --- a/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java +++ b/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java @@ -24,10 +24,10 @@ import org.apache.http.StatusLine; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; -import org.apache.log4j.PatternLayout; +import org.apache.logging.log4j.ConsoleAppender; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.PatternLayout; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/traffic_router/neustar/src/test/java/data/TarExtractorTest.java b/traffic_router/neustar/src/test/java/data/TarExtractorTest.java index cd27a3b44e..456ed0144f 100644 --- a/traffic_router/neustar/src/test/java/data/TarExtractorTest.java +++ b/traffic_router/neustar/src/test/java/data/TarExtractorTest.java @@ -18,9 +18,9 @@ import org.apache.traffic_control.traffic_router.neustar.data.TarExtractor; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.LogManager; -import org.apache.log4j.PatternLayout; +import org.apache.logging.log4j.ConsoleAppender; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.PatternLayout; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java b/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java index 323895903a..f87afd9ce8 100644 --- a/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java +++ b/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java @@ -21,8 +21,8 @@ import com.maxmind.db.Reader; import com.quova.bff.reader.io.GPDatabaseReader; import com.quova.bff.reader.model.GeoPointResponse; -import org.apache.log4j.Appender; -import org.apache.log4j.LogManager; +import org.apache.logging.log4j.Appender; +import org.apache.logging.log4j.LogManager; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java index 311684e9f7..da8516cc1a 100644 --- a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java @@ -15,7 +15,7 @@ package org.apache.traffic_control.traffic_router.secure; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.math.BigInteger; import java.security.KeyFactory; diff --git a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java index bb3796e7b1..5d184154f8 100644 --- a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java @@ -15,7 +15,7 @@ package org.apache.traffic_control.traffic_router.secure; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.bouncycastle.asn1.ASN1Sequence; import org.bouncycastle.asn1.ASN1SequenceParser; import org.bouncycastle.asn1.ASN1Integer; diff --git a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java index 4bd6c19078..bc5f9c230a 100644 --- a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java @@ -15,7 +15,7 @@ package org.apache.traffic_control.traffic_router.secure; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import java.io.IOException; import java.security.GeneralSecurityException; From 6631e35607477c09cee86a7de388f904cdbc5ae4 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Thu, 2 Dec 2021 08:51:28 -0700 Subject: [PATCH 02/32] Updated pom.xml to include pom type tag --- traffic_router/core/pom.xml | 3 ++- traffic_router/neustar/pom.xml | 3 ++- traffic_router/pom.xml | 2 +- traffic_router/shared/pom.xml | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml index 8f3b728d9d..bd4ff75a94 100644 --- a/traffic_router/core/pom.xml +++ b/traffic_router/core/pom.xml @@ -265,9 +265,10 @@ - log4j + org.apache.logging.log4j log4j ${log4j.version} + pom diff --git a/traffic_router/neustar/pom.xml b/traffic_router/neustar/pom.xml index 9465dd2597..6d571e9ed2 100644 --- a/traffic_router/neustar/pom.xml +++ b/traffic_router/neustar/pom.xml @@ -50,9 +50,10 @@ under the License. ${project.parent.version} - log4j + org.apache.logging.log4j log4j ${log4j.version} + pom com.maxmind.geoip2 diff --git a/traffic_router/pom.xml b/traffic_router/pom.xml index 8c2eb726f6..4b0f57bb71 100644 --- a/traffic_router/pom.xml +++ b/traffic_router/pom.xml @@ -33,7 +33,7 @@ /opt/traffic_router 5.2.9.RELEASE - 1.2.17 + 2.14.1 4.12 1.3 2.1.0 diff --git a/traffic_router/shared/pom.xml b/traffic_router/shared/pom.xml index d13bcbea39..3f8578758e 100644 --- a/traffic_router/shared/pom.xml +++ b/traffic_router/shared/pom.xml @@ -59,9 +59,10 @@ under the License. - log4j + org.apache.logging.log4j log4j ${log4j.version} + pom com.fasterxml.jackson.core From 65d1d9090a814fd5088c1af9862e52cece93df1d Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Thu, 2 Dec 2021 12:20:30 -0700 Subject: [PATCH 03/32] Updated pom.xml to remove pom type tag and use log4j-core artifactID. Also added LogManager class. --- traffic_router/core/pom.xml | 3 +- .../core/config/ConfigHandler.java | 68 ++++++------------- .../core/router/TrafficRouterManager.java | 25 ++++--- traffic_router/neustar/pom.xml | 3 +- traffic_router/shared/pom.xml | 3 +- .../traffic_router/secure/BindPrivateKey.java | 3 +- .../secure/Pkcs1KeySpecDecoder.java | 5 +- .../traffic_router/secure/Pkcs8.java | 3 +- 8 files changed, 46 insertions(+), 67 deletions(-) diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml index bd4ff75a94..a4ca31969a 100644 --- a/traffic_router/core/pom.xml +++ b/traffic_router/core/pom.xml @@ -266,9 +266,8 @@ org.apache.logging.log4j - log4j + log4j-core ${log4j.version} - pom diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java index 6af391adb0..650a54c992 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java @@ -15,65 +15,41 @@ package org.apache.traffic_control.traffic_router.core.config; -import java.io.IOException; -import java.net.UnknownHostException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.TreeSet; -import java.util.Iterator; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.apache.traffic_control.traffic_router.core.ds.LetsEncryptDnsChallengeWatcher; -import org.apache.traffic_control.traffic_router.core.ds.SteeringWatcher; -import org.apache.traffic_control.traffic_router.core.loc.FederationsWatcher; -import org.apache.traffic_control.traffic_router.core.loc.GeolocationDatabaseUpdater; -import org.apache.traffic_control.traffic_router.core.loc.NetworkNode; -import org.apache.traffic_control.traffic_router.core.loc.NetworkUpdater; -import org.apache.traffic_control.traffic_router.core.loc.DeepNetworkUpdater; -import org.apache.traffic_control.traffic_router.core.loc.RegionalGeoUpdater; - -import org.apache.traffic_control.traffic_router.core.secure.CertificatesPoller; -import org.apache.traffic_control.traffic_router.core.secure.CertificatesPublisher; -import org.apache.traffic_control.traffic_router.core.util.JsonUtils; -import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; -import org.apache.traffic_control.traffic_router.core.edge.Cache; -import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; -import org.apache.traffic_control.traffic_router.core.edge.Location; -import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; -import org.apache.traffic_control.traffic_router.core.edge.Node; -import org.apache.traffic_control.traffic_router.core.edge.TrafficRouterLocation; import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; import org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher; import org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type; +import org.apache.traffic_control.traffic_router.core.ds.LetsEncryptDnsChallengeWatcher; +import org.apache.traffic_control.traffic_router.core.ds.SteeringWatcher; +import org.apache.traffic_control.traffic_router.core.edge.*; +import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; +import org.apache.traffic_control.traffic_router.core.loc.*; import org.apache.traffic_control.traffic_router.core.monitor.TrafficMonitorWatcher; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.router.StatTracker; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.secure.CertificatesPoller; +import org.apache.traffic_control.traffic_router.core.secure.CertificatesPublisher; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; -import org.apache.traffic_control.traffic_router.core.router.StatTracker; import org.apache.traffic_control.traffic_router.geolocation.Geolocation; -import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; -import org.apache.traffic_control.traffic_router.core.loc.AnonymousIp; -import org.apache.traffic_control.traffic_router.core.loc.AnonymousIpConfigUpdater; -import org.apache.traffic_control.traffic_router.core.loc.AnonymousIpDatabaseUpdater; + +import java.io.IOException; +import java.net.URL; +import java.net.UnknownHostException; +import java.util.*; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; +import java.util.stream.Stream; @SuppressWarnings("PMD.TooManyFields") public class ConfigHandler { - private static final Logger LOGGER = Logger.getLogger(ConfigHandler.class); + private static final Logger LOGGER = LogManager.getLogger(ConfigHandler.class); private static long lastSnapshotTimestamp = 0; private static Object configSync = new Object(); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java index b8d68a4305..c8e785eaa1 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java @@ -15,27 +15,30 @@ package org.apache.traffic_control.traffic_router.core.router; -import java.io.IOException; -import java.net.UnknownHostException; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import org.apache.traffic_control.traffic_router.core.ds.SteeringRegistry; -import org.apache.traffic_control.traffic_router.core.loc.FederationRegistry; import com.fasterxml.jackson.databind.JsonNode; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; import org.apache.traffic_control.traffic_router.core.dns.NameServer; -import org.apache.traffic_control.traffic_router.geolocation.GeolocationService; +import org.apache.traffic_control.traffic_router.core.ds.SteeringRegistry; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.loc.AnonymousIpDatabaseService; +import org.apache.traffic_control.traffic_router.core.loc.FederationRegistry; import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationService; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; -import org.apache.traffic_control.traffic_router.core.loc.AnonymousIpDatabaseService; + +import java.io.IOException; +import java.net.UnknownHostException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + + public class TrafficRouterManager implements ApplicationListener { - private static final Logger LOGGER = Logger.getLogger(TrafficRouterManager.class); + private static final Logger LOGGER = LogManager.getLogger(TrafficRouterManager.class); public static final int DEFAULT_API_PORT = 3333; public static final int DEFAULT_SECURE_API_PORT = 0; // Must be set through server.xml properties diff --git a/traffic_router/neustar/pom.xml b/traffic_router/neustar/pom.xml index 6d571e9ed2..f4cc4912d7 100644 --- a/traffic_router/neustar/pom.xml +++ b/traffic_router/neustar/pom.xml @@ -51,9 +51,8 @@ under the License. org.apache.logging.log4j - log4j + log4j-core ${log4j.version} - pom com.maxmind.geoip2 diff --git a/traffic_router/shared/pom.xml b/traffic_router/shared/pom.xml index 3f8578758e..c674e49e0b 100644 --- a/traffic_router/shared/pom.xml +++ b/traffic_router/shared/pom.xml @@ -60,9 +60,8 @@ under the License. org.apache.logging.log4j - log4j + log4j-core ${log4j.version} - pom com.fasterxml.jackson.core diff --git a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java index da8516cc1a..eee09300ab 100644 --- a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java @@ -16,6 +16,7 @@ package org.apache.traffic_control.traffic_router.secure; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.math.BigInteger; import java.security.KeyFactory; @@ -29,7 +30,7 @@ import static java.util.Base64.getDecoder; public class BindPrivateKey { - private static final Logger LOGGER = Logger.getLogger(BindPrivateKey.class); + private static final Logger LOGGER = LogManager.getLogger(BindPrivateKey.class); private BigInteger decodeBigInt(final String s) { return new BigInteger(1, getDecoder().decode(s.getBytes())); diff --git a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java index 5d184154f8..84fd7f9a1d 100644 --- a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java @@ -16,9 +16,10 @@ package org.apache.traffic_control.traffic_router.secure; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.ASN1Sequence; import org.bouncycastle.asn1.ASN1SequenceParser; -import org.bouncycastle.asn1.ASN1Integer; import java.io.IOException; import java.math.BigInteger; @@ -37,7 +38,7 @@ public class Pkcs1KeySpecDecoder { static final int PRIVATE_SEQUENCE_LENGTH = 9; static final int PUBLIC_SEQUENCE_LENGTH = 2; - private static final Logger LOGGER = Logger.getLogger(Pkcs1KeySpecDecoder.class); + private static final Logger LOGGER = LogManager.getLogger(Pkcs1KeySpecDecoder.class); public KeySpec decode(final String data) throws IOException, GeneralSecurityException { final String pemData = data.replaceAll(HEADER, "").replaceAll(FOOTER, "").replaceAll("\\s", ""); diff --git a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java index bc5f9c230a..ce0755a6e0 100644 --- a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java @@ -16,6 +16,7 @@ package org.apache.traffic_control.traffic_router.secure; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.io.IOException; import java.security.GeneralSecurityException; @@ -24,7 +25,7 @@ import java.util.Base64; public class Pkcs8 extends Pkcs { - private static final Logger LOGGER = Logger.getLogger(Pkcs8.class); + private static final Logger LOGGER = LogManager.getLogger(Pkcs8.class); public static final String HEADER = "-----BEGIN PRIVATE KEY-----"; public static final String FOOTER = "-----END PRIVATE KEY-----"; From d491d7ee3164393b768673d53bb10dc1cd4a4965 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Thu, 2 Dec 2021 12:36:29 -0700 Subject: [PATCH 04/32] Updated java files to use LogManager class instead of logger class for ver 2.14.1 --- .../protocol/LanguidPoller.java | 5 +- .../protocol/LanguidProtocol.java | 3 +- .../protocol/RouterNioEndpoint.java | 3 +- .../secure/CertificateDataConverter.java | 3 +- .../secure/CertificateDataListener.java | 3 +- .../secure/CertificateDecoder.java | 3 +- .../secure/CertificateRegistry.java | 3 +- .../traffic_router/secure/KeyManager.java | 3 +- .../tomcat/TomcatLifecycleListener.java | 3 +- .../traffic_router/utils/HttpsProperties.java | 3 +- .../core/config/CertificateChecker.java | 3 +- .../core/dns/DnsSecKeyPairImpl.java | 3 +- .../traffic_router/core/dns/NameServer.java | 28 ++---- .../core/dns/NameServerMain.java | 10 +-- .../core/dns/SignatureManager.java | 46 ++++------ .../core/dns/SignedZoneKey.java | 11 +-- .../traffic_router/core/dns/ZoneManager.java | 90 ++++++------------- .../core/dns/ZoneSignerImpl.java | 3 +- .../traffic_router/core/dns/ZoneUtils.java | 15 ++-- .../core/dns/protocol/AbstractProtocol.java | 5 +- .../traffic_router/core/dns/protocol/TCP.java | 11 +-- .../traffic_router/core/dns/protocol/UDP.java | 13 +-- .../core/ds/DeliveryService.java | 45 ++++------ .../ds/LetsEncryptDnsChallengeWatcher.java | 3 +- .../core/ds/SteeringRegistry.java | 3 +- .../core/ds/SteeringWatcher.java | 3 +- .../core/edge/CacheLocation.java | 14 +-- .../traffic_router/core/edge/Node.java | 23 ++--- .../traffic_router/core/edge/Resolver.java | 7 +- .../core/http/RouterFilter.java | 3 +- .../core/loc/AbstractServiceUpdater.java | 21 ++--- .../traffic_router/core/loc/AnonymousIp.java | 16 ++-- .../core/loc/AnonymousIpConfigUpdater.java | 7 +- .../core/loc/AnonymousIpDatabaseService.java | 14 +-- .../core/loc/AnonymousIpDatabaseUpdater.java | 7 +- .../core/loc/AnonymousIpWhitelist.java | 3 +- .../core/loc/FederationMappingBuilder.java | 3 +- .../core/loc/FederationsWatcher.java | 3 +- .../core/loc/MaxmindGeolocationService.java | 15 ++-- .../traffic_router/core/loc/NetworkNode.java | 26 +++--- .../traffic_router/core/loc/RegionalGeo.java | 3 +- .../core/loc/RegionalGeoRule.java | 3 +- .../core/loc/RegionalGeoUpdater.java | 7 +- .../core/util/AbstractResourceWatcher.java | 3 +- .../core/util/LanguidState.java | 12 +-- .../traffic_router/secure/BindPrivateKey.java | 2 +- .../secure/Pkcs1KeySpecDecoder.java | 2 +- .../traffic_router/secure/Pkcs8.java | 2 +- 48 files changed, 224 insertions(+), 296 deletions(-) diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidPoller.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidPoller.java index 1496bfe379..7e6e8207b3 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidPoller.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidPoller.java @@ -15,14 +15,15 @@ package org.apache.traffic_control.traffic_router.protocol; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.lang.management.ManagementFactory; import javax.management.MBeanServer; import javax.management.ObjectName; +import java.lang.management.ManagementFactory; public class LanguidPoller extends Thread { - private static final Logger log = Logger.getLogger(LanguidPoller.class); + private static final Logger log = LogManager.getLogger(LanguidPoller.class); final private RouterProtocolHandler protocolHandler; public LanguidPoller(final RouterProtocolHandler protocolHandler) { diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidProtocol.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidProtocol.java index 51796c350c..f12b8a69a1 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidProtocol.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/LanguidProtocol.java @@ -17,10 +17,11 @@ import org.apache.coyote.http11.Http11NioProtocol; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; public class LanguidProtocol extends Http11NioProtocol implements RouterProtocolHandler { - private static final Logger log = Logger.getLogger(LanguidProtocol.class); + private static final Logger log = LogManager.getLogger(LanguidProtocol.class); private boolean ready = false; private boolean initialized = false; private String mbeanPath; diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterNioEndpoint.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterNioEndpoint.java index 7037cb9ca7..affe8adc30 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterNioEndpoint.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/protocol/RouterNioEndpoint.java @@ -18,6 +18,7 @@ import org.apache.traffic_control.traffic_router.secure.CertificateRegistry; import org.apache.traffic_control.traffic_router.secure.HandshakeData; import org.apache.traffic_control.traffic_router.secure.KeyManager; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.tomcat.jni.SSL; import org.apache.tomcat.util.net.NioChannel; @@ -34,7 +35,7 @@ import java.util.Set; public class RouterNioEndpoint extends NioEndpoint { - private static final Logger LOGGER = Logger.getLogger(RouterNioEndpoint.class); + private static final Logger LOGGER = LogManager.getLogger(RouterNioEndpoint.class); private String protocols; // Grabs the aliases from our custom certificate registry, creates a sslHostConfig for them diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataConverter.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataConverter.java index 12f84531f1..ea87a13bfe 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataConverter.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataConverter.java @@ -16,6 +16,7 @@ package org.apache.traffic_control.traffic_router.secure; import org.apache.traffic_control.traffic_router.shared.CertificateData; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateCrtKey; @@ -32,7 +33,7 @@ @SuppressWarnings({"PMD.CyclomaticComplexity"}) public class CertificateDataConverter { - private static final Logger log = Logger.getLogger(CertificateDataConverter.class); + private static final Logger log = LogManager.getLogger(CertificateDataConverter.class); private PrivateKeyDecoder privateKeyDecoder = new PrivateKeyDecoder(); private CertificateDecoder certificateDecoder = new CertificateDecoder(); diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataListener.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataListener.java index 21dd7a7f35..f812c79524 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataListener.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDataListener.java @@ -16,6 +16,7 @@ package org.apache.traffic_control.traffic_router.secure; import org.apache.traffic_control.traffic_router.shared.CertificateData; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import javax.management.AttributeChangeNotification; @@ -25,7 +26,7 @@ import java.util.List; public class CertificateDataListener implements NotificationListener { - private static final Logger log = Logger.getLogger(CertificateDataListener.class); + private static final Logger log = LogManager.getLogger(CertificateDataListener.class); @SuppressWarnings("PMD.AvoidCatchingThrowable") @Override diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDecoder.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDecoder.java index c991dd42ef..fe07e2fb1f 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDecoder.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateDecoder.java @@ -15,6 +15,7 @@ package org.apache.traffic_control.traffic_router.secure; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.ByteArrayInputStream; @@ -25,7 +26,7 @@ import java.util.List; public class CertificateDecoder { - private static final Logger log = Logger.getLogger(CertificateDecoder.class); + private static final Logger log = LogManager.getLogger(CertificateDecoder.class); private static final String CRT_HEADER = "-----BEGIN CERTIFICATE-----"; private static final String CRT_FOOTER = "-----END CERTIFICATE-----"; diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateRegistry.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateRegistry.java index 0958c6fe58..f4c02450d2 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateRegistry.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/CertificateRegistry.java @@ -18,6 +18,7 @@ import org.apache.traffic_control.traffic_router.protocol.RouterNioEndpoint; import org.apache.traffic_control.traffic_router.shared.CertificateData; import org.apache.traffic_control.traffic_router.utils.HttpsProperties; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.BasicConstraints; @@ -55,7 +56,7 @@ public class CertificateRegistry { public static final String DEFAULT_SSL_KEY = "default.invalid"; - private static final Logger log = Logger.getLogger(CertificateRegistry.class); + private static final Logger log = LogManager.getLogger(CertificateRegistry.class); private CertificateDataConverter certificateDataConverter = new CertificateDataConverter(); volatile private Map handshakeDataMap = new HashMap<>(); private RouterNioEndpoint sslEndpoint = null; diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/KeyManager.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/KeyManager.java index 47662ca50b..aea7617d38 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/KeyManager.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/secure/KeyManager.java @@ -15,6 +15,7 @@ package org.apache.traffic_control.traffic_router.secure; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import javax.net.ssl.ExtendedSSLSession; @@ -36,7 +37,7 @@ // once the JVM loads the default classes. public class KeyManager extends X509ExtendedKeyManager implements X509KeyManager { private final CertificateRegistry certificateRegistry = CertificateRegistry.getInstance(); - private static final Logger log = Logger.getLogger(KeyManager.class); + private static final Logger log = LogManager.getLogger(KeyManager.class); // To date this method is not getting exercised while running the router @Override public String chooseClientAlias(final String[] strings, final Principal[] principals, final Socket socket) { diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java index 059b5a9233..78031da31a 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/tomcat/TomcatLifecycleListener.java @@ -21,6 +21,7 @@ import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -29,7 +30,7 @@ import java.lang.management.ManagementFactory; public class TomcatLifecycleListener implements LifecycleListener { - private static final Logger log = Logger.getLogger(LifecycleListener.class); + private static final Logger log = LogManager.getLogger(LifecycleListener.class); private CertificateDataListener certificateDataListener = new CertificateDataListener(); @Override diff --git a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/utils/HttpsProperties.java b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/utils/HttpsProperties.java index 0f525f6860..1e1a297e6c 100644 --- a/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/utils/HttpsProperties.java +++ b/traffic_router/connector/src/main/java/org/apache/traffic_control/traffic_router/utils/HttpsProperties.java @@ -15,6 +15,7 @@ package org.apache.traffic_control.traffic_router.utils; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.nio.file.Files; @@ -23,7 +24,7 @@ import java.util.Map; public class HttpsProperties { - private static final Logger log = Logger.getLogger(HttpsProperties.class); + private static final Logger log = LogManager.getLogger(HttpsProperties.class); private static final String HTTPS_PROPERTIES_FILE = "/opt/traffic_router/conf/https.properties"; private final Map httpsPropertiesMap; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/CertificateChecker.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/CertificateChecker.java index d67532adfc..1e28451107 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/CertificateChecker.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/CertificateChecker.java @@ -18,13 +18,14 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import org.apache.traffic_control.traffic_router.shared.CertificateData; import com.fasterxml.jackson.databind.JsonNode; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.Iterator; import java.util.List; public class CertificateChecker { - private final static Logger LOGGER = Logger.getLogger(CertificateChecker.class); + private final static Logger LOGGER = LogManager.getLogger(CertificateChecker.class); public String getDeliveryServiceType(final JsonNode deliveryServiceJson) { final JsonNode matchsets = deliveryServiceJson.get("matchsets"); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java index a8ed2beeda..785e705787 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/DnsSecKeyPairImpl.java @@ -19,6 +19,7 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.traffic_control.traffic_router.secure.BindPrivateKey; import com.fasterxml.jackson.databind.JsonNode; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xbill.DNS.DNSKEYRecord; import org.xbill.DNS.DNSSEC; @@ -39,7 +40,7 @@ import static java.util.Base64.getMimeDecoder; public class DnsSecKeyPairImpl implements DnsSecKeyPair { - private static final Logger LOGGER = Logger.getLogger(DnsSecKeyPairImpl.class); + private static final Logger LOGGER = LogManager.getLogger(DnsSecKeyPairImpl.class); private long ttl; private Date inception; private Date effective; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java index f47c633627..679930fcc3 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java @@ -15,29 +15,15 @@ package org.apache.traffic_control.traffic_router.core.dns; -import java.net.InetAddress; -import java.util.*; - +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.xbill.DNS.DClass; -import org.xbill.DNS.ExtendedFlags; -import org.xbill.DNS.Flags; -import org.xbill.DNS.Message; -import org.xbill.DNS.Name; -import org.xbill.DNS.OPTRecord; -import org.xbill.DNS.RRset; -import org.xbill.DNS.Rcode; -import org.xbill.DNS.Record; -import org.xbill.DNS.SOARecord; -import org.xbill.DNS.Section; -import org.xbill.DNS.SetResponse; -import org.xbill.DNS.Type; -import org.xbill.DNS.Zone; -import org.xbill.DNS.EDNSOption; -import org.xbill.DNS.ClientSubnetOption; - import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.xbill.DNS.Record; +import org.xbill.DNS.*; + +import java.net.InetAddress; +import java.util.*; public class NameServer { @@ -47,7 +33,7 @@ public class NameServer { private static final int FLAG_DNSSECOK = 1; private static final int FLAG_SIGONLY = 2; - private static final Logger LOGGER = Logger.getLogger(NameServer.class); + private static final Logger LOGGER = LogManager.getLogger(NameServer.class); private boolean ecsEnable = false; private Set ecsEnabledDses = new HashSet<>(); /** diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java index 17cfff9fe6..c190b30d53 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java @@ -15,16 +15,16 @@ package org.apache.traffic_control.traffic_router.core.dns; -import java.util.List; -import java.util.concurrent.ExecutorService; - +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.traffic_control.traffic_router.core.dns.protocol.Protocol; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.apache.traffic_control.traffic_router.core.dns.protocol.Protocol; +import java.util.List; +import java.util.concurrent.ExecutorService; public final class NameServerMain { - private static final Logger LOGGER = Logger.getLogger(NameServerMain.class); + private static final Logger LOGGER = LogManager.getLogger(NameServerMain.class); private ExecutorService protocolService; private List protocols; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java index 86eb212184..2341ee1661 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java @@ -15,44 +15,30 @@ package org.apache.traffic_control.traffic_router.core.dns; -import java.io.IOException; -import java.security.GeneralSecurityException; -import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; -import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; -import org.apache.traffic_control.traffic_router.core.util.JsonUtils; -import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.xbill.DNS.DSRecord; -import org.xbill.DNS.Name; -import org.xbill.DNS.Record; -import org.xbill.DNS.RRSIGRecord; -import org.xbill.DNS.TextParseException; -import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; import org.apache.traffic_control.traffic_router.core.dns.ZoneManager.ZoneCacheType; -import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.traffic_control.traffic_router.core.util.ProtectedFetcher; +import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.xbill.DNS.Record; +import org.xbill.DNS.*; + +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.NoSuchAlgorithmException; +import java.util.*; +import java.util.concurrent.*; public final class SignatureManager { - private static final Logger LOGGER = Logger.getLogger(SignatureManager.class); + private static final Logger LOGGER = LogManager.getLogger(SignatureManager.class); private int expirationMultiplier; private CacheRegister cacheRegister; private static ConcurrentMap> RRSIGCache = new ConcurrentHashMap<>(); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java index c6b9fbf00c..a9cf8f8b0e 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java @@ -15,17 +15,18 @@ package org.apache.traffic_control.traffic_router.core.dns; -import java.util.Calendar; -import java.util.List; -import java.util.OptionalLong; - +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xbill.DNS.Name; import org.xbill.DNS.RRSIGRecord; import org.xbill.DNS.Record; +import java.util.Calendar; +import java.util.List; +import java.util.OptionalLong; + public class SignedZoneKey extends ZoneKey { - private static final Logger LOGGER = Logger.getLogger(SignedZoneKey.class); + private static final Logger LOGGER = LogManager.getLogger(SignedZoneKey.class); private Calendar minimumSignatureExpiration; private Calendar kskExpiration; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java index 1608a7a19d..6aaee2b219 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java @@ -15,88 +15,48 @@ package org.apache.traffic_control.traffic_router.core.dns; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.security.GeneralSecurityException; -import java.security.NoSuchAlgorithmException; -import java.time.Duration; -import java.time.Instant; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -import org.apache.traffic_control.traffic_router.core.edge.Node.IPVersions; -import org.apache.traffic_control.traffic_router.core.util.JsonUtils; -import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; +import com.google.common.cache.*; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListenableFutureTask; import org.apache.commons.io.IOUtils; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.xbill.DNS.AAAARecord; -import org.xbill.DNS.ARecord; -import org.xbill.DNS.CNAMERecord; -import org.xbill.DNS.DClass; -import org.xbill.DNS.NSECRecord; -import org.xbill.DNS.NSRecord; -import org.xbill.DNS.Name; -import org.xbill.DNS.RRSIGRecord; -import org.xbill.DNS.RRset; -import org.xbill.DNS.Record; -import org.xbill.DNS.SOARecord; -import org.xbill.DNS.SetResponse; -import org.xbill.DNS.TextParseException; -import org.xbill.DNS.TXTRecord; -import org.xbill.DNS.Type; -import org.xbill.DNS.Zone; - import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; import org.apache.traffic_control.traffic_router.core.edge.Cache; import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; -import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; -import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; -import org.apache.traffic_control.traffic_router.core.edge.InetRecord; +import org.apache.traffic_control.traffic_router.core.edge.*; import org.apache.traffic_control.traffic_router.core.edge.Resolver; -import org.apache.traffic_control.traffic_router.core.edge.TrafficRouterLocation; +import org.apache.traffic_control.traffic_router.core.edge.Node.IPVersions; import org.apache.traffic_control.traffic_router.core.request.DNSRequest; import org.apache.traffic_control.traffic_router.core.router.DNSRouteResult; import org.apache.traffic_control.traffic_router.core.router.StatTracker; import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheBuilderSpec; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.CacheStats; -import com.google.common.cache.LoadingCache; -import com.google.common.cache.RemovalListener; -import com.google.common.cache.RemovalNotification; -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.ListenableFutureTask; +import org.xbill.DNS.Record; +import org.xbill.DNS.*; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.net.Inet6Address; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.security.GeneralSecurityException; +import java.security.NoSuchAlgorithmException; +import java.time.Duration; +import java.time.Instant; +import java.util.*; +import java.util.concurrent.*; +import java.util.stream.Collectors; public class ZoneManager extends Resolver { - private static final Logger LOGGER = Logger.getLogger(ZoneManager.class); + private static final Logger LOGGER = LogManager.getLogger(ZoneManager.class); private final TrafficRouter trafficRouter; private static LoadingCache dynamicZoneCache = null; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java index 3bd3646fc9..04ab3cf9b7 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImpl.java @@ -15,6 +15,7 @@ package org.apache.traffic_control.traffic_router.core.dns; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xbill.DNS.DNSKEYRecord; import org.xbill.DNS.DNSSEC; @@ -47,7 +48,7 @@ import static org.xbill.DNS.DClass.IN; public class ZoneSignerImpl implements ZoneSigner { - private final static Logger LOGGER = Logger.getLogger(ZoneSignerImpl.class); + private final static Logger LOGGER = LogManager.getLogger(ZoneSignerImpl.class); private Stream toRRStream(final RRset rrSet) { final Iterable iterable = () -> rrSet.rrs(false); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java index 8eab9a2036..3000c71d00 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java @@ -15,19 +15,20 @@ package org.apache.traffic_control.traffic_router.core.dns; +import com.fasterxml.jackson.databind.JsonNode; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.xbill.DNS.Record; + import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.traffic_control.traffic_router.core.util.JsonUtils; -import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; -import com.fasterxml.jackson.databind.JsonNode; -import org.xbill.DNS.Record; -import org.apache.logging.log4j.Logger; - public class ZoneUtils { - private static final Logger LOGGER = Logger.getLogger(ZoneUtils.class); + private static final Logger LOGGER = LogManager.getLogger(ZoneUtils.class); private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH"); protected static long getMaximumTTL(final List records) { diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java index b5b716b63b..5b1f6dccfe 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocol.java @@ -18,6 +18,7 @@ import org.apache.traffic_control.traffic_router.core.dns.DNSAccessEventBuilder; import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; import org.apache.traffic_control.traffic_router.core.dns.NameServer; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xbill.DNS.Message; import org.xbill.DNS.Rcode; @@ -29,8 +30,8 @@ @SuppressWarnings("PMD.MoreThanOneLogger") public abstract class AbstractProtocol implements Protocol { - private static final Logger ACCESS = Logger.getLogger("org.apache.traffic_control.traffic_router.core.access"); - private static final Logger LOGGER = Logger.getLogger(AbstractProtocol.class); + private static final Logger ACCESS = LogManager.getLogger("org.apache.traffic_control.traffic_router.core.access"); + private static final Logger LOGGER = LogManager.getLogger(AbstractProtocol.class); private static final int NUM_SECTIONS = 4; protected boolean shutdownRequested; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java index 675ba408e8..c17d705b53 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java @@ -15,6 +15,11 @@ package org.apache.traffic_control.traffic_router.core.dns.protocol; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.xbill.DNS.Message; +import org.xbill.DNS.WireParseException; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; @@ -24,12 +29,8 @@ import java.net.Socket; import java.nio.channels.Channels; -import org.apache.logging.log4j.Logger; -import org.xbill.DNS.Message; -import org.xbill.DNS.WireParseException; - public class TCP extends AbstractProtocol { - private static final Logger LOGGER = Logger.getLogger(TCP.class); + private static final Logger LOGGER = LogManager.getLogger(TCP.class); private int readTimeout = 3000; // default private ServerSocket serverSocket; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java index 7143b04bdc..81fb2e63cc 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java @@ -15,18 +15,19 @@ package org.apache.traffic_control.traffic_router.core.dns.protocol; -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; - +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xbill.DNS.Message; import org.xbill.DNS.OPTRecord; import org.xbill.DNS.WireParseException; +import java.io.IOException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.InetAddress; + public class UDP extends AbstractProtocol { - private static final Logger LOGGER = Logger.getLogger(UDP.class); + private static final Logger LOGGER = LogManager.getLogger(UDP.class); private static final int UDP_MSG_LENGTH = 512; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java index aab0360984..834f4ac601 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java @@ -15,51 +15,38 @@ package org.apache.traffic_control.traffic_router.core.ds; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLDecoder; -import java.net.UnknownHostException; -import java.security.GeneralSecurityException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; -import java.util.Iterator; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.regex.Pattern; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.JsonNode; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - import org.apache.traffic_control.traffic_router.core.edge.Cache; -import org.apache.traffic_control.traffic_router.core.edge.InetRecord; -import org.apache.traffic_control.traffic_router.core.edge.Location; import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; -import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.core.edge.InetRecord; +import org.apache.traffic_control.traffic_router.core.edge.Location; import org.apache.traffic_control.traffic_router.core.request.DNSRequest; import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; -import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.traffic_control.traffic_router.core.util.StringProtector; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.*; +import java.security.GeneralSecurityException; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.regex.Pattern; @SuppressWarnings({"PMD.TooManyFields","PMD.CyclomaticComplexity", "PMD.AvoidDuplicateLiterals", "PMD.ExcessivePublicCount"}) public class DeliveryService { - protected static final Logger LOGGER = Logger.getLogger(DeliveryService.class); + protected static final Logger LOGGER = LogManager.getLogger(DeliveryService.class); private final String id; @JsonIgnore private final JsonNode ttls; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java index 8b438c95c1..fe663e5612 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/LetsEncryptDnsChallengeWatcher.java @@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.*; @@ -35,7 +36,7 @@ import java.util.List; public class LetsEncryptDnsChallengeWatcher extends AbstractResourceWatcher { - private static final Logger LOGGER = Logger.getLogger(LetsEncryptDnsChallengeWatcher.class); + private static final Logger LOGGER = LogManager.getLogger(LetsEncryptDnsChallengeWatcher.class); public static final String DEFAULT_LE_DNS_CHALLENGE_URL = "https://${toHostname}/api/2.0/letsencrypt/dnsrecords/"; private String configFile; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistry.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistry.java index 49ad6fba08..a513837cd8 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistry.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringRegistry.java @@ -18,6 +18,7 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.IOException; @@ -27,7 +28,7 @@ import java.util.Map; public class SteeringRegistry { - private static final Logger LOGGER = Logger.getLogger(SteeringRegistry.class); + private static final Logger LOGGER = LogManager.getLogger(SteeringRegistry.class); private Map registry = new HashMap<>(); private final ObjectMapper objectMapper = new ObjectMapper(new JsonFactory()); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringWatcher.java index e84b4358b5..713eb2d8d5 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/SteeringWatcher.java @@ -16,10 +16,11 @@ package org.apache.traffic_control.traffic_router.core.ds; import org.apache.traffic_control.traffic_router.core.util.AbstractResourceWatcher; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; public class SteeringWatcher extends AbstractResourceWatcher { - private static final Logger LOGGER = Logger.getLogger(SteeringWatcher.class); + private static final Logger LOGGER = LogManager.getLogger(SteeringWatcher.class); private SteeringRegistry steeringRegistry; public static final String DEFAULT_STEERING_DATA_URL = "https://${toHostname}/api/2.0/steering"; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java index f9455a6f5a..c56b9c05ac 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java @@ -15,26 +15,20 @@ package org.apache.traffic_control.traffic_router.core.edge; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import java.util.*; + /** * A physical location that has caches. */ public class CacheLocation extends Location { - public static final Logger LOGGER = Logger.getLogger(CacheLocation.class); + public static final Logger LOGGER = LogManager.getLogger(CacheLocation.class); private final Map caches; private List backupCacheGroups = null; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java index 6f01bcabbf..2db75f0cae 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java @@ -15,26 +15,21 @@ package org.apache.traffic_control.traffic_router.core.edge; -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.traffic_control.traffic_router.core.hash.DefaultHashable; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.traffic_control.traffic_router.core.hash.DefaultHashable; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; + +import java.net.Inet6Address; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.*; public class Node extends DefaultHashable { - private static final Logger LOGGER = Logger.getLogger(Node.class); + private static final Logger LOGGER = LogManager.getLogger(Node.class); private static final int REPLICAS = 1000; public enum IPVersions { diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Resolver.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Resolver.java index 1663b1ca62..c5553cf258 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Resolver.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Resolver.java @@ -15,16 +15,17 @@ package org.apache.traffic_control.traffic_router.core.edge; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.net.Inet4Address; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; -import org.apache.logging.log4j.Logger; - public class Resolver { - private static final Logger LOGGER = Logger.getLogger(Resolver.class); + private static final Logger LOGGER = LogManager.getLogger(Resolver.class); public List resolve(final String fqdn) { List ipAddresses = null; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/RouterFilter.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/RouterFilter.java index affc10ad68..bed96b269d 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/RouterFilter.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/http/RouterFilter.java @@ -22,6 +22,7 @@ import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.filter.OncePerRequestFilter; @@ -38,7 +39,7 @@ import java.util.Set; public class RouterFilter extends OncePerRequestFilter { - private static final Logger ACCESS = Logger.getLogger("org.apache.traffic_control.traffic_router.core.access"); + private static final Logger ACCESS = LogManager.getLogger("org.apache.traffic_control.traffic_router.core.access"); public static final String REDIRECT_QUERY_PARAM = "trred"; private static final String HEAD = "HEAD"; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java index 60701a6198..0afc79aba3 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java @@ -15,12 +15,13 @@ package org.apache.traffic_control.traffic_router.core.loc; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import org.apache.commons.io.IOUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; + +import java.io.*; import java.net.HttpURLConnection; import java.net.URL; import java.nio.file.Files; @@ -33,16 +34,10 @@ import java.util.concurrent.TimeUnit; import java.util.zip.GZIPInputStream; -import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; -import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.Logger; - -import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; - import static org.apache.commons.codec.digest.DigestUtils.md5Hex; public abstract class AbstractServiceUpdater { - private static final Logger LOGGER = Logger.getLogger(AbstractServiceUpdater.class); + private static final Logger LOGGER = LogManager.getLogger(AbstractServiceUpdater.class); protected String dataBaseURL; protected String defaultDatabaseURL; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java index 34c22f33da..3c74e0b025 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java @@ -14,19 +14,14 @@ package org.apache.traffic_control.traffic_router.core.loc; -import java.io.File; -import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URL; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.net.InetAddresses; import com.maxmind.geoip2.model.AnonymousIpResponse; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -import org.apache.traffic_control.traffic_router.core.edge.Cache; import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.edge.Cache; import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; import org.apache.traffic_control.traffic_router.core.request.Request; import org.apache.traffic_control.traffic_router.core.router.HTTPRouteResult; @@ -36,9 +31,14 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; +import java.io.File; +import java.net.InetAddress; +import java.net.MalformedURLException; +import java.net.URL; + public final class AnonymousIp { - private static final Logger LOGGER = Logger.getLogger(AnonymousIp.class); + private static final Logger LOGGER = LogManager.getLogger(AnonymousIp.class); private static AnonymousIp currentConfig = new AnonymousIp(); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java index 998faaf835..f92a9acc94 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpConfigUpdater.java @@ -14,13 +14,14 @@ package org.apache.traffic_control.traffic_router.core.loc; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.File; import java.io.IOException; -import org.apache.logging.log4j.Logger; - public class AnonymousIpConfigUpdater extends AbstractServiceUpdater { - private static final Logger LOGGER = Logger.getLogger(AnonymousIpConfigUpdater.class); + private static final Logger LOGGER = LogManager.getLogger(AnonymousIpConfigUpdater.class); public AnonymousIpConfigUpdater() { LOGGER.debug("init..."); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java index e2d6228c91..95a6128357 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java @@ -14,19 +14,19 @@ package org.apache.traffic_control.traffic_router.core.loc; -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; - -import org.apache.logging.log4j.Logger; - import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.exception.GeoIp2Exception; import com.maxmind.geoip2.model.AnonymousIpResponse; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; @SuppressWarnings({ "PMD.AvoidDuplicateLiterals" }) public class AnonymousIpDatabaseService { - private static final Logger LOGGER = Logger.getLogger(AnonymousIpDatabaseService.class); + private static final Logger LOGGER = LogManager.getLogger(AnonymousIpDatabaseService.class); private boolean initialized = false; private File databaseFile; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java index 256b96d47a..abb696d9c7 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseUpdater.java @@ -14,14 +14,15 @@ package org.apache.traffic_control.traffic_router.core.loc; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.File; import java.io.IOException; -import org.apache.logging.log4j.Logger; - @SuppressWarnings({ "PMD.AvoidDuplicateLiterals" }) public class AnonymousIpDatabaseUpdater extends AbstractServiceUpdater { - private static final Logger LOGGER = Logger.getLogger(AnonymousIpDatabaseUpdater.class); + private static final Logger LOGGER = LogManager.getLogger(AnonymousIpDatabaseUpdater.class); private AnonymousIpDatabaseService anonymousIpDatabaseService; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java index df41fe2bc0..6c6c0e1673 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpWhitelist.java @@ -14,12 +14,13 @@ package org.apache.traffic_control.traffic_router.core.loc; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; public class AnonymousIpWhitelist { - private static final Logger LOGGER = Logger.getLogger(AnonymousIpWhitelist.class); + private static final Logger LOGGER = LogManager.getLogger(AnonymousIpWhitelist.class); final private NetworkNode.SuperNode whitelist; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java index 4b61c62f0b..ec61bc3b8b 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationMappingBuilder.java @@ -21,12 +21,13 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.IOException; public class FederationMappingBuilder { - private final static Logger LOGGER = Logger.getLogger(FederationMapping.class); + private final static Logger LOGGER = LogManager.getLogger(FederationMapping.class); public FederationMapping fromJSON(final String json) throws JsonUtilsException, IOException { diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsWatcher.java index a075a00dd9..5fdb1d282c 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/FederationsWatcher.java @@ -16,10 +16,11 @@ package org.apache.traffic_control.traffic_router.core.loc; import org.apache.traffic_control.traffic_router.core.util.AbstractResourceWatcher; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; public class FederationsWatcher extends AbstractResourceWatcher { - private static final Logger LOGGER = Logger.getLogger(FederationsWatcher.class); + private static final Logger LOGGER = LogManager.getLogger(FederationsWatcher.class); private FederationRegistry federationRegistry; public static final String DEFAULT_FEDERATION_DATA_URL = "https://${toHostname}/api/2.0/federations/all"; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java index 18828aa09b..6602b428a9 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java @@ -15,22 +15,21 @@ package org.apache.traffic_control.traffic_router.core.loc; -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; - -import org.apache.logging.log4j.Logger; - import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.exception.AddressNotFoundException; import com.maxmind.geoip2.model.CityResponse; - +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; import org.apache.traffic_control.traffic_router.geolocation.GeolocationService; +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; + public class MaxmindGeolocationService implements GeolocationService { - private static final Logger LOGGER = Logger.getLogger(MaxmindGeolocationService.class); + private static final Logger LOGGER = LogManager.getLogger(MaxmindGeolocationService.class); private boolean initialized = false; private DatabaseReader databaseReader; private File databaseFile; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java index 6d23cfae6d..fc4938b6e7 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java @@ -15,18 +15,10 @@ package org.apache.traffic_control.traffic_router.core.loc; -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Iterator; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; - +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; import org.apache.traffic_control.traffic_router.core.edge.Location; import org.apache.traffic_control.traffic_router.core.util.CidrAddress; @@ -34,12 +26,14 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.traffic_control.traffic_router.geolocation.Geolocation; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.logging.log4j.Logger; +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.*; public class NetworkNode implements Comparable { - private static final Logger LOGGER = Logger.getLogger(NetworkNode.class); + private static final Logger LOGGER = LogManager.getLogger(NetworkNode.class); private static final String DEFAULT_SUB_STR = "0.0.0.0/0"; private static NetworkNode instance; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java index 760ba3325c..10af8fa055 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java @@ -31,6 +31,7 @@ import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.File; @@ -51,7 +52,7 @@ public final class RegionalGeo { - private static final Logger LOGGER = Logger.getLogger(RegionalGeo.class); + private static final Logger LOGGER = LogManager.getLogger(RegionalGeo.class); public static final String HTTP_SCHEME = "http://"; public static final String HTTPS_SCHEME = "https://"; private boolean fallback = false; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRule.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRule.java index a0b4b963b2..163e45fafd 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRule.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoRule.java @@ -15,6 +15,7 @@ package org.apache.traffic_control.traffic_router.core.loc; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.List; @@ -23,7 +24,7 @@ public class RegionalGeoRule { - private static final Logger LOGGER = Logger.getLogger(RegionalGeoRule.class); + private static final Logger LOGGER = LogManager.getLogger(RegionalGeoRule.class); public static final String WHITE_LIST_NODE_LOCATION = "w"; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java index c31a3d7597..793db674df 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java @@ -15,13 +15,14 @@ package org.apache.traffic_control.traffic_router.core.loc; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.File; import java.io.IOException; -import org.apache.logging.log4j.Logger; - public class RegionalGeoUpdater extends AbstractServiceUpdater { - private static final Logger LOGGER = Logger.getLogger(RegionalGeoUpdater.class); + private static final Logger LOGGER = LogManager.getLogger(RegionalGeoUpdater.class); public RegionalGeoUpdater() { LOGGER.debug("init..."); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java index 44450504e0..cff4a3f4b1 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcher.java @@ -18,6 +18,7 @@ import org.apache.traffic_control.traffic_router.core.config.WatcherConfig; import org.apache.traffic_control.traffic_router.core.loc.AbstractServiceUpdater; import com.fasterxml.jackson.databind.JsonNode; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.File; @@ -27,7 +28,7 @@ import java.net.URL; public abstract class AbstractResourceWatcher extends AbstractServiceUpdater { - private static final Logger LOGGER = Logger.getLogger(AbstractResourceWatcher.class); + private static final Logger LOGGER = LogManager.getLogger(AbstractResourceWatcher.class); private URL authorizationUrl; private String postData; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java index 93ae4710b5..376e87ee3c 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java @@ -15,18 +15,18 @@ package org.apache.traffic_control.traffic_router.core.util; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Iterator; - import com.fasterxml.jackson.databind.JsonNode; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Iterator; + public class LanguidState { - private static final Logger LOGGER = Logger.getLogger(LanguidState.class); + private static final Logger LOGGER = LogManager.getLogger(LanguidState.class); private boolean ready = false; private TrafficRouterManager trafficRouterManager; private int port = 0; diff --git a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java index eee09300ab..0220686d25 100644 --- a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/BindPrivateKey.java @@ -15,8 +15,8 @@ package org.apache.traffic_control.traffic_router.secure; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.math.BigInteger; import java.security.KeyFactory; diff --git a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java index 84fd7f9a1d..1924fcaeba 100644 --- a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs1KeySpecDecoder.java @@ -15,8 +15,8 @@ package org.apache.traffic_control.traffic_router.secure; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.ASN1Sequence; import org.bouncycastle.asn1.ASN1SequenceParser; diff --git a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java index ce0755a6e0..d92839f2b5 100644 --- a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/secure/Pkcs8.java @@ -15,8 +15,8 @@ package org.apache.traffic_control.traffic_router.secure; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.IOException; import java.security.GeneralSecurityException; From 6df92f22f08bb554211ffa817f06efb3d4e06383 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Thu, 2 Dec 2021 13:45:59 -0700 Subject: [PATCH 05/32] Updated java files to use LogManager class instead of logger class for ver 2.14.1-1 --- .../core/config/ConfigHandler.java | 65 +++++++++----- .../traffic_router/core/dns/NameServer.java | 29 +++++-- .../core/dns/SignatureManager.java | 45 ++++++---- .../core/dns/SignedZoneKey.java | 8 +- .../traffic_router/core/dns/ZoneManager.java | 87 ++++++++++++++----- .../traffic_router/core/dns/ZoneUtils.java | 14 +-- .../traffic_router/core/dns/protocol/TCP.java | 10 +-- .../traffic_router/core/dns/protocol/UDP.java | 10 +-- .../core/ds/DeliveryService.java | 42 ++++++--- .../core/edge/CacheLocation.java | 10 ++- .../traffic_router/core/edge/Node.java | 20 +++-- .../core/loc/AbstractServiceUpdater.java | 20 +++-- .../traffic_router/core/loc/AnonymousIp.java | 10 +-- .../core/loc/AnonymousIpDatabaseService.java | 13 +-- .../core/loc/MaxmindGeolocationService.java | 14 +-- .../traffic_router/core/loc/NetworkNode.java | 25 ++++-- .../core/loc/RegionalGeoUpdater.java | 6 +- .../core/monitor/TrafficMonitorWatcher.java | 28 +++--- .../core/router/TrafficRouter.java | 3 +- .../core/router/TrafficRouterManager.java | 22 +++-- .../core/secure/CertificatesClient.java | 3 +- .../core/secure/CertificatesPoller.java | 3 +- .../core/secure/CertificatesPublisher.java | 3 +- .../core/util/DataExporter.java | 31 ++++--- .../traffic_router/core/util/Fetcher.java | 22 ++--- .../core/util/PeriodicResourceUpdater.java | 22 ++--- .../traffic_router/core/TestBase.java | 6 +- .../core/TrafficRouterStart.java | 8 +- .../dns/protocol/AbstractProtocolTest.java | 3 +- .../core/external/ExternalTestSuite.java | 4 +- .../core/external/HttpDataServer.java | 2 +- .../traffic_router/core/loc/GeoTest.java | 3 +- .../core/loc/NetworkNodeTest.java | 28 +++--- .../router/StatelessTrafficRouterTest.java | 3 +- .../util/AbstractResourceWatcherTest.java | 3 +- .../neustar/NeustarGeolocationService.java | 3 +- .../configuration/NeustarConfiguration.java | 3 +- .../configuration/ServiceRefresher.java | 3 +- .../TrafficRouterConfigurationListener.java | 3 +- .../neustar/data/HttpClient.java | 3 +- .../neustar/data/NeustarDatabaseUpdater.java | 3 +- .../neustar/data/TarExtractor.java | 3 +- .../neustar/files/FilesMover.java | 3 +- 43 files changed, 399 insertions(+), 250 deletions(-) diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java index 650a54c992..4f88cd57e9 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/config/ConfigHandler.java @@ -15,37 +15,62 @@ package org.apache.traffic_control.traffic_router.core.config; +import java.io.IOException; +import java.net.UnknownHostException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.TreeSet; +import java.util.Iterator; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.apache.traffic_control.traffic_router.core.ds.LetsEncryptDnsChallengeWatcher; +import org.apache.traffic_control.traffic_router.core.ds.SteeringWatcher; +import org.apache.traffic_control.traffic_router.core.loc.FederationsWatcher; +import org.apache.traffic_control.traffic_router.core.loc.GeolocationDatabaseUpdater; +import org.apache.traffic_control.traffic_router.core.loc.NetworkNode; +import org.apache.traffic_control.traffic_router.core.loc.NetworkUpdater; +import org.apache.traffic_control.traffic_router.core.loc.DeepNetworkUpdater; +import org.apache.traffic_control.traffic_router.core.loc.RegionalGeoUpdater; + +import org.apache.traffic_control.traffic_router.core.secure.CertificatesPoller; +import org.apache.traffic_control.traffic_router.core.secure.CertificatesPublisher; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + +import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; +import org.apache.traffic_control.traffic_router.core.edge.Cache; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.Location; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.edge.Node; +import org.apache.traffic_control.traffic_router.core.edge.TrafficRouterLocation; import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; import org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher; import org.apache.traffic_control.traffic_router.core.ds.DeliveryServiceMatcher.Type; -import org.apache.traffic_control.traffic_router.core.ds.LetsEncryptDnsChallengeWatcher; -import org.apache.traffic_control.traffic_router.core.ds.SteeringWatcher; -import org.apache.traffic_control.traffic_router.core.edge.*; -import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; -import org.apache.traffic_control.traffic_router.core.loc.*; import org.apache.traffic_control.traffic_router.core.monitor.TrafficMonitorWatcher; -import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; -import org.apache.traffic_control.traffic_router.core.router.StatTracker; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; -import org.apache.traffic_control.traffic_router.core.secure.CertificatesPoller; -import org.apache.traffic_control.traffic_router.core.secure.CertificatesPublisher; -import org.apache.traffic_control.traffic_router.core.util.JsonUtils; -import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.core.router.StatTracker; import org.apache.traffic_control.traffic_router.geolocation.Geolocation; - -import java.io.IOException; -import java.net.URL; -import java.net.UnknownHostException; -import java.util.*; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; +import org.apache.traffic_control.traffic_router.core.loc.AnonymousIp; +import org.apache.traffic_control.traffic_router.core.loc.AnonymousIpConfigUpdater; +import org.apache.traffic_control.traffic_router.core.loc.AnonymousIpDatabaseUpdater; @SuppressWarnings("PMD.TooManyFields") public class ConfigHandler { diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java index 679930fcc3..2b09e0c682 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java @@ -15,16 +15,31 @@ package org.apache.traffic_control.traffic_router.core.dns; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; -import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; -import org.xbill.DNS.Record; -import org.xbill.DNS.*; - import java.net.InetAddress; import java.util.*; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; +import org.xbill.DNS.DClass; +import org.xbill.DNS.ExtendedFlags; +import org.xbill.DNS.Flags; +import org.xbill.DNS.Message; +import org.xbill.DNS.Name; +import org.xbill.DNS.OPTRecord; +import org.xbill.DNS.RRset; +import org.xbill.DNS.Rcode; +import org.xbill.DNS.Record; +import org.xbill.DNS.SOARecord; +import org.xbill.DNS.Section; +import org.xbill.DNS.SetResponse; +import org.xbill.DNS.Type; +import org.xbill.DNS.Zone; +import org.xbill.DNS.EDNSOption; +import org.xbill.DNS.ClientSubnetOption; + +import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; + public class NameServer { private static final int MAX_SUPPORTED_EDNS_VERS = 0; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java index 2341ee1661..506b762b31 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java @@ -15,26 +15,41 @@ package org.apache.traffic_control.traffic_router.core.dns; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.traffic_control.traffic_router.core.dns.ZoneManager.ZoneCacheType; -import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; -import org.apache.traffic_control.traffic_router.core.util.ProtectedFetcher; -import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; +import org.xbill.DNS.DSRecord; +import org.xbill.DNS.Name; import org.xbill.DNS.Record; -import org.xbill.DNS.*; - -import java.io.IOException; -import java.security.GeneralSecurityException; -import java.security.NoSuchAlgorithmException; -import java.util.*; -import java.util.concurrent.*; +import org.xbill.DNS.RRSIGRecord; +import org.xbill.DNS.TextParseException; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.dns.ZoneManager.ZoneCacheType; +import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.core.util.ProtectedFetcher; public final class SignatureManager { diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java index a9cf8f8b0e..46a957a996 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignedZoneKey.java @@ -15,16 +15,16 @@ package org.apache.traffic_control.traffic_router.core.dns; +import java.util.Calendar; +import java.util.List; +import java.util.OptionalLong; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xbill.DNS.Name; import org.xbill.DNS.RRSIGRecord; import org.xbill.DNS.Record; -import java.util.Calendar; -import java.util.List; -import java.util.OptionalLong; - public class SignedZoneKey extends ZoneKey { private static final Logger LOGGER = LogManager.getLogger(SignedZoneKey.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java index 6aaee2b219..df44d32902 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManager.java @@ -15,45 +15,86 @@ package org.apache.traffic_control.traffic_router.core.dns; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.net.Inet6Address; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.security.GeneralSecurityException; +import java.security.NoSuchAlgorithmException; +import java.time.Duration; +import java.time.Instant; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import org.apache.traffic_control.traffic_router.core.edge.Node.IPVersions; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; -import com.google.common.cache.*; -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.ListenableFutureTask; import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.xbill.DNS.AAAARecord; +import org.xbill.DNS.ARecord; +import org.xbill.DNS.CNAMERecord; +import org.xbill.DNS.DClass; +import org.xbill.DNS.NSECRecord; +import org.xbill.DNS.NSRecord; +import org.xbill.DNS.Name; +import org.xbill.DNS.RRSIGRecord; +import org.xbill.DNS.RRset; +import org.xbill.DNS.Record; +import org.xbill.DNS.SOARecord; +import org.xbill.DNS.SetResponse; +import org.xbill.DNS.TextParseException; +import org.xbill.DNS.TXTRecord; +import org.xbill.DNS.Type; +import org.xbill.DNS.Zone; + import org.apache.traffic_control.traffic_router.core.ds.DeliveryService; import org.apache.traffic_control.traffic_router.core.edge.Cache; import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; -import org.apache.traffic_control.traffic_router.core.edge.*; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; +import org.apache.traffic_control.traffic_router.core.edge.InetRecord; import org.apache.traffic_control.traffic_router.core.edge.Resolver; -import org.apache.traffic_control.traffic_router.core.edge.Node.IPVersions; +import org.apache.traffic_control.traffic_router.core.edge.TrafficRouterLocation; import org.apache.traffic_control.traffic_router.core.request.DNSRequest; import org.apache.traffic_control.traffic_router.core.router.DNSRouteResult; import org.apache.traffic_control.traffic_router.core.router.StatTracker; import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; -import org.apache.traffic_control.traffic_router.core.util.JsonUtils; -import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; -import org.xbill.DNS.Record; -import org.xbill.DNS.*; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.security.GeneralSecurityException; -import java.security.NoSuchAlgorithmException; -import java.time.Duration; -import java.time.Instant; -import java.util.*; -import java.util.concurrent.*; -import java.util.stream.Collectors; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheBuilderSpec; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.CacheStats; +import com.google.common.cache.LoadingCache; +import com.google.common.cache.RemovalListener; +import com.google.common.cache.RemovalNotification; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListenableFutureTask; public class ZoneManager extends Resolver { private static final Logger LOGGER = LogManager.getLogger(ZoneManager.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java index 3000c71d00..3048e4993d 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/ZoneUtils.java @@ -15,18 +15,18 @@ package org.apache.traffic_control.traffic_router.core.dns; -import com.fasterxml.jackson.databind.JsonNode; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.traffic_control.traffic_router.core.util.JsonUtils; -import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; -import org.xbill.DNS.Record; - import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.List; +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; +import com.fasterxml.jackson.databind.JsonNode; +import org.xbill.DNS.Record; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class ZoneUtils { private static final Logger LOGGER = LogManager.getLogger(ZoneUtils.class); private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH"); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java index c17d705b53..24b7e21bd0 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCP.java @@ -15,11 +15,6 @@ package org.apache.traffic_control.traffic_router.core.dns.protocol; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.xbill.DNS.Message; -import org.xbill.DNS.WireParseException; - import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; @@ -29,6 +24,11 @@ import java.net.Socket; import java.nio.channels.Channels; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.xbill.DNS.Message; +import org.xbill.DNS.WireParseException; + public class TCP extends AbstractProtocol { private static final Logger LOGGER = LogManager.getLogger(TCP.class); private int readTimeout = 3000; // default diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java index 81fb2e63cc..e7f17ddcac 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDP.java @@ -15,17 +15,17 @@ package org.apache.traffic_control.traffic_router.core.dns.protocol; +import java.io.IOException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.InetAddress; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.xbill.DNS.Message; import org.xbill.DNS.OPTRecord; import org.xbill.DNS.WireParseException; -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; - public class UDP extends AbstractProtocol { private static final Logger LOGGER = LogManager.getLogger(UDP.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java index 834f4ac601..338a186a0b 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryService.java @@ -15,34 +15,48 @@ package org.apache.traffic_control.traffic_router.core.ds; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.InetAddress; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLDecoder; +import java.net.UnknownHostException; +import java.security.GeneralSecurityException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.Iterator; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.regex.Pattern; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.JsonNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import org.apache.traffic_control.traffic_router.core.edge.Cache; -import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; -import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; import org.apache.traffic_control.traffic_router.core.edge.InetRecord; import org.apache.traffic_control.traffic_router.core.edge.Location; +import org.apache.traffic_control.traffic_router.core.edge.Cache.DeliveryServiceReference; +import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import org.apache.traffic_control.traffic_router.core.request.DNSRequest; import org.apache.traffic_control.traffic_router.core.request.HTTPRequest; import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track; -import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultType; +import org.apache.traffic_control.traffic_router.core.router.StatTracker.Track.ResultDetails; import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.traffic_control.traffic_router.core.util.StringProtector; -import org.apache.traffic_control.traffic_router.geolocation.Geolocation; - -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.*; -import java.security.GeneralSecurityException; -import java.util.*; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.regex.Pattern; @SuppressWarnings({"PMD.TooManyFields","PMD.CyclomaticComplexity", "PMD.AvoidDuplicateLiterals", "PMD.ExcessivePublicCount"}) public class DeliveryService { diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java index c56b9c05ac..d0e89c92c2 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/CacheLocation.java @@ -15,14 +15,20 @@ package org.apache.traffic_control.traffic_router.core.edge; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.traffic_control.traffic_router.geolocation.Geolocation; -import java.util.*; - /** * A physical location that has caches. */ diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java index 2db75f0cae..e09a987000 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/edge/Node.java @@ -15,18 +15,24 @@ package org.apache.traffic_control.traffic_router.core.edge; +import java.net.Inet6Address; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import com.fasterxml.jackson.databind.JsonNode; +import org.apache.traffic_control.traffic_router.core.hash.DefaultHashable; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.traffic_control.traffic_router.core.hash.DefaultHashable; -import org.apache.traffic_control.traffic_router.core.util.JsonUtils; - -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.*; public class Node extends DefaultHashable { private static final Logger LOGGER = LogManager.getLogger(Node.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java index 0afc79aba3..10b7931ad6 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdater.java @@ -15,13 +15,12 @@ package org.apache.traffic_control.traffic_router.core.loc; -import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; -import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; - -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; import java.nio.file.Files; @@ -34,6 +33,13 @@ import java.util.concurrent.TimeUnit; import java.util.zip.GZIPInputStream; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; +import org.apache.commons.io.IOUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; + import static org.apache.commons.codec.digest.DigestUtils.md5Hex; public abstract class AbstractServiceUpdater { diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java index 3c74e0b025..2196a79bb4 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIp.java @@ -14,6 +14,11 @@ package org.apache.traffic_control.traffic_router.core.loc; +import java.io.File; +import java.net.InetAddress; +import java.net.MalformedURLException; +import java.net.URL; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.net.InetAddresses; @@ -31,11 +36,6 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtils; import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; -import java.io.File; -import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URL; - public final class AnonymousIp { private static final Logger LOGGER = LogManager.getLogger(AnonymousIp.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java index 95a6128357..113425b2d2 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/AnonymousIpDatabaseService.java @@ -14,16 +14,17 @@ package org.apache.traffic_control.traffic_router.core.loc; -import com.maxmind.geoip2.DatabaseReader; -import com.maxmind.geoip2.exception.GeoIp2Exception; -import com.maxmind.geoip2.model.AnonymousIpResponse; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import java.io.File; import java.io.IOException; import java.net.InetAddress; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.maxmind.geoip2.DatabaseReader; +import com.maxmind.geoip2.exception.GeoIp2Exception; +import com.maxmind.geoip2.model.AnonymousIpResponse; + @SuppressWarnings({ "PMD.AvoidDuplicateLiterals" }) public class AnonymousIpDatabaseService { private static final Logger LOGGER = LogManager.getLogger(AnonymousIpDatabaseService.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java index 6602b428a9..a03943ca60 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationService.java @@ -15,19 +15,21 @@ package org.apache.traffic_control.traffic_router.core.loc; +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.exception.AddressNotFoundException; import com.maxmind.geoip2.model.CityResponse; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; + import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; import org.apache.traffic_control.traffic_router.geolocation.GeolocationService; -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; - public class MaxmindGeolocationService implements GeolocationService { private static final Logger LOGGER = LogManager.getLogger(MaxmindGeolocationService.class); private boolean initialized = false; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java index fc4938b6e7..7572832976 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNode.java @@ -15,10 +15,18 @@ package org.apache.traffic_control.traffic_router.core.loc; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Iterator; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; import org.apache.traffic_control.traffic_router.core.edge.Location; import org.apache.traffic_control.traffic_router.core.util.CidrAddress; @@ -26,11 +34,10 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.traffic_control.traffic_router.geolocation.Geolocation; -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.*; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class NetworkNode implements Comparable { private static final Logger LOGGER = LogManager.getLogger(NetworkNode.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java index 793db674df..fc0fafce19 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java @@ -15,12 +15,12 @@ package org.apache.traffic_control.traffic_router.core.loc; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import java.io.File; import java.io.IOException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class RegionalGeoUpdater extends AbstractServiceUpdater { private static final Logger LOGGER = LogManager.getLogger(RegionalGeoUpdater.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java index 53fffcc9ed..d9130c537f 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java @@ -15,33 +15,33 @@ package org.apache.traffic_control.traffic_router.core.monitor; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.net.URI; -import java.net.UnknownHostException; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; - -import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - import org.apache.traffic_control.traffic_router.core.config.ConfigHandler; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import org.apache.traffic_control.traffic_router.core.util.AbstractUpdatable; +import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import org.apache.traffic_control.traffic_router.core.util.PeriodicResourceUpdater; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ApplicationContextEvent; import org.springframework.context.event.ContextClosedEvent; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URI; +import java.net.UnknownHostException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Properties; + @SuppressWarnings("PMD.TooManyFields") public class TrafficMonitorWatcher implements ApplicationListener { - private static final Logger LOGGER = Logger.getLogger(TrafficMonitorWatcher.class); + private static final Logger LOGGER = LogManager.getLogger(TrafficMonitorWatcher.class); private String stateUrl; private String configUrl; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouter.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouter.java index 0cea791021..dc1d566962 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouter.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouter.java @@ -56,6 +56,7 @@ import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; import org.apache.traffic_control.traffic_router.geolocation.GeolocationService; import com.fasterxml.jackson.databind.JsonNode; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; @@ -88,7 +89,7 @@ */ @SuppressWarnings({"PMD.TooManyFields", "PMD.ExcessivePublicCount"}) public class TrafficRouter { - public static final Logger LOGGER = Logger.getLogger(TrafficRouter.class); + public static final Logger LOGGER = LogManager.getLogger(TrafficRouter.class); /** * This is an HTTP Header the value of which, if present in a client HTTP request, should be diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java index c8e785eaa1..ea197b09bc 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/router/TrafficRouterManager.java @@ -15,27 +15,25 @@ package org.apache.traffic_control.traffic_router.core.router; +import java.io.IOException; +import java.net.UnknownHostException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.apache.traffic_control.traffic_router.core.ds.SteeringRegistry; +import org.apache.traffic_control.traffic_router.core.loc.FederationRegistry; import com.fasterxml.jackson.databind.JsonNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.traffic_control.traffic_router.core.dns.NameServer; -import org.apache.traffic_control.traffic_router.core.ds.SteeringRegistry; import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; -import org.apache.traffic_control.traffic_router.core.loc.AnonymousIpDatabaseService; -import org.apache.traffic_control.traffic_router.core.loc.FederationRegistry; -import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; +import org.apache.traffic_control.traffic_router.core.dns.NameServer; import org.apache.traffic_control.traffic_router.geolocation.GeolocationService; +import org.apache.traffic_control.traffic_router.core.util.TrafficOpsUtils; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; - -import java.io.IOException; -import java.net.UnknownHostException; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - - +import org.apache.traffic_control.traffic_router.core.loc.AnonymousIpDatabaseService; public class TrafficRouterManager implements ApplicationListener { private static final Logger LOGGER = LogManager.getLogger(TrafficRouterManager.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClient.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClient.java index c3df97bc63..6d1a321635 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClient.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesClient.java @@ -21,6 +21,7 @@ import org.apache.traffic_control.traffic_router.shared.CertificateData; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.net.HttpURLConnection; @@ -29,7 +30,7 @@ import java.util.List; public class CertificatesClient { - private static final Logger LOGGER = Logger.getLogger(CertificatesClient.class); + private static final Logger LOGGER = LogManager.getLogger(CertificatesClient.class); private TrafficOpsUtils trafficOpsUtils; private static final String PEM_FOOTER_PREFIX = "-----END"; private long lastValidfetchTimestamp = 0L; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPoller.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPoller.java index 2649fc0c81..d43ff8cfdb 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPoller.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPoller.java @@ -18,6 +18,7 @@ import org.apache.traffic_control.traffic_router.configuration.ConfigurationListener; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import org.apache.traffic_control.traffic_router.shared.CertificateData; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; @@ -31,7 +32,7 @@ import java.util.concurrent.TimeUnit; public class CertificatesPoller implements ConfigurationListener { - private static final Logger LOGGER = Logger.getLogger(CertificatesPoller.class); + private static final Logger LOGGER = LogManager.getLogger(CertificatesPoller.class); private final ScheduledExecutorService executor; private ScheduledFuture future; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPublisher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPublisher.java index 5a59897673..2bdf29345a 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPublisher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/secure/CertificatesPublisher.java @@ -27,6 +27,7 @@ import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import javax.management.Attribute; @@ -38,7 +39,7 @@ import java.util.concurrent.TimeUnit; public class CertificatesPublisher { - private final static Logger LOGGER = Logger.getLogger(CertificatesPublisher.class); + private final static Logger LOGGER = LogManager.getLogger(CertificatesPublisher.class); private JsonNode deliveryServicesJson; private List deliveryServices = new ArrayList<>(); private boolean running = true; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java index dcfd8a049c..00396459ce 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java @@ -15,39 +15,38 @@ package org.apache.traffic_control.traffic_router.core.util; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - import com.fasterxml.jackson.databind.JsonNode; import com.google.common.cache.CacheStats; - +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - import org.apache.traffic_control.traffic_router.core.edge.Cache; import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; import org.apache.traffic_control.traffic_router.core.edge.InetRecord; import org.apache.traffic_control.traffic_router.core.edge.Location; import org.apache.traffic_control.traffic_router.core.edge.PropertiesAndCaches; -import org.apache.traffic_control.traffic_router.geolocation.Geolocation; -import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; import org.apache.traffic_control.traffic_router.core.loc.NetworkNode; import org.apache.traffic_control.traffic_router.core.loc.NetworkNodeException; +import org.apache.traffic_control.traffic_router.core.router.StatTracker; import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; -import org.apache.traffic_control.traffic_router.core.router.StatTracker; import org.apache.traffic_control.traffic_router.core.status.model.CacheModel; +import org.apache.traffic_control.traffic_router.geolocation.Geolocation; +import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; public class DataExporter { - private static final Logger LOGGER = Logger.getLogger(DataExporter.class); + private static final Logger LOGGER = LogManager.getLogger(DataExporter.class); private static final String NOT_FOUND_MESSAGE = "not found"; private TrafficRouterManager trafficRouterManager; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java index f5362bc7f3..eba8039b0f 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java @@ -15,6 +15,16 @@ package org.apache.traffic_control.traffic_router.core.util; +import org.apache.commons.io.IOUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -29,19 +39,9 @@ import java.util.Map; import java.util.zip.GZIPInputStream; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; - -import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.Logger; - public class Fetcher { - private static final Logger LOGGER = Logger.getLogger(Fetcher.class); + private static final Logger LOGGER = LogManager.getLogger(Fetcher.class); protected static final String GET_STR = "GET"; protected static final String POST_STR = "POST"; protected static final String UTF8_STR = "UTF-8"; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java index eee8bcb885..6717a24a80 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java @@ -15,6 +15,16 @@ package org.apache.traffic_control.traffic_router.core.util; +import org.apache.commons.io.IOUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.asynchttpclient.AsyncCompletionHandler; +import org.asynchttpclient.AsyncHttpClient; +import org.asynchttpclient.DefaultAsyncHttpClient; +import org.asynchttpclient.DefaultAsyncHttpClientConfig; +import org.asynchttpclient.Request; +import org.asynchttpclient.Response; + import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -33,16 +43,6 @@ import java.util.concurrent.TimeUnit; import java.util.zip.GZIPInputStream; -import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.Logger; - -import org.asynchttpclient.AsyncCompletionHandler; -import org.asynchttpclient.AsyncHttpClient; -import org.asynchttpclient.DefaultAsyncHttpClient; -import org.asynchttpclient.DefaultAsyncHttpClientConfig; -import org.asynchttpclient.Request; -import org.asynchttpclient.Response; - import static org.apache.commons.codec.digest.DigestUtils.md5Hex; /** @@ -51,7 +51,7 @@ * */ public class PeriodicResourceUpdater { - private static final Logger LOGGER = Logger.getLogger(PeriodicResourceUpdater.class); + private static final Logger LOGGER = LogManager.getLogger(PeriodicResourceUpdater.class); private AsyncHttpClient asyncHttpClient; protected String databaseLocation; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java index debe31412a..06f61970fe 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java @@ -18,11 +18,11 @@ import org.apache.traffic_control.traffic_router.core.external.HttpDataServer; import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificates; import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; -import org.apache.logging.log4j.ConsoleAppender; +import org.apache.logging.log4j.core.appender.ConsoleAppender; +import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.PatternLayout; import org.springframework.context.ApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext; @@ -41,7 +41,7 @@ import static org.springframework.util.SocketUtils.findAvailableUdpPort; public class TestBase { - private static final Logger LOGGER = Logger.getLogger(TestBase.class); + private static final Logger LOGGER = LogManager.getLogger(TestBase.class); private static int testHttpServerPort = findAvailableTcpPort(); private static HttpDataServer httpDataServer = new HttpDataServer(testHttpServerPort); diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java index 634e2b2ad2..0f0e389939 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java @@ -15,10 +15,10 @@ package org.apache.traffic_control.traffic_router.core; -import org.apache.logging.log4j.ConsoleAppender; +import org.apache.logging.log4j.core.appender.ConsoleAppender; +import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.PatternLayout; public class TrafficRouterStart { @@ -38,8 +38,8 @@ public static void main(String[] args) throws Exception { LogManager.getLogger("org.springframework").setLevel(Level.WARN); ConsoleAppender consoleAppender = new ConsoleAppender(new PatternLayout("%d{ISO8601} [%-5p] %c{4}: %m%n")); - LogManager.getRootLogger().addAppender(consoleAppender); - LogManager.getRootLogger().setLevel(Level.INFO); + Logger.getRootLogger().addAppender(consoleAppender); + Logger.getRootLogger().setLevel(Level.INFO); System.out.println("[" + System.currentTimeMillis() + "] >>>>>>>>>>>>>>>> Embedded Tomcat loading Traffic Router"); CatalinaTrafficRouter catalinaTrafficRouter = new CatalinaTrafficRouter(prefix + "/src/main/conf/server.xml", prefix + "/src/main/webapp" ); diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java index 893b17a7e0..8a74b6ef19 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java @@ -18,6 +18,7 @@ import org.apache.traffic_control.traffic_router.core.dns.DNSAccessEventBuilder; import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; import org.apache.traffic_control.traffic_router.core.dns.NameServer; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Before; import org.junit.Test; @@ -75,7 +76,7 @@ public Long answer(InvocationOnMock invocation) { when(System.currentTimeMillis()).then(currentTimeAnswer); mockStatic(Logger.class); - when(Logger.getLogger("org.apache.traffic_control.traffic_router.core.access")).thenAnswer(invocation -> accessLogger); + when(LogManager.getLogger("org.apache.traffic_control.traffic_router.core.access")).thenAnswer(invocation -> accessLogger); header = new Header(); header.setID(65535); diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java index 642ba64ab7..4db30fbd3d 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java @@ -18,10 +18,10 @@ import org.apache.traffic_control.traffic_router.core.CatalinaTrafficRouter; import org.apache.traffic_control.traffic_router.core.util.ExternalTest; import org.apache.catalina.LifecycleException; -import org.apache.logging.log4j.ConsoleAppender; +import org.apache.logging.log4j.core.appender.ConsoleAppender; +import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.PatternLayout; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/HttpDataServer.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/HttpDataServer.java index 840e9cb782..6fe5b1cd9b 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/HttpDataServer.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/HttpDataServer.java @@ -45,7 +45,7 @@ public HttpDataServer(int testHttpServerPort) { // Useful for producing an access log // static { -// Logger logger = Logger.getLogger("com.sun.net.httpserver"); +// Logger logger = LogManager.getLogger("com.sun.net.httpserver"); // logger.setLevel(java.util.logging.Level.ALL); // // java.util.logging.Handler[] handlers = logger.getHandlers(); diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/GeoTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/GeoTest.java index 23d5e4ab22..3a1477bc09 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/GeoTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/GeoTest.java @@ -16,6 +16,7 @@ package org.apache.traffic_control.traffic_router.core.loc; import org.apache.traffic_control.traffic_router.core.util.IntegrationTest; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.AfterClass; import org.junit.Before; @@ -30,7 +31,7 @@ @Category(IntegrationTest.class) public class GeoTest { - private static final Logger LOGGER = Logger.getLogger(GeoTest.class); + private static final Logger LOGGER = LogManager.getLogger(GeoTest.class); private GeolocationDatabaseUpdater geolocationDatabaseUpdater; private MaxmindGeolocationService maxmindGeolocationService; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java index 3f53a4324f..e06abfb7e1 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java @@ -15,31 +15,29 @@ package org.apache.traffic_control.traffic_router.core.loc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.hamcrest.MatcherAssert.assertThat; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.net.InetAddresses; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.Before; +import org.junit.Test; import java.io.File; import java.net.InetAddress; - +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.ArrayList; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.logging.log4j.Logger; -import org.junit.Before; -import org.junit.Test; -import com.google.common.net.InetAddresses; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; public class NetworkNodeTest { - private static final Logger LOGGER = Logger.getLogger(NetworkNodeTest.class); + private static final Logger LOGGER = LogManager.getLogger(NetworkNodeTest.class); private Map> netMap = new HashMap>(); private Map> deepNetMap = new HashMap>(); private NetworkNode root; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java index 5384d1b0db..65f4274432 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/StatelessTrafficRouterTest.java @@ -16,6 +16,7 @@ package org.apache.traffic_control.traffic_router.core.router; import org.apache.traffic_control.traffic_router.core.util.IntegrationTest; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.AfterClass; import org.junit.Before; @@ -32,7 +33,7 @@ @Category(IntegrationTest.class) public class StatelessTrafficRouterTest { - private static final Logger LOGGER = Logger.getLogger(StatelessTrafficRouterTest.class); + private static final Logger LOGGER = LogManager.getLogger(StatelessTrafficRouterTest.class); private TrafficRouterManager trafficRouterManager; private GeolocationDatabaseUpdater geolocationDatabaseUpdater; private NetworkUpdater networkUpdater; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java index 7818099cce..e13a8ce6c9 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/AbstractResourceWatcherTest.java @@ -24,6 +24,7 @@ import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.After; import org.junit.AfterClass; @@ -43,7 +44,7 @@ @Category(IntegrationTest.class) public class AbstractResourceWatcherTest { - private static final Logger LOGGER = Logger.getLogger(org.apache.traffic_control.traffic_router.core.util.AbstractResourceWatcherTest.class); + private static final Logger LOGGER = LogManager.getLogger(org.apache.traffic_control.traffic_router.core.util.AbstractResourceWatcherTest.class); private FederationsWatcher federationsWatcher; private SteeringWatcher steeringWatcher; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/NeustarGeolocationService.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/NeustarGeolocationService.java index 3a13e6061b..e25c30cbb1 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/NeustarGeolocationService.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/NeustarGeolocationService.java @@ -22,6 +22,7 @@ import com.quova.bff.reader.exception.AddressNotFoundException; import com.quova.bff.reader.io.GPDatabaseReader; import com.quova.bff.reader.model.GeoPointResponse; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -32,7 +33,7 @@ @Component public class NeustarGeolocationService implements GeolocationService { - private static final Logger LOGGER = Logger.getLogger(NeustarGeolocationService.class); + private static final Logger LOGGER = LogManager.getLogger(NeustarGeolocationService.class); private GPDatabaseReader databaseReader; @Autowired diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java index 12996900cd..4ee348e6ee 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/NeustarConfiguration.java @@ -21,6 +21,7 @@ import org.apache.traffic_control.traffic_router.neustar.files.FilesMover; import org.apache.traffic_control.traffic_router.configuration.ConfigurationListener; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -36,7 +37,7 @@ @Configuration @PropertySource(value = "neustar.properties", ignoreResourceNotFound = true) public class NeustarConfiguration { - private final Logger LOGGER = Logger.getLogger(NeustarConfiguration.class); + private final Logger LOGGER = LogManager.getLogger(NeustarConfiguration.class); @Autowired private Environment environment; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java index a7f8920764..dc0e1dbb7e 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/ServiceRefresher.java @@ -17,11 +17,12 @@ import org.apache.traffic_control.traffic_router.neustar.NeustarGeolocationService; import org.apache.traffic_control.traffic_router.neustar.data.NeustarDatabaseUpdater; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class ServiceRefresher implements Runnable { - private final Logger logger = Logger.getLogger(ServiceRefresher.class); + private final Logger logger = LogManager.getLogger(ServiceRefresher.class); @Autowired NeustarDatabaseUpdater neustarDatabaseUpdater; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java index 49cb785582..ca2cb0c9ff 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/configuration/TrafficRouterConfigurationListener.java @@ -16,6 +16,7 @@ package org.apache.traffic_control.traffic_router.neustar.configuration; import org.apache.traffic_control.traffic_router.configuration.ConfigurationListener; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; @@ -26,7 +27,7 @@ import java.util.concurrent.TimeUnit; public class TrafficRouterConfigurationListener implements ConfigurationListener { - private final Logger logger = Logger.getLogger(TrafficRouterConfigurationListener.class); + private final Logger logger = LogManager.getLogger(TrafficRouterConfigurationListener.class); @Autowired private Environment environment; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/HttpClient.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/HttpClient.java index 0d184c8ac4..7114ceffc8 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/HttpClient.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/HttpClient.java @@ -19,12 +19,13 @@ import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.IOException; public class HttpClient { - private final Logger LOGGER = Logger.getLogger(HttpClient.class); + private final Logger LOGGER = LogManager.getLogger(HttpClient.class); private CloseableHttpClient httpClient; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java index 938321a836..97d7180dad 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/NeustarDatabaseUpdater.java @@ -22,6 +22,7 @@ import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +37,7 @@ import static java.lang.Long.parseLong; public class NeustarDatabaseUpdater { - private final Logger LOGGER = Logger.getLogger(NeustarDatabaseUpdater.class); + private final Logger LOGGER = LogManager.getLogger(NeustarDatabaseUpdater.class); @Autowired private Integer neustarPollingTimeout; diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/TarExtractor.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/TarExtractor.java index e014dbd657..b73cf03c7b 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/TarExtractor.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/data/TarExtractor.java @@ -17,6 +17,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.File; @@ -25,7 +26,7 @@ import java.io.InputStream; public class TarExtractor { - private final Logger LOGGER = Logger.getLogger(TarExtractor.class); + private final Logger LOGGER = LogManager.getLogger(TarExtractor.class); public boolean extractTo(File directory, InputStream inputStream) { try (TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(inputStream)) { diff --git a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/files/FilesMover.java b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/files/FilesMover.java index 47306aefc2..8ec0a6266a 100644 --- a/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/files/FilesMover.java +++ b/traffic_router/neustar/src/main/java/org/apache/traffic_control/traffic_router/neustar/files/FilesMover.java @@ -15,6 +15,7 @@ package org.apache.traffic_control.traffic_router.neustar.files; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.File; @@ -28,7 +29,7 @@ import java.nio.file.attribute.BasicFileAttributes; public class FilesMover { - private static final Logger LOGGER = Logger.getLogger(FilesMover.class); + private static final Logger LOGGER = LogManager.getLogger(FilesMover.class); public boolean purgeDirectory(File directory) { try { From 70f96b722e9e28a09fbc31d5d2cb85a58167cd71 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Thu, 2 Dec 2021 13:58:36 -0700 Subject: [PATCH 06/32] Un-optimized import statements --- .../core/dns/NameServerMain.java | 7 ++--- .../core/monitor/TrafficMonitorWatcher.java | 23 ++++++++-------- .../core/util/DataExporter.java | 23 ++++++++-------- .../traffic_router/core/util/Fetcher.java | 20 +++++++------- .../core/util/LanguidState.java | 9 ++++--- .../core/util/PeriodicResourceUpdater.java | 21 ++++++++------- .../core/loc/NetworkNodeTest.java | 27 ++++++++++--------- 7 files changed, 69 insertions(+), 61 deletions(-) diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java index c190b30d53..9ae9b7317e 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServerMain.java @@ -15,13 +15,14 @@ package org.apache.traffic_control.traffic_router.core.dns; +import java.util.List; +import java.util.concurrent.ExecutorService; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.traffic_control.traffic_router.core.dns.protocol.Protocol; import org.springframework.context.support.ClassPathXmlApplicationContext; -import java.util.List; -import java.util.concurrent.ExecutorService; +import org.apache.traffic_control.traffic_router.core.dns.protocol.Protocol; public final class NameServerMain { private static final Logger LOGGER = LogManager.getLogger(NameServerMain.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java index d9130c537f..649d214a81 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/monitor/TrafficMonitorWatcher.java @@ -15,10 +15,22 @@ package org.apache.traffic_control.traffic_router.core.monitor; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URI; +import java.net.UnknownHostException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Properties; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import org.apache.traffic_control.traffic_router.core.config.ConfigHandler; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; import org.apache.traffic_control.traffic_router.core.util.AbstractUpdatable; @@ -28,17 +40,6 @@ import org.springframework.context.event.ApplicationContextEvent; import org.springframework.context.event.ContextClosedEvent; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.net.URI; -import java.net.UnknownHostException; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; - @SuppressWarnings("PMD.TooManyFields") public class TrafficMonitorWatcher implements ApplicationListener { private static final Logger LOGGER = LogManager.getLogger(TrafficMonitorWatcher.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java index 00396459ce..b858a078b2 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/DataExporter.java @@ -15,10 +15,22 @@ package org.apache.traffic_control.traffic_router.core.util; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + import com.fasterxml.jackson.databind.JsonNode; import com.google.common.cache.CacheStats; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import org.apache.traffic_control.traffic_router.core.edge.Cache; import org.apache.traffic_control.traffic_router.core.edge.CacheLocation; import org.apache.traffic_control.traffic_router.core.edge.CacheRegister; @@ -34,17 +46,6 @@ import org.apache.traffic_control.traffic_router.geolocation.Geolocation; import org.apache.traffic_control.traffic_router.geolocation.GeolocationException; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - - public class DataExporter { private static final Logger LOGGER = LogManager.getLogger(DataExporter.class); private static final String NOT_FOUND_MESSAGE = "not found"; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java index eba8039b0f..317ffc11c8 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/Fetcher.java @@ -15,16 +15,6 @@ package org.apache.traffic_control.traffic_router.core.util; -import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -39,6 +29,16 @@ import java.util.Map; import java.util.zip.GZIPInputStream; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + +import org.apache.commons.io.IOUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class Fetcher { private static final Logger LOGGER = LogManager.getLogger(Fetcher.class); diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java index 376e87ee3c..eb668136dd 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/LanguidState.java @@ -15,16 +15,17 @@ package org.apache.traffic_control.traffic_router.core.util; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Iterator; + import com.fasterxml.jackson.databind.JsonNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import org.apache.traffic_control.traffic_router.core.router.TrafficRouter; import org.apache.traffic_control.traffic_router.core.router.TrafficRouterManager; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Iterator; - public class LanguidState { private static final Logger LOGGER = LogManager.getLogger(LanguidState.class); private boolean ready = false; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java index 6717a24a80..47834ba171 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/util/PeriodicResourceUpdater.java @@ -15,16 +15,6 @@ package org.apache.traffic_control.traffic_router.core.util; -import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.asynchttpclient.AsyncCompletionHandler; -import org.asynchttpclient.AsyncHttpClient; -import org.asynchttpclient.DefaultAsyncHttpClient; -import org.asynchttpclient.DefaultAsyncHttpClientConfig; -import org.asynchttpclient.Request; -import org.asynchttpclient.Response; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -43,6 +33,17 @@ import java.util.concurrent.TimeUnit; import java.util.zip.GZIPInputStream; +import org.apache.commons.io.IOUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import org.asynchttpclient.AsyncCompletionHandler; +import org.asynchttpclient.AsyncHttpClient; +import org.asynchttpclient.DefaultAsyncHttpClient; +import org.asynchttpclient.DefaultAsyncHttpClientConfig; +import org.asynchttpclient.Request; +import org.asynchttpclient.Response; + import static org.apache.commons.codec.digest.DigestUtils.md5Hex; /** diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java index e06abfb7e1..d3fd5ba4ba 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeTest.java @@ -15,26 +15,29 @@ package org.apache.traffic_control.traffic_router.core.loc; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.net.InetAddresses; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.MatcherAssert.assertThat; import java.io.File; import java.net.InetAddress; -import java.util.ArrayList; + import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.ArrayList; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.Before; +import org.junit.Test; + +import com.google.common.net.InetAddresses; public class NetworkNodeTest { private static final Logger LOGGER = LogManager.getLogger(NetworkNodeTest.class); From b9fe80a2d47e31d943356dd87d09ed520eb00d2e Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Thu, 2 Dec 2021 14:28:21 -0700 Subject: [PATCH 07/32] Updated setLevel class for getLogger and getRootLogger. --- .../traffic_router/core/TestBase.java | 12 +++++++----- .../traffic_router/core/TrafficRouterStart.java | 10 ++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java index 06f61970fe..47d97942d6 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TestBase.java @@ -20,6 +20,7 @@ import org.apache.traffic_control.traffic_router.shared.DeliveryServiceCertificatesMBean; import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.layout.PatternLayout; +import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -108,8 +109,9 @@ public static void setupFakeServers() throws Exception { File dbDirectory = new File(tmpDeployDir, "db"); dbDirectory.mkdir(); - LogManager.getLogger("org.eclipse.jetty").setLevel(Level.WARN); - LogManager.getLogger("org.springframework").setLevel(Level.WARN); + LoggerContext.getContext().getLogger("org.eclipse.jetty").setLevel(Level.WARN); + LoggerContext.getContext().getLogger("org.springframework").setLevel(Level.WARN); + LoggerContext.getContext().getLogger("").setLevel(Level.WARN); final MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer(); try { @@ -119,9 +121,9 @@ public static void setupFakeServers() throws Exception { e.printStackTrace(); } - ConsoleAppender consoleAppender = new ConsoleAppender(new PatternLayout("%d{ISO8601} [%-5p] %c{4}: %m%n")); - LogManager.getRootLogger().addAppender(consoleAppender); - LogManager.getRootLogger().setLevel(Level.INFO); + ConsoleAppender consoleAppender = ConsoleAppender.newBuilder().setLayout(PatternLayout.newBuilder().withPattern("%d{ISO8601} [%-5p] %c{4}: %m%n").build()).build(); + LoggerContext.getContext().getRootLogger().addAppender(consoleAppender); + LoggerContext.getContext().getRootLogger().setLevel(Level.INFO); } public static void addToEnv(Map envVars) throws Exception { diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java index 0f0e389939..9459d89a22 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/TrafficRouterStart.java @@ -15,9 +15,11 @@ package org.apache.traffic_control.traffic_router.core; +import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; public class TrafficRouterStart { @@ -35,11 +37,11 @@ public static void main(String[] args) throws Exception { System.setProperty("dns.tcp.port", "1053"); System.setProperty("dns.udp.port", "1053"); - LogManager.getLogger("org.springframework").setLevel(Level.WARN); + LoggerContext.getContext().getLogger("org.springframework").setLevel(Level.WARN); - ConsoleAppender consoleAppender = new ConsoleAppender(new PatternLayout("%d{ISO8601} [%-5p] %c{4}: %m%n")); - Logger.getRootLogger().addAppender(consoleAppender); - Logger.getRootLogger().setLevel(Level.INFO); + ConsoleAppender consoleAppender = ConsoleAppender.newBuilder().setLayout(PatternLayout.newBuilder().withPattern("%d{ISO8601} [%-5p] %c{4}: %m%n").build()).build(); + LoggerContext.getContext().getRootLogger().addAppender(consoleAppender); + LoggerContext.getContext().getRootLogger().setLevel(Level.INFO); System.out.println("[" + System.currentTimeMillis() + "] >>>>>>>>>>>>>>>> Embedded Tomcat loading Traffic Router"); CatalinaTrafficRouter catalinaTrafficRouter = new CatalinaTrafficRouter(prefix + "/src/main/conf/server.xml", prefix + "/src/main/webapp" ); From c64627f460b374af89c4786a534eb193b56a23b6 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Thu, 2 Dec 2021 14:32:59 -0700 Subject: [PATCH 08/32] Updated setLevel class for getLogger and getRootLogger-1 --- .../core/external/ExternalTestSuite.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java index 4db30fbd3d..0830a661fb 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/ExternalTestSuite.java @@ -15,6 +15,7 @@ package org.apache.traffic_control.traffic_router.core.external; +import org.apache.logging.log4j.core.LoggerContext; import org.apache.traffic_control.traffic_router.core.CatalinaTrafficRouter; import org.apache.traffic_control.traffic_router.core.util.ExternalTest; import org.apache.catalina.LifecycleException; @@ -137,12 +138,12 @@ public static void beforeClass() throws Exception { File dbDirectory = new File(tmpDeployDir, "db"); dbDirectory.mkdir(); - LogManager.getLogger("org.eclipse.jetty").setLevel(Level.WARN); - LogManager.getLogger("org.springframework").setLevel(Level.WARN); + LoggerContext.getContext().getLogger("org.eclipse.jetty").setLevel(Level.WARN); + LoggerContext.getContext().getLogger("org.springframework").setLevel(Level.WARN); - ConsoleAppender consoleAppender = new ConsoleAppender(new PatternLayout("%d{ISO8601} [%-5p] %c{4}: %m%n")); - LogManager.getRootLogger().addAppender(consoleAppender); - LogManager.getRootLogger().setLevel(Level.INFO); + ConsoleAppender consoleAppender = ConsoleAppender.newBuilder().setLayout(PatternLayout.newBuilder().withPattern("%d{ISO8601} [%-5p] %c{4}: %m%n").build()).build(); + LoggerContext.getContext().getRootLogger().addAppender(consoleAppender); + LoggerContext.getContext().getRootLogger().setLevel(Level.INFO); // This one test the actual war that is output by the build process catalinaTrafficRouter = new CatalinaTrafficRouter("src/main/conf/server.xml", "target/ROOT"); From 22289f13a5b9b2e9722f2c4e53e8c9ecce349e3c Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Fri, 3 Dec 2021 09:28:37 -0700 Subject: [PATCH 09/32] Imported Record class from Maven to remove ambiguity. --- .../traffic_router/core/dns/DNSAccessEventBuilderTest.java | 1 + .../traffic_control/traffic_router/core/dns/NameServerTest.java | 1 + .../traffic_router/core/dns/protocol/AbstractProtocolTest.java | 1 + 3 files changed, 3 insertions(+) diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java index 4f8c1736ff..1b60bba25c 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java @@ -26,6 +26,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.xbill.DNS.*; +import org.xbill.DNS.Record; import java.net.Inet4Address; import java.net.InetAddress; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java index ca3e418544..e39bc2157b 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java @@ -46,6 +46,7 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.JsonNode; +import org.xbill.DNS.Record; @RunWith(PowerMockRunner.class) @PrepareForTest({Header.class, NameServer.class, TrafficRouterManager.class, TrafficRouter.class, CacheRegister.class}) diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java index 8a74b6ef19..4197e4c6ba 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java @@ -29,6 +29,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.xbill.DNS.*; +import org.xbill.DNS.Record; import java.net.Inet4Address; import java.net.InetAddress; From ecf0e13073bd24a147ac456ed95045c649cba681 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Fri, 3 Dec 2021 09:46:27 -0700 Subject: [PATCH 10/32] Revert "Imported Record class from Maven to remove ambiguity." This reverts commit 22289f13a5b9b2e9722f2c4e53e8c9ecce349e3c. --- .../traffic_router/core/dns/DNSAccessEventBuilderTest.java | 1 - .../traffic_control/traffic_router/core/dns/NameServerTest.java | 1 - .../traffic_router/core/dns/protocol/AbstractProtocolTest.java | 1 - 3 files changed, 3 deletions(-) diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java index 1b60bba25c..4f8c1736ff 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java @@ -26,7 +26,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.xbill.DNS.*; -import org.xbill.DNS.Record; import java.net.Inet4Address; import java.net.InetAddress; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java index e39bc2157b..ca3e418544 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java @@ -46,7 +46,6 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.JsonNode; -import org.xbill.DNS.Record; @RunWith(PowerMockRunner.class) @PrepareForTest({Header.class, NameServer.class, TrafficRouterManager.class, TrafficRouter.class, CacheRegister.class}) diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java index 4197e4c6ba..8a74b6ef19 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java @@ -29,7 +29,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.xbill.DNS.*; -import org.xbill.DNS.Record; import java.net.Inet4Address; import java.net.InetAddress; From 00d9b3d21bf2420ae6eb9a9583272121c642c7b3 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Fri, 3 Dec 2021 10:22:13 -0700 Subject: [PATCH 11/32] Fixed when clause with LogManager. --- .../traffic_router/core/dns/protocol/AbstractProtocolTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java index 8a74b6ef19..1b44032a8c 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java @@ -76,7 +76,7 @@ public Long answer(InvocationOnMock invocation) { when(System.currentTimeMillis()).then(currentTimeAnswer); mockStatic(Logger.class); - when(LogManager.getLogger("org.apache.traffic_control.traffic_router.core.access")).thenAnswer(invocation -> accessLogger); + when(LogManager.getLogger("org.apache.traffic_control.traffic_router.core.access")).thenReturn(accessLogger); header = new Header(); header.setID(65535); From bd930af3feb2f27a88cc36165cc0fe5c7538f8e7 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Fri, 3 Dec 2021 12:33:38 -0700 Subject: [PATCH 12/32] Fixed when clause with LogManager-1 --- .../core/dns/protocol/AbstractProtocolTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java index 1b44032a8c..c59d84fe59 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java @@ -42,7 +42,7 @@ @RunWith(PowerMockRunner.class) -@PrepareForTest({AbstractProtocolTest.FakeAbstractProtocol.class, Logger.class, DNSAccessEventBuilder.class, Header.class, NameServer.class, DNSAccessRecord.class}) +@PrepareForTest({AbstractProtocolTest.FakeAbstractProtocol.class, Logger.class, LogManager.class, DNSAccessEventBuilder.class, Header.class, NameServer.class, DNSAccessRecord.class}) public class AbstractProtocolTest { private static Logger accessLogger = mock(Logger.class); private NameServer nameServer; @@ -75,8 +75,8 @@ public Long answer(InvocationOnMock invocation) { }; when(System.currentTimeMillis()).then(currentTimeAnswer); - mockStatic(Logger.class); - when(LogManager.getLogger("org.apache.traffic_control.traffic_router.core.access")).thenReturn(accessLogger); + mockStatic(LogManager.class); + when(LogManager.getLogger("org.apache.traffic_control.traffic_router.core.access")).thenAnswer(invocation -> accessLogger); header = new Header(); header.setID(65535); From 411bb52e22d470c393b78705a24207c8983ea29a Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Fri, 3 Dec 2021 12:42:24 -0700 Subject: [PATCH 13/32] updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da785de5d3..0f493281e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Traffic Ops: Sanitize username before executing LDAP query ### Changed +- Updated `log4j` module in Traffic Router from version 1.2.17 to 2.14.1 - Updated `t3c` to request less unnecessary deliveryservice-server assignment and invalidation jobs data via new query params supported by Traffic Ops - [#6179](https://github.com/apache/trafficcontrol/issues/6179) Updated the Traffic Ops rpm to include the `ToDnssecRefresh` binary and make the `trafops_dnssec_refresh` cron job use it - Changed the DNSSEC refresh Traffic Ops API to only create a new change log entry if any keys were actually refreshed or an error occurred (in order to reduce changelog noise) From 5d68e7c21aca8f05eec95be70eae0f354bf7f183 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Mon, 6 Dec 2021 09:37:30 -0700 Subject: [PATCH 14/32] Fixed based on review comments --- .../connector/src/test/java/secure/KeyManagerTest.java | 2 ++ .../src/test/java/secure/TomcatLifecycleListenerTest.java | 2 ++ .../traffic_control/traffic_router/core/dns/NameServer.java | 4 ++-- .../traffic_router/core/dns/SignatureManager.java | 4 ++-- .../traffic_router/core/dns/NameServerTest.java | 2 ++ .../traffic_router/core/dns/ZoneManagerUnitTest.java | 2 ++ .../traffic_router/core/dns/ZoneSignerImplTest.java | 2 ++ .../traffic_router/core/dns/protocol/TCPTest.java | 2 ++ .../traffic_router/core/dns/protocol/UDPTest.java | 2 ++ .../traffic_router/core/ds/DeliveryServiceMatcherTest.java | 2 ++ .../traffic_router/core/external/CoverageZoneTest.java | 2 ++ .../traffic_router/core/loc/AbstractServiceUpdaterTest.java | 2 ++ .../traffic_router/core/loc/CoverageZoneTest.java | 2 ++ .../core/loc/MaxmindGeolocationServiceTest.java | 2 ++ .../traffic_router/core/router/DNSRoutingMissesTest.java | 2 ++ .../core/router/GeoSortSteeringResultsTest.java | 3 +++ .../traffic_router/core/util/FetcherTest.java | 2 +- traffic_router/shared/pom.xml | 5 ----- .../traffic_control/traffic_router/shared/SigningData.java | 5 +++-- .../shared/src/test/java/secure/BindPrivateKeyTest.java | 2 ++ 20 files changed, 39 insertions(+), 12 deletions(-) diff --git a/traffic_router/connector/src/test/java/secure/KeyManagerTest.java b/traffic_router/connector/src/test/java/secure/KeyManagerTest.java index 6edc18ae78..45495424fe 100644 --- a/traffic_router/connector/src/test/java/secure/KeyManagerTest.java +++ b/traffic_router/connector/src/test/java/secure/KeyManagerTest.java @@ -22,6 +22,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -42,6 +43,7 @@ import static org.powermock.api.mockito.PowerMockito.mockStatic; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("javax.management.*") @PrepareForTest({CertificateRegistry.class}) public class KeyManagerTest { private KeyManager keyManager; diff --git a/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java b/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java index 9b65a8bee1..33ea85bb5f 100644 --- a/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java +++ b/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java @@ -26,6 +26,7 @@ import org.junit.runner.RunWith; import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -38,6 +39,7 @@ import static org.mockito.Mockito.verify; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("javax.management.*") @PrepareForTest({TomcatLifecycleListener.class, ManagementFactory.class, LifecycleEvent.class}) public class TomcatLifecycleListenerTest { @Before diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java index 6a4e2f4da5..91c6fa5cf9 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/NameServer.java @@ -18,8 +18,8 @@ import java.net.InetAddress; import java.util.*; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.xbill.DNS.DClass; import org.xbill.DNS.ExtendedFlags; import org.xbill.DNS.Flags; diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java index 4fa91267c1..99e92daa72 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/dns/SignatureManager.java @@ -39,8 +39,8 @@ import org.apache.traffic_control.traffic_router.core.util.JsonUtilsException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.xbill.DNS.DSRecord; import org.xbill.DNS.Name; import org.xbill.DNS.Record; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java index ca3e418544..54d75dd359 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java @@ -26,6 +26,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.xbill.DNS.*; @@ -48,6 +49,7 @@ import com.fasterxml.jackson.databind.JsonNode; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("javax.management.*") @PrepareForTest({Header.class, NameServer.class, TrafficRouterManager.class, TrafficRouter.class, CacheRegister.class}) public class NameServerTest { private NameServer nameServer; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java index 36662bcc2e..ee5ab2dd4e 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.xbill.DNS.ARecord; @@ -52,6 +53,7 @@ import static org.powermock.api.mockito.PowerMockito.whenNew; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("javax.management.*") @PrepareForTest({ZoneManager.class, SignatureManager.class}) public class ZoneManagerUnitTest { ZoneManager zoneManager; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImplTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImplTest.java index 57287b1554..f3ed00863a 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImplTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneSignerImplTest.java @@ -37,6 +37,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.xbill.DNS.ARecord; @@ -50,6 +51,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest(ZoneSignerImpl.class) +@PowerMockIgnore("javax.management.*") public class ZoneSignerImplTest { static class IsRRsetTypeA implements ArgumentMatcher { diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCPTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCPTest.java index d91a02d75f..a450c9d102 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCPTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCPTest.java @@ -39,6 +39,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.xbill.DNS.DClass; @@ -54,6 +55,7 @@ import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("javax.management.*") @PrepareForTest({AbstractProtocol.class, Message.class}) public class TCPTest { private Socket socket; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDPTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDPTest.java index 9805311d45..e14014405d 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDPTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDPTest.java @@ -36,6 +36,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.xbill.DNS.DClass; @@ -53,6 +54,7 @@ import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("javax.management.*") @PrepareForTest({AbstractProtocol.class, Message.class}) public class UDPTest { diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java index c26223a72f..cae384ba89 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/ds/DeliveryServiceMatcherTest.java @@ -19,6 +19,7 @@ import org.apache.traffic_control.traffic_router.core.request.Request; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -33,6 +34,7 @@ @PrepareForTest(DeliveryService.class) @RunWith(PowerMockRunner.class) +@PowerMockIgnore("javax.management.*") public class DeliveryServiceMatcherTest { @Test public void itReturnsTrueWhenAllMatchersPass() { diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/CoverageZoneTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/CoverageZoneTest.java index 95b5c180e2..21ccebddb7 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/CoverageZoneTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/external/CoverageZoneTest.java @@ -29,6 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.greaterThan; @@ -39,6 +40,7 @@ import static org.hamcrest.core.IsNot.not; import static org.junit.Assert.assertThat; +@PowerMockIgnore("javax.management.*") @Category(ExternalTest.class) public class CoverageZoneTest { private CloseableHttpClient closeableHttpClient; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdaterTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdaterTest.java index c22cd72523..50b83f79fe 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdaterTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/AbstractServiceUpdaterTest.java @@ -19,6 +19,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -44,6 +45,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({AbstractServiceUpdater.class, HttpURLConnection.class, URL.class, Files.class}) +@PowerMockIgnore("javax.management.*") public class AbstractServiceUpdaterTest { private HttpURLConnection connection; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/CoverageZoneTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/CoverageZoneTest.java index 982ef7b205..9e70e8a9b8 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/CoverageZoneTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/CoverageZoneTest.java @@ -27,6 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -46,6 +47,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest(TrafficRouter.class) +@PowerMockIgnore("javax.management.*") public class CoverageZoneTest { private TrafficRouter trafficRouter; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java index f863340990..c4865ce093 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/MaxmindGeolocationServiceTest.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -38,6 +39,7 @@ import static org.powermock.api.mockito.PowerMockito.whenNew; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("javax.management.*") public class MaxmindGeolocationServiceTest { private MaxmindGeolocationService service; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java index 34b017180b..a611c48b6a 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/DNSRoutingMissesTest.java @@ -31,6 +31,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -44,6 +45,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({DeliveryService.class, TrafficRouter.class}) +@PowerMockIgnore("javax.management.*") public class DNSRoutingMissesTest { private DNSRequest request; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/GeoSortSteeringResultsTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/GeoSortSteeringResultsTest.java index b8980b77ef..f52515afd2 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/GeoSortSteeringResultsTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/router/GeoSortSteeringResultsTest.java @@ -28,6 +28,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -44,6 +45,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({Collections.class}) +@PowerMockIgnore("javax.management.*") public class GeoSortSteeringResultsTest { private TrafficRouter trafficRouter; @@ -131,3 +133,4 @@ public void testGeoSortingMixedWithNonGeoTargets() { } } + diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/FetcherTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/FetcherTest.java index 9d757fc313..ebfc4a5d10 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/FetcherTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/util/FetcherTest.java @@ -36,7 +36,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({Fetcher.class, URL.class, InputStreamReader.class}) -@PowerMockIgnore("javax.net.ssl.*") +@PowerMockIgnore({"javax.net.ssl.*", "javax.management.*"}) public class FetcherTest { @Test diff --git a/traffic_router/shared/pom.xml b/traffic_router/shared/pom.xml index 20be0f6934..45bc095daf 100644 --- a/traffic_router/shared/pom.xml +++ b/traffic_router/shared/pom.xml @@ -111,11 +111,6 @@ under the License. bcprov-jdk15on 1.68 - - org.slf4j - slf4j-log4j12 - 1.7.5 - diff --git a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/SigningData.java b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/SigningData.java index 949b884a0e..ec1901184b 100644 --- a/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/SigningData.java +++ b/traffic_router/shared/src/main/java/org/apache/traffic_control/traffic_router/shared/SigningData.java @@ -15,7 +15,8 @@ package org.apache.traffic_control.traffic_router.shared; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.xbill.DNS.Record; import org.xbill.DNS.Section; @@ -571,7 +572,7 @@ public class SigningData { public static List signedList, postZoneList, dsRecordList = new ArrayList<>(); - private static final Logger LOGGER = Logger.getLogger(SigningData.class); + private static final Logger LOGGER = LogManager.getLogger(SigningData.class); public static List getStringsNamedLike(final String name, final Class clazz) { return Arrays.asList(clazz.getDeclaredFields()).stream() diff --git a/traffic_router/shared/src/test/java/secure/BindPrivateKeyTest.java b/traffic_router/shared/src/test/java/secure/BindPrivateKeyTest.java index c7ea572c3c..7e7b6d3950 100644 --- a/traffic_router/shared/src/test/java/secure/BindPrivateKeyTest.java +++ b/traffic_router/shared/src/test/java/secure/BindPrivateKeyTest.java @@ -21,6 +21,7 @@ import org.junit.runner.RunWith; import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -43,6 +44,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest(BindPrivateKey.class) +@PowerMockIgnore("javax.management.*") public class BindPrivateKeyTest { private String privateKeyString; private PrivateKey privateKey; From 0ff59c3aff5698ff7c4ef255821ba9acd752bacc Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Mon, 6 Dec 2021 11:39:22 -0700 Subject: [PATCH 15/32] Fixed based on review comments - 1 --- .../src/test/java/protocol/RouterSslImplementationTest.java | 2 ++ .../src/test/java/secure/CertificateDataListenerTest.java | 2 ++ .../connector/src/test/java/secure/KeyManagerTest.java | 2 +- .../src/test/java/secure/TomcatLifecycleListenerTest.java | 2 +- .../traffic_router/core/dns/DNSAccessEventBuilderTest.java | 2 ++ .../traffic_control/traffic_router/core/dns/NameServerTest.java | 2 +- .../traffic_router/core/dns/ZoneManagerUnitTest.java | 2 +- .../traffic_router/core/dns/protocol/AbstractProtocolTest.java | 2 ++ .../traffic_router/core/dns/protocol/TCPTest.java | 2 +- .../traffic_router/core/dns/protocol/UDPTest.java | 2 +- .../traffic_router/core/http/HTTPAccessEventBuilderTest.java | 2 ++ .../traffic_router/core/loc/NetworkNodeUnitTest.java | 1 - traffic_router/neustar/src/test/java/data/TarExtractorTest.java | 1 + .../test/java/geolocation/NeustarGeolocationServiceTest.java | 1 + .../src/test/java/neustar/GPDatabaseReaderBuilderTest.java | 1 + 15 files changed, 19 insertions(+), 7 deletions(-) diff --git a/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java b/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java index 76328a37a7..7d847352e9 100644 --- a/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java +++ b/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java @@ -24,6 +24,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.api.mockito.PowerMockito; @@ -35,6 +36,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({RouterSslImplementation.class, SSLHostConfigCertificate.class, RouterSslUtil.class}) +@PowerMockIgnore("javax.management.*") public class RouterSslImplementationTest { SSLSession sslSession = PowerMockito.mock(SSLSession.class); SSLHostConfig sslHostConfig = PowerMockito.mock(SSLHostConfig.class); diff --git a/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java b/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java index 15a1834e82..b370cb3559 100644 --- a/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java +++ b/traffic_router/connector/src/test/java/secure/CertificateDataListenerTest.java @@ -22,6 +22,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -39,6 +40,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest(CertificateRegistry.class) +@PowerMockIgnore("javax.management.*") public class CertificateDataListenerTest { private CertificateRegistry certificateRegistry; diff --git a/traffic_router/connector/src/test/java/secure/KeyManagerTest.java b/traffic_router/connector/src/test/java/secure/KeyManagerTest.java index 45495424fe..98915434b2 100644 --- a/traffic_router/connector/src/test/java/secure/KeyManagerTest.java +++ b/traffic_router/connector/src/test/java/secure/KeyManagerTest.java @@ -43,8 +43,8 @@ import static org.powermock.api.mockito.PowerMockito.mockStatic; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("javax.management.*") @PrepareForTest({CertificateRegistry.class}) +@PowerMockIgnore("javax.management.*") public class KeyManagerTest { private KeyManager keyManager; private X509Certificate x509Certificate; diff --git a/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java b/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java index 33ea85bb5f..d8356258de 100644 --- a/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java +++ b/traffic_router/connector/src/test/java/secure/TomcatLifecycleListenerTest.java @@ -39,8 +39,8 @@ import static org.mockito.Mockito.verify; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("javax.management.*") @PrepareForTest({TomcatLifecycleListener.class, ManagementFactory.class, LifecycleEvent.class}) +@PowerMockIgnore("javax.management.*") public class TomcatLifecycleListenerTest { @Before public void before() { diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java index 4f8c1736ff..ecd247f964 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/DNSAccessEventBuilderTest.java @@ -23,6 +23,7 @@ import org.junit.runner.RunWith; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.xbill.DNS.*; @@ -41,6 +42,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({Random.class, Header.class, DNSAccessEventBuilder.class, System.class, DNSAccessRecord.class}) +@PowerMockIgnore("javax.management.*") public class DNSAccessEventBuilderTest { private InetAddress client; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java index 54d75dd359..95e3216b88 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/NameServerTest.java @@ -49,8 +49,8 @@ import com.fasterxml.jackson.databind.JsonNode; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("javax.management.*") @PrepareForTest({Header.class, NameServer.class, TrafficRouterManager.class, TrafficRouter.class, CacheRegister.class}) +@PowerMockIgnore("javax.management.*") public class NameServerTest { private NameServer nameServer; private InetAddress client; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java index ee5ab2dd4e..69cca2f35c 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/ZoneManagerUnitTest.java @@ -53,8 +53,8 @@ import static org.powermock.api.mockito.PowerMockito.whenNew; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("javax.management.*") @PrepareForTest({ZoneManager.class, SignatureManager.class}) +@PowerMockIgnore("javax.management.*") public class ZoneManagerUnitTest { ZoneManager zoneManager; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java index c59d84fe59..07d2a4b9d2 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/AbstractProtocolTest.java @@ -26,6 +26,7 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.xbill.DNS.*; @@ -43,6 +44,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({AbstractProtocolTest.FakeAbstractProtocol.class, Logger.class, LogManager.class, DNSAccessEventBuilder.class, Header.class, NameServer.class, DNSAccessRecord.class}) +@PowerMockIgnore("javax.management.*") public class AbstractProtocolTest { private static Logger accessLogger = mock(Logger.class); private NameServer nameServer; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCPTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCPTest.java index a450c9d102..8fea6357ea 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCPTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/TCPTest.java @@ -55,8 +55,8 @@ import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("javax.management.*") @PrepareForTest({AbstractProtocol.class, Message.class}) +@PowerMockIgnore("javax.management.*") public class TCPTest { private Socket socket; private ThreadPoolExecutor executorService; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDPTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDPTest.java index e14014405d..5e7581ae48 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDPTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/dns/protocol/UDPTest.java @@ -54,8 +54,8 @@ import org.apache.traffic_control.traffic_router.core.dns.DNSAccessRecord; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("javax.management.*") @PrepareForTest({AbstractProtocol.class, Message.class}) +@PowerMockIgnore("javax.management.*") public class UDPTest { private DatagramSocket datagramSocket; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java index ed5b158f64..d999eeaff1 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java @@ -25,6 +25,7 @@ import org.junit.runner.RunWith; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -48,6 +49,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({Date.class, HTTPAccessEventBuilder.class, HTTPAccessRecord.class, System.class}) +@PowerMockIgnore("javax.management.*") public class HTTPAccessEventBuilderTest { private HttpServletRequest request; diff --git a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java index f6b5153ea2..9ed97fd721 100644 --- a/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java +++ b/traffic_router/core/src/test/java/org/apache/traffic_control/traffic_router/core/loc/NetworkNodeUnitTest.java @@ -19,7 +19,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; - import java.util.HashSet; import java.util.Iterator; import java.util.Map; diff --git a/traffic_router/neustar/src/test/java/data/TarExtractorTest.java b/traffic_router/neustar/src/test/java/data/TarExtractorTest.java index 456ed0144f..abf3f05974 100644 --- a/traffic_router/neustar/src/test/java/data/TarExtractorTest.java +++ b/traffic_router/neustar/src/test/java/data/TarExtractorTest.java @@ -48,6 +48,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({TarExtractor.class, File.class, TarArchiveInputStream.class}) +@PowerMockIgnore("javax.management.*") public class TarExtractorTest { @Before diff --git a/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java b/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java index f87afd9ce8..fb68d9e96c 100644 --- a/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java +++ b/traffic_router/neustar/src/test/java/geolocation/NeustarGeolocationServiceTest.java @@ -47,6 +47,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({NeustarGeolocationService.class, GPDatabaseReader.class, Reader.class}) +@PowerMockIgnore("javax.management.*") public class NeustarGeolocationServiceTest { @Mock File neustarDatabaseDirectory; diff --git a/traffic_router/neustar/src/test/java/neustar/GPDatabaseReaderBuilderTest.java b/traffic_router/neustar/src/test/java/neustar/GPDatabaseReaderBuilderTest.java index 157ce42161..06fdc6dc3d 100644 --- a/traffic_router/neustar/src/test/java/neustar/GPDatabaseReaderBuilderTest.java +++ b/traffic_router/neustar/src/test/java/neustar/GPDatabaseReaderBuilderTest.java @@ -35,6 +35,7 @@ import static org.powermock.api.mockito.PowerMockito.whenNew; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("javax.management.*") public class GPDatabaseReaderBuilderTest { @Test From bae3848b7016383cd29552b8ff2e569ce21f6e5e Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Mon, 6 Dec 2021 14:22:49 -0700 Subject: [PATCH 16/32] updated import path for ConsoleAppender, PatternLayout, RollingFileAppender classes. --- .../ansible/roles/traffic-router/defaults/main.yml | 8 ++++---- traffic_router/core/src/main/conf/log4j.properties | 8 ++++---- traffic_router/core/src/test/conf/log4j.properties | 10 +++++----- .../src/test/java/data/NeustarDatabaseUpdaterTest.java | 4 ++-- .../neustar/src/test/java/data/TarExtractorTest.java | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/infrastructure/ansible/roles/traffic-router/defaults/main.yml b/infrastructure/ansible/roles/traffic-router/defaults/main.yml index a68c504053..da2a278463 100644 --- a/infrastructure/ansible/roles/traffic-router/defaults/main.yml +++ b/infrastructure/ansible/roles/traffic-router/defaults/main.yml @@ -129,22 +129,22 @@ tr_cache_config_json_refresh_period: 60000 # log4j.properties tr_log4j_opts: - "# ACCESS is set to be a Syslog Appender" - - log4j.appender.ACCESS=org.apache.logging.log4j.RollingFileAppender + - log4j.appender.ACCESS=org.apache.logging.log4j.core.appender.RollingFileAppender - "log4j.appender.ACCESS.File={{tr_log_dir}}/access.log" - log4j.appender.ACCESS.MaxFileSize=200MB - log4j.appender.ACCESS.MaxBackupIndex=10 - - "# ACCESS uses PatternLayout." - - log4j.appender.ACCESS.layout=org.apache.logging.log4j.PatternLayout + - log4j.appender.ACCESS.layout=org.apache.logging.log4j.core.layout.PatternLayout - log4j.appender.ACCESS.layout.ConversionPattern=%m%n - log4j.appender.ACCESS.threshold=INFO - - - log4j.appender.A1=org.apache.logging.log4j.RollingFileAppender + - log4j.appender.A1=org.apache.logging.log4j.core.appender.RollingFileAppender - "log4j.appender.A1.file={{tr_log_dir}}/traffic_router.log" - log4j.appender.A1.maxFileSize=100MB - - "# A1 uses PatternLayout." - - log4j.appender.A1.layout=org.apache.logging.log4j.PatternLayout + - log4j.appender.A1.layout=org.apache.logging.log4j.core.layout.PatternLayout - log4j.appender.A1.layout.ConversionPattern=%-5p %d{yyyy-MM-dd'T'HH:mm:ss.SSS} [%t] %c - %m%n - log4j.appender.A1.threshold=ALL - diff --git a/traffic_router/core/src/main/conf/log4j.properties b/traffic_router/core/src/main/conf/log4j.properties index e5a4d46980..f9fdef3b01 100644 --- a/traffic_router/core/src/main/conf/log4j.properties +++ b/traffic_router/core/src/main/conf/log4j.properties @@ -14,22 +14,22 @@ # # ACCESS is set to be a Syslog Appender -log4j.appender.ACCESS=org.apache.logging.log4j.RollingFileAppender +log4j.appender.ACCESS=org.apache.logging.log4j.core.appender.RollingFileAppender log4j.appender.ACCESS.File=/opt/traffic_router/var/log/access.log log4j.appender.ACCESS.MaxFileSize=200MB log4j.appender.ACCESS.MaxBackupIndex=10 # ACCESS uses PatternLayout. -log4j.appender.ACCESS.layout=org.apache.logging.log4j.PatternLayout +log4j.appender.ACCESS.layout=org.apache.logging.log4j.core.layout.PatternLayout log4j.appender.ACCESS.layout.ConversionPattern=%m%n log4j.appender.ACCESS.threshold=INFO -log4j.appender.A1=org.apache.logging.log4j.RollingFileAppender +log4j.appender.A1=org.apache.logging.log4j.core.appender.RollingFileAppender log4j.appender.A1.file=/opt/traffic_router/var/log/traffic_router.log log4j.appender.A1.maxFileSize=100MB # A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.logging.log4j.PatternLayout +log4j.appender.A1.layout=org.apache.logging.log4j.core.layout.PatternLayout log4j.appender.A1.layout.ConversionPattern=%-5p %d{yyyy-MM-dd'T'HH:mm:ss.SSS} [%t] %c - %m%n log4j.appender.A1.threshold=ALL diff --git a/traffic_router/core/src/test/conf/log4j.properties b/traffic_router/core/src/test/conf/log4j.properties index 5d41d91f7c..9cef543255 100644 --- a/traffic_router/core/src/test/conf/log4j.properties +++ b/traffic_router/core/src/test/conf/log4j.properties @@ -14,25 +14,25 @@ # # ACCESS is set to be a Syslog Appender -log4j.appender.ACCESS=org.apache.logging.log4j.RollingFileAppender +log4j.appender.ACCESS=org.apache.logging.log4j.core.appender.RollingFileAppender log4j.appender.ACCESS.File=/opt/traffic_router/var/log/access.log log4j.appender.ACCESS.MaxFileSize=200MB log4j.appender.ACCESS.MaxBackupIndex=10 # ACCESS uses PatternLayout. -log4j.appender.ACCESS.layout=org.apache.logging.log4j.PatternLayout +log4j.appender.ACCESS.layout=org.apache.logging.log4j.core.layout.PatternLayout log4j.appender.ACCESS.layout.ConversionPattern=%m%n log4j.appender.ACCESS.threshold=INFO # A1 is set to be a RollingFileAppender. -#log4j.appender.A1=org.apache.logging.log4j.ConsoleAppender +#log4j.appender.A1=org.apache.logging.log4j.core.appender.ConsoleAppender -log4j.appender.A1=org.apache.logging.log4j.RollingFileAppender +log4j.appender.A1=org.apache.logging.log4j.core.appender.RollingFileAppender log4j.appender.A1.file=${deploy.dir}/var/log/traffic_router.log log4j.appender.A1.maxFileSize=100MB # A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.logging.log4j.PatternLayout +log4j.appender.A1.layout=org.apache.logging.log4j.core.layout.PatternLayout log4j.appender.A1.layout.ConversionPattern=%-5p %d{yyyy-MM-dd'T'HH:mm:ss.SSS} [%t] %c - %m%n log4j.appender.A1.threshold=ALL diff --git a/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java b/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java index 0e7b4a20a3..70fcd90ed8 100644 --- a/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java +++ b/traffic_router/neustar/src/test/java/data/NeustarDatabaseUpdaterTest.java @@ -24,10 +24,10 @@ import org.apache.http.StatusLine; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; -import org.apache.logging.log4j.ConsoleAppender; +import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.PatternLayout; +import org.apache.logging.log4j.core.layout.PatternLayout; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/traffic_router/neustar/src/test/java/data/TarExtractorTest.java b/traffic_router/neustar/src/test/java/data/TarExtractorTest.java index abf3f05974..ead3b6b793 100644 --- a/traffic_router/neustar/src/test/java/data/TarExtractorTest.java +++ b/traffic_router/neustar/src/test/java/data/TarExtractorTest.java @@ -18,9 +18,9 @@ import org.apache.traffic_control.traffic_router.neustar.data.TarExtractor; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; -import org.apache.logging.log4j.ConsoleAppender; +import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.PatternLayout; +import org.apache.logging.log4j.core.layout.PatternLayout; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; From 8ce7b68aa77e5ea8cde3c9b26661056ca0d02dd0 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Fri, 10 Dec 2021 10:16:19 -0700 Subject: [PATCH 17/32] updated log4j version to 2.15.0 --- CHANGELOG.md | 2 +- traffic_router/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 050560d6bd..e745d15b90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,7 +38,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - [#6367](https://github.com/apache/trafficcontrol/issues/6367) - Fix PUT `user/current` to work with v4 User Roles and Permissions ### Changed -- Updated `log4j` module in Traffic Router from version 1.2.17 to 2.14.1 +- Updated `log4j` module in Traffic Router from version 1.2.17 to 2.15.0 - Updated `t3c` to request less unnecessary deliveryservice-server assignment and invalidation jobs data via new query params supported by Traffic Ops - [#6179](https://github.com/apache/trafficcontrol/issues/6179) Updated the Traffic Ops rpm to include the `ToDnssecRefresh` binary and make the `trafops_dnssec_refresh` cron job use it - Changed the DNSSEC refresh Traffic Ops API to only create a new change log entry if any keys were actually refreshed or an error occurred (in order to reduce changelog noise) diff --git a/traffic_router/pom.xml b/traffic_router/pom.xml index 18317d704c..548b79eee0 100644 --- a/traffic_router/pom.xml +++ b/traffic_router/pom.xml @@ -33,7 +33,7 @@ /opt/traffic_router 5.2.9.RELEASE - 2.14.1 + 2.15.0 4.12 1.3 2.1.0 From 9568654acb843638e1d6b5505a067b79550522f8 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Fri, 10 Dec 2021 10:58:15 -0700 Subject: [PATCH 18/32] Added slf4j-simple dependency. --- traffic_router/shared/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/traffic_router/shared/pom.xml b/traffic_router/shared/pom.xml index 45bc095daf..c2794947d8 100644 --- a/traffic_router/shared/pom.xml +++ b/traffic_router/shared/pom.xml @@ -111,6 +111,11 @@ under the License. bcprov-jdk15on 1.68 + + org.slf4j + slf4j-simple + 1.7.32 + From c97b6ad0267f8387181713fcf453bceb9a1b5a90 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Fri, 10 Dec 2021 12:58:47 -0700 Subject: [PATCH 19/32] removed file:// to log INFO level messages. --- infrastructure/cdn-in-a-box/traffic_router/run.sh | 2 +- traffic_router/core/src/main/conf/startup.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure/cdn-in-a-box/traffic_router/run.sh b/infrastructure/cdn-in-a-box/traffic_router/run.sh index 0bbe62a5c8..ba0b998f96 100755 --- a/infrastructure/cdn-in-a-box/traffic_router/run.sh +++ b/infrastructure/cdn-in-a-box/traffic_router/run.sh @@ -42,7 +42,7 @@ CATALINA_PID="$CATALINA_BASE/temp/tomcat.pid" CATALINA_OPTS="\ -server -Xms2g -Xmx8g \ -Djava.library.path=/usr/lib64:$CATALINA_BASE/lib:$CATALINA_HOME/lib \ - -Dlog4j.configuration=file://$CATALINA_BASE/conf/log4j.properties \ + -Dlog4j.configuration=$CATALINA_BASE/conf/log4j.properties \ -Dorg.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER=false \ -XX:+UseG1GC \ -XX:+UnlockExperimentalVMOptions \ diff --git a/traffic_router/core/src/main/conf/startup.properties b/traffic_router/core/src/main/conf/startup.properties index c6b2f65007..31f70a586c 100644 --- a/traffic_router/core/src/main/conf/startup.properties +++ b/traffic_router/core/src/main/conf/startup.properties @@ -19,7 +19,7 @@ # router is installed. CATALINA_OPTS="\ -server -Xms2g -Xmx8g \ - -Dlog4j.configuration=file://$CATALINA_BASE/conf/log4j.properties \ + -Dlog4j.configuration=$CATALINA_BASE/conf/log4j.properties \ -Djava.library.path=/usr/lib64 \ -Dorg.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER=false \ -XX:+UseG1GC \ From 645e8ed72116c6cd8c7cb217ab9c1b6333bb03ee Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Fri, 10 Dec 2021 13:45:04 -0700 Subject: [PATCH 20/32] removed file:// to log INFO level messages-1 --- docs/source/admin/traffic_router.rst | 2 +- infrastructure/ansible/roles/traffic-router/README.md | 2 +- infrastructure/ansible/roles/traffic-router/defaults/main.yml | 2 +- infrastructure/docker/traffic_router/starttr.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/admin/traffic_router.rst b/docs/source/admin/traffic_router.rst index 67315a9409..da4eeae222 100644 --- a/docs/source/admin/traffic_router.rst +++ b/docs/source/admin/traffic_router.rst @@ -944,7 +944,7 @@ The following is an example of the command line parameters set in :file:`/opt/tr CATALINA_OPTS="\ -server -Xms2g -Xmx8g \ - -Dlog4j.configuration=file://$CATALINA_BASE/conf/log4j.properties \ + -Dlog4j.configuration=$CATALINA_BASE/conf/log4j.properties \ -Djava.library.path=/usr/lib64 \ -XX:+UseG1GC \ -XX:+UnlockExperimentalVMOptions \ diff --git a/infrastructure/ansible/roles/traffic-router/README.md b/infrastructure/ansible/roles/traffic-router/README.md index 0076ba8cec..7fa990399f 100644 --- a/infrastructure/ansible/roles/traffic-router/README.md +++ b/infrastructure/ansible/roles/traffic-router/README.md @@ -53,7 +53,7 @@ Example Playbook - "-server" - "-Xms2g" - "-Xmx{{ [(ansible_memtotal_mb * (tr_java_heap_max_percent/100))|int, tr_java_heap_max_mb]|min }}m" - - "-Dlog4j.configuration=file://$CATALINA_BASE/conf/log4j.properties" + - "-Dlog4j.configuration=$CATALINA_BASE/conf/log4j.properties" - "-Djava.library.path=/usr/lib64" - "-Dorg.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER=false" - "-XX:+UseG1GC" diff --git a/infrastructure/ansible/roles/traffic-router/defaults/main.yml b/infrastructure/ansible/roles/traffic-router/defaults/main.yml index da2a278463..8604325ca1 100644 --- a/infrastructure/ansible/roles/traffic-router/defaults/main.yml +++ b/infrastructure/ansible/roles/traffic-router/defaults/main.yml @@ -55,7 +55,7 @@ tr_catalina_opts: - "-server" - "-Xms2g" - "-Xmx{{ [(ansible_memtotal_mb * (tr_java_heap_max_percent/100))|int, tr_java_heap_max_mb]|min }}m" - - "-Dlog4j.configuration=file://$CATALINA_BASE/conf/log4j.properties" + - "-Dlog4j.configuration=$CATALINA_BASE/conf/log4j.properties" - "-Djava.library.path=/usr/lib64" - "-Dorg.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER=false" - "-XX:+UseG1GC" diff --git a/infrastructure/docker/traffic_router/starttr.sh b/infrastructure/docker/traffic_router/starttr.sh index 5b003e3303..55a2c1642b 100755 --- a/infrastructure/docker/traffic_router/starttr.sh +++ b/infrastructure/docker/traffic_router/starttr.sh @@ -30,7 +30,7 @@ export CATALINA_BASE=/opt/traffic_router export CATALINA_OUT=/opt/tomcat/logs/catalina.log export CATALINA_OPTS="\ -server -Xms512m -Xmx1g \ - -Dlog4j.configuration=file://$CATALINA_BASE/conf/log4j.properties \ + -Dlog4j.configuration=$CATALINA_BASE/conf/log4j.properties \ -Djava.library.path=/usr/lib64 \ -Dorg.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER=false \ -XX:+UseG1GC \ From 0878810873716b8f4c1611f619302d3e409d2a11 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Tue, 14 Dec 2021 08:47:33 -0700 Subject: [PATCH 21/32] Migrated log4j properties to log4j2.xml --- docs/source/admin/traffic_router.rst | 10 ++-- docs/source/development/traffic_router.rst | 2 +- .../ansible/roles/traffic-router/README.md | 2 +- .../roles/traffic-router/defaults/main.yml | 2 +- .../traffic-router/tasks/traffic_router.yml | 2 +- .../cdn-in-a-box/traffic_router/run.sh | 2 +- .../docker/traffic_router/starttr.sh | 2 +- .../core/src/main/conf/log4j.properties | 44 ----------------- traffic_router/core/src/main/conf/log4j2.xml | 43 +++++++++++++++++ .../core/src/main/conf/startup.properties | 2 +- .../core/src/test/conf/log4j.properties | 47 ------------------- traffic_router/core/src/test/conf/log4j2.xml | 46 ++++++++++++++++++ 12 files changed, 101 insertions(+), 103 deletions(-) delete mode 100644 traffic_router/core/src/main/conf/log4j.properties create mode 100644 traffic_router/core/src/main/conf/log4j2.xml delete mode 100644 traffic_router/core/src/test/conf/log4j.properties create mode 100644 traffic_router/core/src/test/conf/log4j2.xml diff --git a/docs/source/admin/traffic_router.rst b/docs/source/admin/traffic_router.rst index da4eeae222..c9ca86e629 100644 --- a/docs/source/admin/traffic_router.rst +++ b/docs/source/admin/traffic_router.rst @@ -164,7 +164,7 @@ For the most part, the configuration files and :term:`Parameters` used by Traffi | | | when the ``traffic_router`` service is started. It primarily consists of command | | | | | line settings for the Java process | | +----------------------------+-------------------------------------------+----------------------------------------------------------------------------------+----------------------------------------------------+ - | log4j.properties | various parameters | Configuration of ``log4j`` is documented on | N/A | + | log4j2.xml | various parameters | Configuration of ``log4j`` is documented on | N/A | | | | `their site `_; adjust as needed | | +----------------------------+-------------------------------------------+----------------------------------------------------------------------------------+----------------------------------------------------+ | server.xml | various parameters | Traffic Router specific configuration for Apache Tomcat. See the Apache Tomcat | N/A | @@ -189,11 +189,11 @@ Much of a Traffic Router's configuration can be obtained through the :term:`Para +=========================================+==============================+=======================================================================================================================================+ | location | dns.zone | Location to store the DNS zone files in the local file system of Traffic Router. | +-----------------------------------------+------------------------------+---------------------------------------------------------------------------------------------------------------------------------------+ - | location | http-log4j.properties | Location to find the log4j.properties file for Traffic Router. | + | location | http-log4j2.xml | Location to find the log4j2.xml file for Traffic Router. | +-----------------------------------------+------------------------------+---------------------------------------------------------------------------------------------------------------------------------------+ - | location | dns-log4j.properties | Location to find the dns-log4j.properties file for Traffic Router. | + | location | dns-log4j2.xml | Location to find the dns-log4j2.xml file for Traffic Router. | +-----------------------------------------+------------------------------+---------------------------------------------------------------------------------------------------------------------------------------+ - | location | geolocation.properties | Location to find the log4j.properties file for Traffic Router. | + | location | geolocation.properties | Location to find the log4j2.xml file for Traffic Router. | +-----------------------------------------+------------------------------+---------------------------------------------------------------------------------------------------------------------------------------+ | CDN_name | rascal-config.txt | The human readable name of the CDN for this :term:`Profile`. | +-----------------------------------------+------------------------------+---------------------------------------------------------------------------------------------------------------------------------------+ @@ -944,7 +944,7 @@ The following is an example of the command line parameters set in :file:`/opt/tr CATALINA_OPTS="\ -server -Xms2g -Xmx8g \ - -Dlog4j.configuration=$CATALINA_BASE/conf/log4j.properties \ + -Dlog4j.configurationFile=$CATALINA_BASE/conf/log4j2.xml \ -Djava.library.path=/usr/lib64 \ -XX:+UseG1GC \ -XX:+UnlockExperimentalVMOptions \ diff --git a/docs/source/development/traffic_router.rst b/docs/source/development/traffic_router.rst index e12433cbf4..a4aa9e1be6 100644 --- a/docs/source/development/traffic_router.rst +++ b/docs/source/development/traffic_router.rst @@ -104,7 +104,7 @@ To install the Traffic Router Developer environment: * copy :file:`core/src/main/conf/dns.properties` to :file:`core/src/test/conf/` * copy :file:`core/src/main/conf/http.properties` to :file:`core/src/test/conf/` - * copy :file:`core/src/main/conf/log4j.properties` to :file:`core/src/test/conf/` + * copy :file:`core/src/main/conf/log4j2.xml` to :file:`core/src/test/conf/` * copy :file:`core/src/main/conf/traffic_monitor.properties` to :file:`core/src/test/conf/` and then edit the ``traffic_monitor.bootstrap.hosts`` property * copy :file:`core/src/main/conf/traffic_ops.properties` to :file:`core/src/test/conf/` and then edit the credentials as appropriate for the Traffic Ops instance you will be using. * Default configuration values now reside in :file:`core/src/main/webapp/WEB-INF/applicationContext.xml` diff --git a/infrastructure/ansible/roles/traffic-router/README.md b/infrastructure/ansible/roles/traffic-router/README.md index 7fa990399f..299a10be73 100644 --- a/infrastructure/ansible/roles/traffic-router/README.md +++ b/infrastructure/ansible/roles/traffic-router/README.md @@ -53,7 +53,7 @@ Example Playbook - "-server" - "-Xms2g" - "-Xmx{{ [(ansible_memtotal_mb * (tr_java_heap_max_percent/100))|int, tr_java_heap_max_mb]|min }}m" - - "-Dlog4j.configuration=$CATALINA_BASE/conf/log4j.properties" + - "-Dlog4j.configurationFile=$CATALINA_BASE/conf/log4j2.xml" - "-Djava.library.path=/usr/lib64" - "-Dorg.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER=false" - "-XX:+UseG1GC" diff --git a/infrastructure/ansible/roles/traffic-router/defaults/main.yml b/infrastructure/ansible/roles/traffic-router/defaults/main.yml index 8604325ca1..793ff84e6e 100644 --- a/infrastructure/ansible/roles/traffic-router/defaults/main.yml +++ b/infrastructure/ansible/roles/traffic-router/defaults/main.yml @@ -55,7 +55,7 @@ tr_catalina_opts: - "-server" - "-Xms2g" - "-Xmx{{ [(ansible_memtotal_mb * (tr_java_heap_max_percent/100))|int, tr_java_heap_max_mb]|min }}m" - - "-Dlog4j.configuration=$CATALINA_BASE/conf/log4j.properties" + - "-Dlog4j.configurationFile=$CATALINA_BASE/conf/log4j2.xml" - "-Djava.library.path=/usr/lib64" - "-Dorg.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER=false" - "-XX:+UseG1GC" diff --git a/infrastructure/ansible/roles/traffic-router/tasks/traffic_router.yml b/infrastructure/ansible/roles/traffic-router/tasks/traffic_router.yml index b896d79b83..aba090413b 100644 --- a/infrastructure/ansible/roles/traffic-router/tasks/traffic_router.yml +++ b/infrastructure/ansible/roles/traffic-router/tasks/traffic_router.yml @@ -66,7 +66,7 @@ with_items: - cache.properties - dns.properties - - log4j.properties + - log4j2.xml - logging.properties - startup.properties - traffic_monitor.properties diff --git a/infrastructure/cdn-in-a-box/traffic_router/run.sh b/infrastructure/cdn-in-a-box/traffic_router/run.sh index ba0b998f96..990b0265a5 100755 --- a/infrastructure/cdn-in-a-box/traffic_router/run.sh +++ b/infrastructure/cdn-in-a-box/traffic_router/run.sh @@ -42,7 +42,7 @@ CATALINA_PID="$CATALINA_BASE/temp/tomcat.pid" CATALINA_OPTS="\ -server -Xms2g -Xmx8g \ -Djava.library.path=/usr/lib64:$CATALINA_BASE/lib:$CATALINA_HOME/lib \ - -Dlog4j.configuration=$CATALINA_BASE/conf/log4j.properties \ + -Dlog4j.configurationFile=$CATALINA_BASE/conf/log4j2.xml \ -Dorg.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER=false \ -XX:+UseG1GC \ -XX:+UnlockExperimentalVMOptions \ diff --git a/infrastructure/docker/traffic_router/starttr.sh b/infrastructure/docker/traffic_router/starttr.sh index 55a2c1642b..eae4f9befc 100755 --- a/infrastructure/docker/traffic_router/starttr.sh +++ b/infrastructure/docker/traffic_router/starttr.sh @@ -30,7 +30,7 @@ export CATALINA_BASE=/opt/traffic_router export CATALINA_OUT=/opt/tomcat/logs/catalina.log export CATALINA_OPTS="\ -server -Xms512m -Xmx1g \ - -Dlog4j.configuration=$CATALINA_BASE/conf/log4j.properties \ + -Dlog4j.configurationFile=$CATALINA_BASE/conf/log4j2.xml \ -Djava.library.path=/usr/lib64 \ -Dorg.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER=false \ -XX:+UseG1GC \ diff --git a/traffic_router/core/src/main/conf/log4j.properties b/traffic_router/core/src/main/conf/log4j.properties deleted file mode 100644 index f9fdef3b01..0000000000 --- a/traffic_router/core/src/main/conf/log4j.properties +++ /dev/null @@ -1,44 +0,0 @@ -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# ACCESS is set to be a Syslog Appender -log4j.appender.ACCESS=org.apache.logging.log4j.core.appender.RollingFileAppender -log4j.appender.ACCESS.File=/opt/traffic_router/var/log/access.log -log4j.appender.ACCESS.MaxFileSize=200MB -log4j.appender.ACCESS.MaxBackupIndex=10 - -# ACCESS uses PatternLayout. -log4j.appender.ACCESS.layout=org.apache.logging.log4j.core.layout.PatternLayout -log4j.appender.ACCESS.layout.ConversionPattern=%m%n -log4j.appender.ACCESS.threshold=INFO - -log4j.appender.A1=org.apache.logging.log4j.core.appender.RollingFileAppender -log4j.appender.A1.file=/opt/traffic_router/var/log/traffic_router.log -log4j.appender.A1.maxFileSize=100MB - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.logging.log4j.core.layout.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-5p %d{yyyy-MM-dd'T'HH:mm:ss.SSS} [%t] %c - %m%n -log4j.appender.A1.threshold=ALL - -# Set root logger level to DEBUG and its only appender to A1. -# Valid levels are: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, NONE -log4j.rootLogger=WARN, A1 - -# Set application logger levels -log4j.logger.org.apache.traffic_control.traffic_router=INFO - -log4j.logger.org.apache.traffic_control.traffic_router.core.access=INFO, ACCESS -log4j.additivity.org.apache.traffic_control.traffic_router.core.access=false diff --git a/traffic_router/core/src/main/conf/log4j2.xml b/traffic_router/core/src/main/conf/log4j2.xml new file mode 100644 index 0000000000..3284371ea5 --- /dev/null +++ b/traffic_router/core/src/main/conf/log4j2.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/traffic_router/core/src/main/conf/startup.properties b/traffic_router/core/src/main/conf/startup.properties index 31f70a586c..1cab162112 100644 --- a/traffic_router/core/src/main/conf/startup.properties +++ b/traffic_router/core/src/main/conf/startup.properties @@ -19,7 +19,7 @@ # router is installed. CATALINA_OPTS="\ -server -Xms2g -Xmx8g \ - -Dlog4j.configuration=$CATALINA_BASE/conf/log4j.properties \ + -Dlog4j.configurationFile=$CATALINA_BASE/conf/log4j2.xml \ -Djava.library.path=/usr/lib64 \ -Dorg.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER=false \ -XX:+UseG1GC \ diff --git a/traffic_router/core/src/test/conf/log4j.properties b/traffic_router/core/src/test/conf/log4j.properties deleted file mode 100644 index 9cef543255..0000000000 --- a/traffic_router/core/src/test/conf/log4j.properties +++ /dev/null @@ -1,47 +0,0 @@ -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# ACCESS is set to be a Syslog Appender -log4j.appender.ACCESS=org.apache.logging.log4j.core.appender.RollingFileAppender -log4j.appender.ACCESS.File=/opt/traffic_router/var/log/access.log -log4j.appender.ACCESS.MaxFileSize=200MB -log4j.appender.ACCESS.MaxBackupIndex=10 - -# ACCESS uses PatternLayout. -log4j.appender.ACCESS.layout=org.apache.logging.log4j.core.layout.PatternLayout -log4j.appender.ACCESS.layout.ConversionPattern=%m%n -log4j.appender.ACCESS.threshold=INFO - -# A1 is set to be a RollingFileAppender. -#log4j.appender.A1=org.apache.logging.log4j.core.appender.ConsoleAppender - -log4j.appender.A1=org.apache.logging.log4j.core.appender.RollingFileAppender -log4j.appender.A1.file=${deploy.dir}/var/log/traffic_router.log -log4j.appender.A1.maxFileSize=100MB - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.logging.log4j.core.layout.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-5p %d{yyyy-MM-dd'T'HH:mm:ss.SSS} [%t] %c - %m%n -log4j.appender.A1.threshold=ALL - -# Set root logger level to DEBUG and its only appender to A1. -# Valid levels are: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, NONE -log4j.rootLogger=WARN, A1 - -# Set application logger levels -log4j.logger.org.apache.traffic_control.traffic_router=INFO - -log4j.logger.org.apache.traffic_control.traffic_router.core.access=INFO, ACCESS -log4j.additivity.org.apache.traffic_control.traffic_router.core.access=false diff --git a/traffic_router/core/src/test/conf/log4j2.xml b/traffic_router/core/src/test/conf/log4j2.xml new file mode 100644 index 0000000000..b8453feac2 --- /dev/null +++ b/traffic_router/core/src/test/conf/log4j2.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From d834ec8508d409188dbf0c5418ef90d80ec35a1e Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Tue, 14 Dec 2021 09:30:19 -0700 Subject: [PATCH 22/32] Updated log4j to version 2.16.0 --- CHANGELOG.md | 2 +- traffic_router/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83aba1a3af..e11f70f8ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,7 +39,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - [#6367](https://github.com/apache/trafficcontrol/issues/6367) - Fix PUT `user/current` to work with v4 User Roles and Permissions ### Changed -- Updated `log4j` module in Traffic Router from version 1.2.17 to 2.15.0 +- Updated `log4j` module in Traffic Router from version 1.2.17 to 2.16.0 - Updated `t3c` to request less unnecessary deliveryservice-server assignment and invalidation jobs data via new query params supported by Traffic Ops - [#6179](https://github.com/apache/trafficcontrol/issues/6179) Updated the Traffic Ops rpm to include the `ToDnssecRefresh` binary and make the `trafops_dnssec_refresh` cron job use it - Changed the DNSSEC refresh Traffic Ops API to only create a new change log entry if any keys were actually refreshed or an error occurred (in order to reduce changelog noise) diff --git a/traffic_router/pom.xml b/traffic_router/pom.xml index 548b79eee0..d346f2cd50 100644 --- a/traffic_router/pom.xml +++ b/traffic_router/pom.xml @@ -33,7 +33,7 @@ /opt/traffic_router 5.2.9.RELEASE - 2.15.0 + 2.16.0 4.12 1.3 2.1.0 From 79ef73dc75f27a0a39af5ce6382760a1143b65cb Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Tue, 14 Dec 2021 13:37:10 -0700 Subject: [PATCH 23/32] added fileName property --- traffic_router/core/src/main/conf/log4j2.xml | 8 ++++++-- traffic_router/core/src/test/conf/log4j2.xml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/traffic_router/core/src/main/conf/log4j2.xml b/traffic_router/core/src/main/conf/log4j2.xml index 3284371ea5..2ec169fbea 100644 --- a/traffic_router/core/src/main/conf/log4j2.xml +++ b/traffic_router/core/src/main/conf/log4j2.xml @@ -18,14 +18,18 @@ - + - + diff --git a/traffic_router/core/src/test/conf/log4j2.xml b/traffic_router/core/src/test/conf/log4j2.xml index b8453feac2..2a7bb1bcc2 100644 --- a/traffic_router/core/src/test/conf/log4j2.xml +++ b/traffic_router/core/src/test/conf/log4j2.xml @@ -18,7 +18,9 @@ - + @@ -26,7 +28,9 @@ - + From f1dcd82eac045ed1f6a308f99c411da979e877ba Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Tue, 14 Dec 2021 15:51:19 -0700 Subject: [PATCH 24/32] Updated date format based on review comments. --- traffic_router/core/src/main/conf/log4j2.xml | 8 ++++---- traffic_router/core/src/test/conf/log4j2.xml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/traffic_router/core/src/main/conf/log4j2.xml b/traffic_router/core/src/main/conf/log4j2.xml index 2ec169fbea..b7cb3228cb 100644 --- a/traffic_router/core/src/main/conf/log4j2.xml +++ b/traffic_router/core/src/main/conf/log4j2.xml @@ -19,8 +19,8 @@ + fileName="${deploy.dir}/var/log/access.log" + filePattern="${deploy.dir}/var/log/access-%d{yyyy-MM-dd}.log" > @@ -28,8 +28,8 @@ + fileName="${deploy.dir}/var/log/traffic_router.log" + filePattern="${deploy.dir}/var/log/traffic_router-%d{yyyy-MM-dd}.log" > diff --git a/traffic_router/core/src/test/conf/log4j2.xml b/traffic_router/core/src/test/conf/log4j2.xml index 2a7bb1bcc2..393d098666 100644 --- a/traffic_router/core/src/test/conf/log4j2.xml +++ b/traffic_router/core/src/test/conf/log4j2.xml @@ -19,8 +19,8 @@ + fileName="${deploy.dir}/var/log/access.log" + filePattern="${deploy.dir}/var/log/access-%d{yyyy-MM-dd}.log" > @@ -30,7 +30,7 @@ + filePattern="${deploy.dir}/var/log/traffic_router-%d{yyyy-MM-dd}.log" > From 38276ff4f3bc0ee2e8bf596d6e917b1e01ab8e6c Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Tue, 14 Dec 2021 16:00:07 -0700 Subject: [PATCH 25/32] Added new line for xml files. --- traffic_router/core/src/main/conf/log4j2.xml | 2 +- traffic_router/core/src/test/conf/log4j2.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/traffic_router/core/src/main/conf/log4j2.xml b/traffic_router/core/src/main/conf/log4j2.xml index b7cb3228cb..64ca24e56a 100644 --- a/traffic_router/core/src/main/conf/log4j2.xml +++ b/traffic_router/core/src/main/conf/log4j2.xml @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/traffic_router/core/src/test/conf/log4j2.xml b/traffic_router/core/src/test/conf/log4j2.xml index 393d098666..eba608bba8 100644 --- a/traffic_router/core/src/test/conf/log4j2.xml +++ b/traffic_router/core/src/test/conf/log4j2.xml @@ -25,7 +25,7 @@ - + d - \ No newline at end of file + From 4ccf6857d4eaa79adca2690a270e3917174317bc Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Tue, 14 Dec 2021 16:06:30 -0700 Subject: [PATCH 26/32] Added AppenderRef for traffic_router.log, access.log and console. --- traffic_router/core/src/main/conf/log4j2.xml | 9 +++++---- traffic_router/core/src/test/conf/log4j2.xml | 13 +++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/traffic_router/core/src/main/conf/log4j2.xml b/traffic_router/core/src/main/conf/log4j2.xml index 64ca24e56a..26c139ee55 100644 --- a/traffic_router/core/src/main/conf/log4j2.xml +++ b/traffic_router/core/src/main/conf/log4j2.xml @@ -25,7 +25,7 @@ - + + - + - - + + diff --git a/traffic_router/core/src/test/conf/log4j2.xml b/traffic_router/core/src/test/conf/log4j2.xml index eba608bba8..3b339862f7 100644 --- a/traffic_router/core/src/test/conf/log4j2.xml +++ b/traffic_router/core/src/test/conf/log4j2.xml @@ -25,8 +25,8 @@ - d - + d + - + + - + - - + + From 5bf4de412f6d773d3caff2d3bf2df679d448173a Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Wed, 15 Dec 2021 09:44:46 -0700 Subject: [PATCH 27/32] Removed typo character and fixed xml tags. --- traffic_router/core/src/main/conf/log4j2.xml | 3 ++- traffic_router/core/src/test/conf/log4j2.xml | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/traffic_router/core/src/main/conf/log4j2.xml b/traffic_router/core/src/main/conf/log4j2.xml index 26c139ee55..e233a23a57 100644 --- a/traffic_router/core/src/main/conf/log4j2.xml +++ b/traffic_router/core/src/main/conf/log4j2.xml @@ -36,8 +36,9 @@ - + + diff --git a/traffic_router/core/src/test/conf/log4j2.xml b/traffic_router/core/src/test/conf/log4j2.xml index 3b339862f7..e187dc9fea 100644 --- a/traffic_router/core/src/test/conf/log4j2.xml +++ b/traffic_router/core/src/test/conf/log4j2.xml @@ -25,7 +25,7 @@ - d + - + + From 6eb11237d23c723c3fcc68f43aec321cb0b22fba Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Wed, 15 Dec 2021 12:24:53 -0700 Subject: [PATCH 28/32] Updated log4j in ansible. --- .../roles/traffic-router/defaults/main.yml | 66 ++++++++++--------- .../{log4j.properties.j2 => log4j.xml.j2} | 4 +- 2 files changed, 37 insertions(+), 33 deletions(-) rename infrastructure/ansible/roles/traffic-router/templates/conf/{log4j.properties.j2 => log4j.xml.j2} (91%) diff --git a/infrastructure/ansible/roles/traffic-router/defaults/main.yml b/infrastructure/ansible/roles/traffic-router/defaults/main.yml index 793ff84e6e..02343433b5 100644 --- a/infrastructure/ansible/roles/traffic-router/defaults/main.yml +++ b/infrastructure/ansible/roles/traffic-router/defaults/main.yml @@ -126,36 +126,42 @@ tr_cache_health_json_refresh_period: 1000 tr_cache_config_json: "{{tr_db_dir}}/cr-config.json" tr_cache_config_json_refresh_period: 60000 -# log4j.properties -tr_log4j_opts: - - "# ACCESS is set to be a Syslog Appender" - - log4j.appender.ACCESS=org.apache.logging.log4j.core.appender.RollingFileAppender - - "log4j.appender.ACCESS.File={{tr_log_dir}}/access.log" - - log4j.appender.ACCESS.MaxFileSize=200MB - - log4j.appender.ACCESS.MaxBackupIndex=10 - - - - "# ACCESS uses PatternLayout." - - log4j.appender.ACCESS.layout=org.apache.logging.log4j.core.layout.PatternLayout - - log4j.appender.ACCESS.layout.ConversionPattern=%m%n - - log4j.appender.ACCESS.threshold=INFO - - - - log4j.appender.A1=org.apache.logging.log4j.core.appender.RollingFileAppender - - "log4j.appender.A1.file={{tr_log_dir}}/traffic_router.log" - - log4j.appender.A1.maxFileSize=100MB - - - - "# A1 uses PatternLayout." - - log4j.appender.A1.layout=org.apache.logging.log4j.core.layout.PatternLayout - - log4j.appender.A1.layout.ConversionPattern=%-5p %d{yyyy-MM-dd'T'HH:mm:ss.SSS} [%t] %c - %m%n - - log4j.appender.A1.threshold=ALL - - - - "# Set root logger level to DEBUG and its only appender to A1." - - "# Valid levels are: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, NONE" - - log4j.rootLogger=WARN, A1 - - - - "# Set application logger levels" - - log4j.logger.org.apache.traffic_control.traffic_router=INFO - - log4j.logger.org.apache.traffic_control.traffic_router.core.access=INFO, ACCESS - - log4j.additivity.org.apache.traffic_control.traffic_router.core.access=false +# log4j2.xml +tr_log4j2_opts: | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + # logging.properties tr_logging_opts: diff --git a/infrastructure/ansible/roles/traffic-router/templates/conf/log4j.properties.j2 b/infrastructure/ansible/roles/traffic-router/templates/conf/log4j.xml.j2 similarity index 91% rename from infrastructure/ansible/roles/traffic-router/templates/conf/log4j.properties.j2 rename to infrastructure/ansible/roles/traffic-router/templates/conf/log4j.xml.j2 index d74a164403..104e38685a 100644 --- a/infrastructure/ansible/roles/traffic-router/templates/conf/log4j.properties.j2 +++ b/infrastructure/ansible/roles/traffic-router/templates/conf/log4j.xml.j2 @@ -13,6 +13,4 @@ #} # file deployed via ansible push, local edits are subject to be overwritten -{% for line in tr_log4j_opts %} -{{ line }} -{% endfor %} +{{ tr_log4j2_opts }} From a14f1e653da064f4e2e38ac54d81b09fcb04cd2f Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Wed, 15 Dec 2021 13:47:41 -0700 Subject: [PATCH 29/32] Updated based on review comments. --- .../templates/conf/{log4j.xml.j2 => log4j2.xml.j2} | 0 traffic_router/core/src/main/conf/log4j2.xml | 1 + 2 files changed, 1 insertion(+) rename infrastructure/ansible/roles/traffic-router/templates/conf/{log4j.xml.j2 => log4j2.xml.j2} (100%) diff --git a/infrastructure/ansible/roles/traffic-router/templates/conf/log4j.xml.j2 b/infrastructure/ansible/roles/traffic-router/templates/conf/log4j2.xml.j2 similarity index 100% rename from infrastructure/ansible/roles/traffic-router/templates/conf/log4j.xml.j2 rename to infrastructure/ansible/roles/traffic-router/templates/conf/log4j2.xml.j2 diff --git a/traffic_router/core/src/main/conf/log4j2.xml b/traffic_router/core/src/main/conf/log4j2.xml index e233a23a57..f4561b4c70 100644 --- a/traffic_router/core/src/main/conf/log4j2.xml +++ b/traffic_router/core/src/main/conf/log4j2.xml @@ -30,6 +30,7 @@ + From 9a1ab1c99601136810e85533ebc286d9779e3976 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Thu, 16 Dec 2021 10:31:35 -0700 Subject: [PATCH 30/32] Added threshold level to main.yml and log4j2.xml --- infrastructure/ansible/roles/traffic-router/defaults/main.yml | 2 ++ traffic_router/core/src/main/conf/log4j2.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/infrastructure/ansible/roles/traffic-router/defaults/main.yml b/infrastructure/ansible/roles/traffic-router/defaults/main.yml index 02343433b5..b6c7394349 100644 --- a/infrastructure/ansible/roles/traffic-router/defaults/main.yml +++ b/infrastructure/ansible/roles/traffic-router/defaults/main.yml @@ -141,6 +141,7 @@ tr_log4j2_opts: | + + diff --git a/traffic_router/core/src/main/conf/log4j2.xml b/traffic_router/core/src/main/conf/log4j2.xml index f4561b4c70..e187dc9fea 100644 --- a/traffic_router/core/src/main/conf/log4j2.xml +++ b/traffic_router/core/src/main/conf/log4j2.xml @@ -26,6 +26,7 @@ + + From 53661364597c99e6b9b9c0f807277be81adbd64f Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Thu, 16 Dec 2021 11:16:16 -0700 Subject: [PATCH 31/32] Added PatternLayout level to main.yml --- infrastructure/ansible/roles/traffic-router/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/infrastructure/ansible/roles/traffic-router/defaults/main.yml b/infrastructure/ansible/roles/traffic-router/defaults/main.yml index b6c7394349..921faa448d 100644 --- a/infrastructure/ansible/roles/traffic-router/defaults/main.yml +++ b/infrastructure/ansible/roles/traffic-router/defaults/main.yml @@ -146,6 +146,7 @@ tr_log4j2_opts: | + From ae390b16d58232457d71d7b6c5a7c0fcc1fef4a4 Mon Sep 17 00:00:00 2001 From: Rima Shah Date: Thu, 16 Dec 2021 11:28:02 -0700 Subject: [PATCH 32/32] Added additivity="false" to avoid printing logs twice --- infrastructure/ansible/roles/traffic-router/defaults/main.yml | 4 ++-- traffic_router/core/src/main/conf/log4j2.xml | 4 ++-- traffic_router/core/src/test/conf/log4j2.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/infrastructure/ansible/roles/traffic-router/defaults/main.yml b/infrastructure/ansible/roles/traffic-router/defaults/main.yml index 921faa448d..2ef0434f14 100644 --- a/infrastructure/ansible/roles/traffic-router/defaults/main.yml +++ b/infrastructure/ansible/roles/traffic-router/defaults/main.yml @@ -154,10 +154,10 @@ tr_log4j2_opts: | - + - + diff --git a/traffic_router/core/src/main/conf/log4j2.xml b/traffic_router/core/src/main/conf/log4j2.xml index e187dc9fea..33bdde4a65 100644 --- a/traffic_router/core/src/main/conf/log4j2.xml +++ b/traffic_router/core/src/main/conf/log4j2.xml @@ -39,10 +39,10 @@ - + - + diff --git a/traffic_router/core/src/test/conf/log4j2.xml b/traffic_router/core/src/test/conf/log4j2.xml index e187dc9fea..33bdde4a65 100644 --- a/traffic_router/core/src/test/conf/log4j2.xml +++ b/traffic_router/core/src/test/conf/log4j2.xml @@ -39,10 +39,10 @@ - + - +