Created UnknownHostException unchecked wrapper

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/CausalClusteringSettings.java

@@ -128,7 +128,7 @@ public enum DiscoveryType
         LIST
     }
 
-    @Description( "Configure the discovery type" )
+    @Description( "Configure the discovery type used for cluster name resolution" )
     public static final Setting<DiscoveryType> discovery_type =
             setting( "causal_clustering.discovery_type", options( DiscoveryType.class ), DiscoveryType.LIST.name() );
 

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/ClusteringModule.java

@@ -27,7 +27,7 @@
 import org.neo4j.causalclustering.core.state.storage.SimpleStorage;
 import org.neo4j.causalclustering.discovery.CoreTopologyService;
 import org.neo4j.causalclustering.discovery.DiscoveryServiceFactory;
-import org.neo4j.causalclustering.discovery.ResolutionResolver;
+import org.neo4j.causalclustering.discovery.HostnameResolver;
 import org.neo4j.causalclustering.identity.ClusterBinder;
 import org.neo4j.causalclustering.identity.ClusterId;
 import org.neo4j.causalclustering.identity.MemberId;
@@ -58,11 +58,11 @@ public ClusteringModule( DiscoveryServiceFactory discoveryServiceFactory, Member
         LogProvider userLogProvider = platformModule.logging.getUserLogProvider();
         Dependencies dependencies = platformModule.dependencies;
         FileSystemAbstraction fileSystem = platformModule.fileSystem;
-        ResolutionResolver resolutionResolver = chooseResolver( config, logProvider, userLogProvider );
+        HostnameResolver hostnameResolver = chooseResolver( config, logProvider, userLogProvider );
 
         topologyService = discoveryServiceFactory
                 .coreTopologyService( config, sslPolicy, myself, platformModule.jobScheduler, logProvider,
-                        userLogProvider, resolutionResolver );
+                        userLogProvider, hostnameResolver );
 
         life.add( topologyService );
 

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DiscoveryServiceFactory.java

@@ -29,8 +29,8 @@ public interface DiscoveryServiceFactory
 {
     CoreTopologyService coreTopologyService( Config config, SslPolicy sslPolicy, MemberId myself,
             JobScheduler jobScheduler, LogProvider logProvider, LogProvider userLogProvider,
-            ResolutionResolver resolutionResolver );
+            HostnameResolver hostnameResolver );
 
     TopologyService topologyService( Config config, SslPolicy sslPolicy, LogProvider logProvider,
-            JobScheduler jobScheduler, MemberId myself, ResolutionResolver resolutionResolver );
+            JobScheduler jobScheduler, MemberId myself, HostnameResolver hostnameResolver );
 }

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DnsResolutionResolver.java → enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DnsHostnameResolver.java

@@ -20,7 +20,6 @@
 package org.neo4j.causalclustering.discovery;
 
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
@@ -31,13 +30,13 @@
 
 import static java.lang.String.format;
 
