Bill commented on a change in pull request #6308: URL: https://github.com/apache/geode/pull/6308#discussion_r618833961
########## File path: geode-tcp-server/src/main/java/org/apache/geode/distributed/internal/tcpserver/InetSocketWrapper.java ########## @@ -0,0 +1,97 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF 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 + * + * 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.apache.geode.distributed.internal.tcpserver; + +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.util.Objects; + +import org.apache.commons.validator.routines.InetAddressValidator; + +class InetSocketWrapper { + String hostName; + protected InetSocketAddress inetSocketAddress; + private InetSocketAddress attemptedToResolve; + + protected InetSocketWrapper() {} + + protected InetSocketWrapper(String hostName, int port) { + this.hostName = hostName; + if (hostName == null) { + inetSocketAddress = new InetSocketAddress(port); + } else if (InetAddressValidator.getInstance().isValid(hostName)) { + // numeric address - use as-is + inetSocketAddress = new InetSocketAddress(hostName, port); + } else { + // non-numeric address - resolve hostname when needed + inetSocketAddress = InetSocketAddress.createUnresolved(hostName, port); + } + } + + public String getHostName() { + if (hostName != null) { + return hostName; + } Review comment: This checking is superfluous because `InetSocketAddress.getHostName()` does this same `null` check. ########## File path: geode-tcp-server/src/main/java/org/apache/geode/distributed/internal/tcpserver/HostAddress.java ########## @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF 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 + * + * 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.apache.geode.distributed.internal.tcpserver; + +import java.net.InetAddress; +import java.net.InetSocketAddress; + + +/** + * HostAddress is a holder of a host name/address. It is the primary + * way to specify a host address that may or may not have been resolved to an InetAddress. + * + * @See HostAndPort which can hold both a host name and a port + */ +public class HostAddress extends InetSocketWrapper { + + public HostAddress(String hostName) { + super(hostName, 0); + } + + public HostAddress(InetAddress address) { + if (address == null) { + throw new IllegalArgumentException("null parameters are not allowed"); + } + inetSocketAddress = new InetSocketAddress(address, 0); + } + + public HostAddress(HostAndPort hostAndPort) { + hostName = hostAndPort.hostName; + inetSocketAddress = hostAndPort.inetSocketAddress; + } + + @Override + public String toString() { + if (hostName != null) { + return hostName; Review comment: If we get rid of `hostName` in the base class this could change to maybe: ``` final String hostName = getHostName(); if (hostName == null) return inetSocketAddress.getAddress().toString(); else return hostName; ``` ########## File path: geode-tcp-server/src/main/java/org/apache/geode/distributed/internal/tcpserver/InetSocketWrapper.java ########## @@ -0,0 +1,97 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF 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 + * + * 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.apache.geode.distributed.internal.tcpserver; + +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.util.Objects; + +import org.apache.commons.validator.routines.InetAddressValidator; + +class InetSocketWrapper { + String hostName; Review comment: Why does this class need to track `hostName`? Doesn't `InetSocketAddress` adequately manage that state? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
