From 442796a451f38b50f0c01ca31f9f0e1cea222004 Mon Sep 17 00:00:00 2001 From: nathan Date: Sun, 4 Mar 2018 15:16:22 +0100 Subject: [PATCH] Moved client responses to client handlers package --- src/dorkbox/network/DnsClient.java | 2 +- .../DatagramDnsResponseDecoder.java | 1 - .../dns/{ => clientHandlers}/DnsResponse.java | 24 ++++++++++--------- .../network/dns/resolver/DnsNameResolver.java | 2 +- .../dns/resolver/DnsNameResolverContext.java | 19 ++++++++++++--- .../DnsNameResolverResponseHandler.java | 2 +- .../network/dns/resolver/DnsQueryContext.java | 2 +- 7 files changed, 33 insertions(+), 19 deletions(-) rename src/dorkbox/network/dns/{ => clientHandlers}/DnsResponse.java (74%) diff --git a/src/dorkbox/network/DnsClient.java b/src/dorkbox/network/DnsClient.java index a6ff16cc..c2717d0d 100644 --- a/src/dorkbox/network/DnsClient.java +++ b/src/dorkbox/network/DnsClient.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; import dorkbox.network.connection.Shutdownable; import dorkbox.network.dns.DnsQuestion; -import dorkbox.network.dns.DnsResponse; +import dorkbox.network.dns.clientHandlers.DnsResponse; import dorkbox.network.dns.constants.DnsRecordType; import dorkbox.network.dns.constants.DnsResponseCode; import dorkbox.network.dns.constants.DnsSection; diff --git a/src/dorkbox/network/dns/clientHandlers/DatagramDnsResponseDecoder.java b/src/dorkbox/network/dns/clientHandlers/DatagramDnsResponseDecoder.java index f9fd6ff7..f6efa7b3 100644 --- a/src/dorkbox/network/dns/clientHandlers/DatagramDnsResponseDecoder.java +++ b/src/dorkbox/network/dns/clientHandlers/DatagramDnsResponseDecoder.java @@ -18,7 +18,6 @@ package dorkbox.network.dns.clientHandlers; import java.util.List; import dorkbox.network.dns.DnsInput; -import dorkbox.network.dns.DnsResponse; import dorkbox.network.dns.exceptions.WireParseException; import dorkbox.network.dns.records.Header; import io.netty.buffer.ByteBuf; diff --git a/src/dorkbox/network/dns/DnsResponse.java b/src/dorkbox/network/dns/clientHandlers/DnsResponse.java similarity index 74% rename from src/dorkbox/network/dns/DnsResponse.java rename to src/dorkbox/network/dns/clientHandlers/DnsResponse.java index f3c77b44..8f2bdd5d 100644 --- a/src/dorkbox/network/dns/DnsResponse.java +++ b/src/dorkbox/network/dns/clientHandlers/DnsResponse.java @@ -1,24 +1,26 @@ /* - * Copyright 2015 The Netty Project + * Copyright 2018 dorkbox, llc. * - * The Netty Project licenses this file to you 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: + * 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 + * 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. + * 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. */ -package dorkbox.network.dns; +package dorkbox.network.dns.clientHandlers; import java.io.IOException; import java.net.InetSocketAddress; import java.net.SocketAddress; +import dorkbox.network.dns.DnsEnvelope; +import dorkbox.network.dns.DnsInput; import io.netty.channel.AddressedEnvelope; import io.netty.util.internal.UnstableApi; diff --git a/src/dorkbox/network/dns/resolver/DnsNameResolver.java b/src/dorkbox/network/dns/resolver/DnsNameResolver.java index 03a649ca..27f93c0d 100644 --- a/src/dorkbox/network/dns/resolver/DnsNameResolver.java +++ b/src/dorkbox/network/dns/resolver/DnsNameResolver.java @@ -29,9 +29,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import dorkbox.network.dns.DnsQuestion; -import dorkbox.network.dns.DnsResponse; import dorkbox.network.dns.clientHandlers.DatagramDnsQueryEncoder; import dorkbox.network.dns.clientHandlers.DatagramDnsResponseDecoder; +import dorkbox.network.dns.clientHandlers.DnsResponse; import dorkbox.network.dns.constants.DnsRecordType; import dorkbox.network.dns.resolver.addressProvider.DefaultDnsServerAddressStreamProvider; import dorkbox.network.dns.resolver.addressProvider.DnsServerAddressStream; diff --git a/src/dorkbox/network/dns/resolver/DnsNameResolverContext.java b/src/dorkbox/network/dns/resolver/DnsNameResolverContext.java index afb527f6..7ecc9831 100644 --- a/src/dorkbox/network/dns/resolver/DnsNameResolverContext.java +++ b/src/dorkbox/network/dns/resolver/DnsNameResolverContext.java @@ -22,14 +22,27 @@ import static java.util.Collections.unmodifiableList; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.IdentityHashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; import dorkbox.network.dns.DnsQuestion; -import dorkbox.network.dns.DnsResponse; +import dorkbox.network.dns.clientHandlers.DnsResponse; import dorkbox.network.dns.constants.DnsRecordType; import dorkbox.network.dns.constants.DnsResponseCode; import dorkbox.network.dns.constants.DnsSection; -import dorkbox.network.dns.records.*; +import dorkbox.network.dns.records.AAAARecord; +import dorkbox.network.dns.records.ARecord; +import dorkbox.network.dns.records.CNAMERecord; +import dorkbox.network.dns.records.DnsMessage; +import dorkbox.network.dns.records.DnsRecord; +import dorkbox.network.dns.records.NSRecord; import dorkbox.network.dns.resolver.addressProvider.DnsServerAddressStream; import dorkbox.network.dns.resolver.addressProvider.DnsServerAddresses; import dorkbox.network.dns.resolver.cache.DnsCache; diff --git a/src/dorkbox/network/dns/resolver/DnsNameResolverResponseHandler.java b/src/dorkbox/network/dns/resolver/DnsNameResolverResponseHandler.java index 9114ca8d..0051ff1e 100644 --- a/src/dorkbox/network/dns/resolver/DnsNameResolverResponseHandler.java +++ b/src/dorkbox/network/dns/resolver/DnsNameResolverResponseHandler.java @@ -15,7 +15,7 @@ */ package dorkbox.network.dns.resolver; -import dorkbox.network.dns.DnsResponse; +import dorkbox.network.dns.clientHandlers.DnsResponse; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; diff --git a/src/dorkbox/network/dns/resolver/DnsQueryContext.java b/src/dorkbox/network/dns/resolver/DnsQueryContext.java index 8a52cc08..eee0525f 100644 --- a/src/dorkbox/network/dns/resolver/DnsQueryContext.java +++ b/src/dorkbox/network/dns/resolver/DnsQueryContext.java @@ -21,7 +21,7 @@ import java.net.InetSocketAddress; import java.util.concurrent.TimeUnit; import dorkbox.network.dns.DnsQuestion; -import dorkbox.network.dns.DnsResponse; +import dorkbox.network.dns.clientHandlers.DnsResponse; import dorkbox.network.dns.constants.DnsSection; import dorkbox.network.dns.records.DnsRecord; import io.netty.channel.Channel;