-public class DnsResolutionResolver implements ResolutionResolver
+public class DnsHostnameResolver implements HostnameResolver
 {
     private final Log userLog;
     private final Log log;
     private final DomainNameResolver domainNameResolver;
 
-    public DnsResolutionResolver( LogProvider logProvider, LogProvider userLogProvider,
+    public DnsHostnameResolver( LogProvider logProvider, LogProvider userLogProvider,
             DomainNameResolver domainNameResolver )
     {
         log = logProvider.getLog( getClass() );
@@ -49,24 +48,22 @@ public DnsResolutionResolver( LogProvider logProvider, LogProvider userLogProvid
     public Collection<AdvertisedSocketAddress> resolve( AdvertisedSocketAddress initialAddress )
     {
         Set<AdvertisedSocketAddress> addresses = new HashSet<>();
+        InetAddress[] ipAddresses = new InetAddress[0];
         try
         {
-            InetAddress[] ipAddresses = domainNameResolver.resolveDomainName( initialAddress.getHostname() );
-
-            for ( InetAddress ipAddress : ipAddresses )
-            {
-                addresses.add( new AdvertisedSocketAddress( ipAddress.getHostAddress(), initialAddress.getPort() ) );
-            }
-
-            userLog.info( "Resolved initial host '%s' to %s", initialAddress, addresses );
-            return addresses;
+            ipAddresses = domainNameResolver.resolveDomainName( initialAddress.getHostname() );
         }
         catch ( UnknownHostException e )
         {
-            log.error( format( "Failed to resolve host `%s` to IPs due to error: %s", initialAddress, e.getMessage() ), e );
+            log.error( format("Failed to resolve host '%s'", initialAddress.getHostname()), e);
+        }
 
-            addresses.add( initialAddress );
-            return addresses;
+        for ( InetAddress ipAddress : ipAddresses )
+        {
+            addresses.add( new AdvertisedSocketAddress( ipAddress.getHostAddress(), initialAddress.getPort() ) );
         }
+
+        userLog.info( "Resolved initial host '%s' to %s", initialAddress, addresses );
+        return addresses;
     }
 }

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DomainNameResolver.java

@@ -20,7 +20,6 @@
 package org.neo4j.causalclustering.discovery;
 
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 
 public interface DomainNameResolver
 {

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DomainNameResolverImpl.java

@@ -20,12 +20,18 @@
 package org.neo4j.causalclustering.discovery;
 
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 
 public class DomainNameResolverImpl implements DomainNameResolver
 {
     public InetAddress[] resolveDomainName(String hostname) throws UnknownHostException
     {
-        return InetAddress.getAllByName( hostname );
+        try
+        {
+            return InetAddress.getAllByName( hostname );
+        }
+        catch ( java.net.UnknownHostException e )
+        {
+            throw new UnknownHostException( e );
+        }
     }
 }

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastClientConnector.java

@@ -37,15 +37,15 @@ public class HazelcastClientConnector implements HazelcastConnector
     private final Config config;
     private final LogProvider logProvider;
     private final SslPolicy sslPolicy;
-    private final ResolutionResolver resolutionResolver;
+    private final HostnameResolver hostnameResolver;
 
     HazelcastClientConnector( Config config, LogProvider logProvider, SslPolicy sslPolicy,
-            ResolutionResolver resolutionResolver )
+            HostnameResolver hostnameResolver )
     {
         this.config = config;
         this.logProvider = logProvider;
         this.sslPolicy = sslPolicy;
-        this.resolutionResolver = resolutionResolver;
+        this.hostnameResolver = hostnameResolver;
     }
 
     @Override
@@ -57,7 +57,7 @@ public HazelcastInstance connectToHazelcast()
 
         for ( AdvertisedSocketAddress address : config.get( CausalClusteringSettings.initial_discovery_members ) )
         {
-            for ( AdvertisedSocketAddress advertisedSocketAddress : resolutionResolver.resolve( address ) )
+            for ( AdvertisedSocketAddress advertisedSocketAddress : hostnameResolver.resolve( address ) )
             {
                 networkConfig.addAddress( advertisedSocketAddress.toString() );
             }

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java

@@ -78,7 +78,7 @@ class HazelcastCoreTopologyService extends LifecycleAdapter implements CoreTopol
     private final RobustJobSchedulerWrapper scheduler;
     private final long refreshPeriod;
     private final LogProvider logProvider;
-    private final ResolutionResolver resolutionResolver;
+    private final HostnameResolver hostnameResolver;
 
     private String membershipRegistrationId;
     private JobScheduler.JobHandle refreshJob;
@@ -92,7 +92,7 @@ class HazelcastCoreTopologyService extends LifecycleAdapter implements CoreTopol
     private volatile boolean stopped;
 
     HazelcastCoreTopologyService( Config config, SslPolicy sslPolicy, MemberId myself, JobScheduler jobScheduler,
-            LogProvider logProvider, LogProvider userLogProvider, ResolutionResolver resolutionResolver )
+            LogProvider logProvider, LogProvider userLogProvider, HostnameResolver hostnameResolver )
     {
         this.config = config;
         this.sslPolicy = sslPolicy;
@@ -103,7 +103,7 @@ class HazelcastCoreTopologyService extends LifecycleAdapter implements CoreTopol
         this.scheduler = new RobustJobSchedulerWrapper( jobScheduler, log );
         this.userLog = userLogProvider.getLog( getClass() );
         this.refreshPeriod = config.get( CausalClusteringSettings.cluster_topology_refresh ).toMillis();
-        this.resolutionResolver = resolutionResolver;
+        this.hostnameResolver = hostnameResolver;
     }
 
     @Override
@@ -192,7 +192,7 @@ private HazelcastInstance createHazelcastInstance()
         List<AdvertisedSocketAddress> initialMembers = config.get( initial_discovery_members );
         for ( AdvertisedSocketAddress address : initialMembers )
         {
-            for ( AdvertisedSocketAddress advertisedSocketAddress : resolutionResolver.resolve( address ) )
+            for ( AdvertisedSocketAddress advertisedSocketAddress : hostnameResolver.resolve( address ) )
             {
                 tcpIpConfig.addMember( advertisedSocketAddress.toString() );
             }

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HazelcastDiscoveryServiceFactory.java

@@ -32,18 +32,18 @@ public class HazelcastDiscoveryServiceFactory implements DiscoveryServiceFactory
 {
     @Override
     public CoreTopologyService coreTopologyService( Config config, SslPolicy sslPolicy, MemberId myself, JobScheduler jobScheduler,
-            LogProvider logProvider, LogProvider userLogProvider, ResolutionResolver resolutionResolver)
+            LogProvider logProvider, LogProvider userLogProvider, HostnameResolver hostnameResolver )
     {
         configureHazelcast( config );
-        return new HazelcastCoreTopologyService( config, sslPolicy, myself, jobScheduler, logProvider, userLogProvider, resolutionResolver);
+        return new HazelcastCoreTopologyService( config, sslPolicy, myself, jobScheduler, logProvider, userLogProvider, hostnameResolver );
     }
 
     @Override
     public TopologyService topologyService( Config config, SslPolicy sslPolicy, LogProvider logProvider,
-                                            JobScheduler jobScheduler, MemberId myself, ResolutionResolver resolutionResolver)
+                                            JobScheduler jobScheduler, MemberId myself, HostnameResolver hostnameResolver )
     {
         configureHazelcast( config );
-        return new HazelcastClient( new HazelcastClientConnector( config, logProvider, sslPolicy, resolutionResolver), jobScheduler, logProvider, config, myself );
+        return new HazelcastClient( new HazelcastClientConnector( config, logProvider, sslPolicy, hostnameResolver ), jobScheduler, logProvider, config, myself );
     }
 
     private static void configureHazelcast( Config config )

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/ResolutionResolver.java → enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/HostnameResolver.java

@@ -23,7 +23,7 @@
 
 import org.neo4j.helpers.AdvertisedSocketAddress;
 
-public interface ResolutionResolver
+public interface HostnameResolver
 {
     Collection<AdvertisedSocketAddress> resolve( AdvertisedSocketAddress advertisedSocketAddresses );
 }

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/MapDomainNameResolver.java

@@ -20,7 +20,6 @@
 package org.neo4j.causalclustering.discovery;
 
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.Collection;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -41,7 +40,7 @@ public InetAddress[] resolveDomainName( String hostname ) throws UnknownHostExce
         {
             return domainNameMapping.get( hostname );
         }
-        throw new UnknownHostException(hostname);
+        throw new UnknownHostException( new java.net.UnknownHostException() );
     }
 
     public void setHostnameAddresses( String hostname, Collection<String> addresses )
@@ -58,9 +57,9 @@ private static InetAddress inetAddress( String address )
         {
             return InetAddress.getByName( address );
         }
-        catch ( UnknownHostException e )
+        catch ( java.net.UnknownHostException e )
         {
-            throw new RuntimeException( e );
+            throw new UnknownHostException( e );
         }
     }
 }

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/NoOpResolutionResolver.java → enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/NoOpHostnameResolver.java

