From 9380d3cef4b41e88c08c43e91291eea34cfd4e11 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Tue, 22 Jan 2019 10:22:29 +0300
Subject: [PATCH] refactoring

---
 .../main/java/org/redisson/config/Config.java |  6 +--
 .../MultiDnsAddressResolverGroupFactory.java  | 44 -------------------
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 redisson/src/main/java/org/redisson/connection/MultiDnsAddressResolverGroupFactory.java

diff --git a/redisson/src/main/java/org/redisson/config/Config.java b/redisson/src/main/java/org/redisson/config/Config.java
index cfdc5c156..1279a6c85 100644
--- a/redisson/src/main/java/org/redisson/config/Config.java
+++ b/redisson/src/main/java/org/redisson/config/Config.java
@@ -23,12 +23,10 @@ import java.net.URL;
 import java.util.concurrent.ExecutorService;
 
 import org.redisson.client.codec.Codec;
-import org.redisson.codec.DefaultReferenceCodecProvider;
 import org.redisson.codec.FstCodec;
-import org.redisson.codec.ReferenceCodecProvider;
 import org.redisson.connection.AddressResolverGroupFactory;
 import org.redisson.connection.ConnectionManager;
-import org.redisson.connection.MultiDnsAddressResolverGroupFactory;
+import org.redisson.connection.DnsAddressResolverGroupFactory;
 import org.redisson.connection.ReplicatedConnectionManager;
 import org.redisson.misc.URIBuilder;
 
@@ -87,7 +85,7 @@ public class Config {
     /**
      * AddressResolverGroupFactory switch between default and round robin
      */
-    private AddressResolverGroupFactory addressResolverGroupFactory = new MultiDnsAddressResolverGroupFactory();
+    private AddressResolverGroupFactory addressResolverGroupFactory = new DnsAddressResolverGroupFactory();
 
     public Config() {
     }
diff --git a/redisson/src/main/java/org/redisson/connection/MultiDnsAddressResolverGroupFactory.java b/redisson/src/main/java/org/redisson/connection/MultiDnsAddressResolverGroupFactory.java
deleted file mode 100644
index 0c6f86fbf..000000000
--- a/redisson/src/main/java/org/redisson/connection/MultiDnsAddressResolverGroupFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2013-2019 Nikita Koksharov
- *
- * 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.
- */
-package org.redisson.connection;
-
-import io.netty.channel.socket.DatagramChannel;
-import io.netty.channel.socket.nio.NioDatagramChannel;
-import io.netty.resolver.ResolvedAddressTypes;
-import io.netty.resolver.dns.DnsAddressResolverGroup;
-import io.netty.resolver.dns.DnsNameResolverBuilder;
-import io.netty.resolver.dns.DnsServerAddressStreamProvider;
-import io.netty.resolver.dns.DnsServerAddressStreamProviders;
-
-/**
- * Workaround for https://github.com/netty/netty/issues/8261
- * 
- * @author Nikita Koksharov
- *
- */
-public class MultiDnsAddressResolverGroupFactory implements AddressResolverGroupFactory {
-    
-    @Override
-    public DnsAddressResolverGroup create(Class<? extends DatagramChannel> channelType,
-            DnsServerAddressStreamProvider nameServerProvider) {
-        
-        return new DnsAddressResolverGroup(new DnsNameResolverBuilder()
-                .channelType(NioDatagramChannel.class)
-                .nameServerProvider(DnsServerAddressStreamProviders.platformDefault())
-                .resolvedAddressTypes(ResolvedAddressTypes.IPV4_ONLY));
-    }
-
-}