@@ -25,7 +25,7 @@
 
 import static java.util.Collections.singleton;
 
-public class NoOpResolutionResolver implements ResolutionResolver
+public class NoOpHostnameResolver implements HostnameResolver
 {
     @Override
     public Collection<AdvertisedSocketAddress> resolve( AdvertisedSocketAddress advertisedSocketAddresses )

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/ResolutionResolverFactory.java

@@ -25,17 +25,17 @@
 
 public class ResolutionResolverFactory
 {
-    public static ResolutionResolver chooseResolver( Config config, LogProvider logProvider,
+    public static HostnameResolver chooseResolver( Config config, LogProvider logProvider,
             LogProvider userLogProvider )
     {
         CausalClusteringSettings.DiscoveryType discoveryType = config.get( CausalClusteringSettings.discovery_type );
         if ( discoveryType == CausalClusteringSettings.DiscoveryType.DNS )
         {
-            return new DnsResolutionResolver( logProvider, userLogProvider, new DomainNameResolverImpl() );
+            return new DnsHostnameResolver( logProvider, userLogProvider, new DomainNameResolverImpl() );
         }
         else
         {
-            return new NoOpResolutionResolver();
+            return new NoOpHostnameResolver();
         }
     }
 }

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/UnknownHostException.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2002-2017 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.causalclustering.discovery;
+
+public class UnknownHostException extends RuntimeException
+{
+    public UnknownHostException(java.net.UnknownHostException unknownHostException)
+    {
+        super(unknownHostException);
+    }
+}

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java

@@ -43,7 +43,7 @@
 import org.neo4j.causalclustering.core.CausalClusteringSettings;
 import org.neo4j.causalclustering.core.consensus.schedule.DelayedRenewableTimeoutService;
 import org.neo4j.causalclustering.discovery.DiscoveryServiceFactory;
-import org.neo4j.causalclustering.discovery.ResolutionResolver;
+import org.neo4j.causalclustering.discovery.HostnameResolver;
 import org.neo4j.causalclustering.discovery.TopologyService;
 import org.neo4j.causalclustering.discovery.procedures.ReadReplicaRoleProcedure;
 import org.neo4j.causalclustering.helper.ExponentialBackoffStrategy;
@@ -186,10 +186,10 @@ public class EnterpriseReadReplicaEditionModule extends EditionModule
 
         SslPolicyLoader sslPolicyFactory = dependencies.satisfyDependency( SslPolicyLoader.create( config, logProvider ) );
         SslPolicy clusterSslPolicy = sslPolicyFactory.getPolicy( config.get( CausalClusteringSettings.ssl_policy ) );
-        ResolutionResolver resolutionResolver = chooseResolver( config, logProvider, userLogProvider );
+        HostnameResolver hostnameResolver = chooseResolver( config, logProvider, userLogProvider );
 
         TopologyService topologyService = discoveryServiceFactory.topologyService( config, clusterSslPolicy,
-                logProvider, platformModule.jobScheduler, myself, resolutionResolver );
+                logProvider, platformModule.jobScheduler, myself, hostnameResolver );
 
         life.add( dependencies.satisfyDependency( topologyService ) );
 

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/DnsResolutionResolverTest.java → enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/DnsHostnameResolverTest.java

@@ -33,14 +33,14 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class DnsResolutionResolverTest
+public class DnsHostnameResolverTest
 {
     MapDomainNameResolver mockDomainNameResolver = new MapDomainNameResolver( new HashMap<>() );
     AssertableLogProvider logProvider = new AssertableLogProvider();
     AssertableLogProvider userLogProvider = new AssertableLogProvider();
 
-    private DnsResolutionResolver resolver =
-            new DnsResolutionResolver( logProvider, userLogProvider, mockDomainNameResolver );
+    private DnsHostnameResolver resolver =
+            new DnsHostnameResolver( logProvider, userLogProvider, mockDomainNameResolver );
 
     @Test
     public void hostnamesAreResolvedByTheResolver()
@@ -94,7 +94,6 @@ public void unknownHostExceptionsAreLoggedAsErrors()
         resolver.resolve( new AdvertisedSocketAddress( "google.com", 1234 ) );
 
         // then
-        logProvider.assertContainsMessageContaining(
-                "Failed to resolve host `google.com:1234` to IPs due to error: google.com" );
+        logProvider.assertContainsMessageContaining( "Failed to resolve host 'google.com'" );
     }
 }

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryService.java

@@ -49,7 +49,7 @@ public class SharedDiscoveryService implements DiscoveryServiceFactory
 
     @Override
     public CoreTopologyService coreTopologyService( Config config, SslPolicy sslPolicy, MemberId myself, JobScheduler jobScheduler,
-            LogProvider logProvider, LogProvider userLogProvider, ResolutionResolver resolutionResolver )
+            LogProvider logProvider, LogProvider userLogProvider, HostnameResolver hostnameResolver )
     {
         SharedDiscoveryCoreClient sharedDiscoveryCoreClient =
                 new SharedDiscoveryCoreClient( this, myself, logProvider, config );
@@ -60,7 +60,7 @@ public CoreTopologyService coreTopologyService( Config config, SslPolicy sslPoli
 
     @Override
     public TopologyService topologyService( Config config, SslPolicy sslPolicy, LogProvider logProvider,
-            JobScheduler jobScheduler, MemberId myself, ResolutionResolver resolutionResolver )
+            JobScheduler jobScheduler, MemberId myself, HostnameResolver hostnameResolver )
     {
         return new SharedDiscoveryReadReplicaClient( this, config, myself, logProvider );
     }

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java

@@ -94,11 +94,10 @@ private Callable<Void> createDiscoveryJob( MemberId member, DiscoveryServiceFact
     {
         Neo4jJobScheduler jobScheduler = new Neo4jJobScheduler();
         jobScheduler.init();
-        ResolutionResolver resolutionResolver = new NoOpResolutionResolver();
+        HostnameResolver hostnameResolver = new NoOpHostnameResolver();
 
         CoreTopologyService topologyService = disoveryServiceFactory
-                .coreTopologyService( config(), null, member, jobScheduler, logProvider, userLogProvider,
-                        resolutionResolver );
+                .coreTopologyService( config(), null, member, jobScheduler, logProvider, userLogProvider, hostnameResolver );
         return sharedClientStarter( topologyService, expectedTargetSet );
     }