You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/01/29 14:06:07 UTC
qpid-broker-j git commit: QPID-8088: [Broker-J] Pull-up
bindingAddress to port
Repository: qpid-broker-j
Updated Branches:
refs/heads/master e4f5cc911 -> e26dd3321
QPID-8088: [Broker-J] Pull-up bindingAddress to port
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/e26dd332
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/e26dd332
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/e26dd332
Branch: refs/heads/master
Commit: e26dd33212dc34aad22aa66b97d7e8b388c857c8
Parents: e4f5cc9
Author: Keith Wall <kw...@apache.org>
Authored: Mon Jan 29 11:38:07 2018 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Mon Jan 29 14:05:30 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/qpid/server/model/Port.java | 6 +++++
.../qpid/server/model/port/AbstractPort.java | 22 +++++++++++++++++++
.../apache/qpid/server/model/port/AmqpPort.java | 3 ---
.../qpid/server/model/port/AmqpPortImpl.java | 23 --------------------
.../apache/qpid/server/model/port/HttpPort.java | 3 ---
.../qpid/server/model/port/HttpPortImpl.java | 22 -------------------
.../virtualhostalias/HostNameAliasImpl.java | 5 ++---
7 files changed, 30 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e26dd332/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Port.java b/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
index 003caf7..3850afd 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
@@ -53,6 +53,7 @@ public interface Port<X extends Port<X>> extends ConfiguredObject<X>
String TRUST_STORES = "trustStores";
String CLIENT_CERT_RECORDER = "clientCertRecorder";
+ String DEFAULT_BINDING_ADDRESS = "*";
String CONNECTION_MAXIMUM_AUTHENTICATION_DELAY = "connection.maximumAuthenticationDelay";
@@ -99,6 +100,11 @@ public interface Port<X extends Port<X>> extends ConfiguredObject<X>
@DerivedAttribute
List<String> getTlsCipherSuiteBlackList();
+ @ManagedAttribute(defaultValue = "*",
+ description = "The network interface this port binds to expressed as an IP address or a"
+ + "hostname. If null or * then bind to all interfaces.")
+ String getBindingAddress();
+
@ManagedAttribute
boolean getNeedClientAuth();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e26dd332/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
index 8349092..c77611e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
@@ -41,6 +41,7 @@ import org.apache.qpid.server.model.*;
import org.apache.qpid.server.security.ManagedPeerCertificateTrustStore;
import org.apache.qpid.server.security.SubjectCreator;
import org.apache.qpid.server.util.ParameterizedTypes;
+import org.apache.qpid.server.util.PortUtil;
public abstract class AbstractPort<X extends AbstractPort<X>> extends AbstractConfiguredObject<X> implements Port<X>
{
@@ -79,6 +80,9 @@ public abstract class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
@ManagedAttributeField
private boolean _allowConfidentialOperationsOnInsecureChannels;
+ @ManagedAttributeField
+ private String _bindingAddress;
+
private List<String> _tlsProtocolBlackList;
private List<String> _tlsProtocolWhiteList;
@@ -96,6 +100,12 @@ public abstract class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
}
@Override
+ public String getBindingAddress()
+ {
+ return _bindingAddress;
+ }
+
+ @Override
protected void onOpen()
{
super.onOpen();
@@ -106,6 +116,18 @@ public abstract class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
}
@Override
+ public void validateOnCreate()
+ {
+ super.validateOnCreate();
+ String bindingAddress = getBindingAddress();
+ if (!PortUtil.isPortAvailable(bindingAddress, getPort()))
+ {
+ throw new IllegalConfigurationException(String.format("Cannot bind to port %d and binding address '%s'. Port is already is use.",
+ getPort(), bindingAddress == null || "".equals(bindingAddress) ? "*" : bindingAddress));
+ }
+ }
+
+ @Override
public void onValidate()
{
super.onValidate();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e26dd332/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
index 295367d..6474622 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
@@ -134,9 +134,6 @@ public interface AmqpPort<X extends AmqpPort<X>> extends Port<X>
SSLContext getSSLContext();
- @ManagedAttribute(defaultValue = "*")
- String getBindingAddress();
-
@ManagedAttribute( defaultValue = AmqpPort.DEFAULT_AMQP_TCP_NO_DELAY )
boolean isTcpNoDelay();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e26dd332/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
index dc66d6e..4a9eb02 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
@@ -78,16 +78,11 @@ public class AmqpPortImpl extends AbstractPort<AmqpPortImpl> implements AmqpPort
private static final Logger LOGGER = LoggerFactory.getLogger(AmqpPortImpl.class);
- public static final String DEFAULT_BINDING_ADDRESS = "*";
-
@ManagedAttributeField
private boolean _tcpNoDelay;
@ManagedAttributeField
- private String _bindingAddress;
-
- @ManagedAttributeField
private int _maxOpenConnections;
@ManagedAttributeField
@@ -141,12 +136,6 @@ public class AmqpPortImpl extends AbstractPort<AmqpPortImpl> implements AmqpPort
}
@Override
- public String getBindingAddress()
- {
- return _bindingAddress;
- }
-
- @Override
public boolean isTcpNoDelay()
{
return _tcpNoDelay;
@@ -325,18 +314,6 @@ public class AmqpPortImpl extends AbstractPort<AmqpPortImpl> implements AmqpPort
}
@Override
- public void validateOnCreate()
- {
- super.validateOnCreate();
- String bindingAddress = getBindingAddress();
- if (!PortUtil.isPortAvailable(bindingAddress, getPort()))
- {
- throw new IllegalConfigurationException(String.format("Cannot bind to port %d and binding address '%s'. Port is already is use.",
- getPort(), bindingAddress == null || "".equals(bindingAddress) ? "*" : bindingAddress));
- }
- }
-
- @Override
public void onValidate()
{
super.onValidate();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e26dd332/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java b/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
index 131afa3..e491be3 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
@@ -72,9 +72,6 @@ public interface HttpPort<X extends HttpPort<X>> extends Port<X>
@ManagedContextDefault(name = TLS_SESSION_CACHE_SIZE, description = "TLS session cache size for HTTP ports.")
int DEFAULT_TLS_SESSION_CACHE_SIZE = 1000;
- @ManagedAttribute(defaultValue = "*")
- String getBindingAddress();
-
@Override
@ManagedAttribute( defaultValue = DEFAULT_HTTP_NEED_CLIENT_AUTH)
boolean getNeedClientAuth();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e26dd332/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java
index 8a655ad..eb9f6d2 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java
@@ -29,16 +29,12 @@ import org.apache.qpid.server.model.Container;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.util.PortUtil;
public class HttpPortImpl extends AbstractPort<HttpPortImpl> implements HttpPort<HttpPortImpl>
{
private PortManager _portManager;
@ManagedAttributeField
- private String _bindingAddress;
-
- @ManagedAttributeField
private int _threadPoolMaximum;
@ManagedAttributeField
@@ -74,12 +70,6 @@ public class HttpPortImpl extends AbstractPort<HttpPortImpl> implements HttpPort
}
@Override
- public String getBindingAddress()
- {
- return _bindingAddress;
- }
-
- @Override
public int getThreadPoolMaximum()
{
return _threadPoolMaximum;
@@ -181,18 +171,6 @@ public class HttpPortImpl extends AbstractPort<HttpPortImpl> implements HttpPort
}
@Override
- public void validateOnCreate()
- {
- super.validateOnCreate();
- String bindingAddress = getBindingAddress();
- if (!PortUtil.isPortAvailable(bindingAddress, getPort()))
- {
- throw new IllegalConfigurationException(String.format("Cannot bind to port %d and binding address '%s'. Port is already is use.",
- getPort(), bindingAddress == null || "".equals(bindingAddress) ? "*" : bindingAddress));
- }
- }
-
- @Override
protected void validateChange(final ConfiguredObject<?> proxyForValidation, final Set<String> changedAttributes)
{
super.validateChange(proxyForValidation, changedAttributes);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e26dd332/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
index ab6b930..a3b100d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
@@ -41,7 +41,6 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.server.model.HostNameAlias;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.port.AmqpPort;
public class HostNameAliasImpl
extends AbstractFixedVirtualHostNodeAlias<HostNameAliasImpl>
@@ -66,7 +65,7 @@ public class HostNameAliasImpl
protected void onOpen()
{
super.onOpen();
- String bindingAddress = ((AmqpPort) getPort()).getBindingAddress();
+ String bindingAddress = getPort().getBindingAddress();
Thread thread = new Thread(new NetworkAddressResolver(),
"Network Address Resolver (Port: "
+ (useAllAddresses(bindingAddress) ? "" : bindingAddress)
@@ -121,7 +120,7 @@ public class HostNameAliasImpl
Lock lock = _addressLock;
lock.lock();
- String bindingAddress = ((AmqpPort<?>)getPort()).getBindingAddress();
+ String bindingAddress = getPort().getBindingAddress();
try
{
Collection<InetAddress> inetAddresses;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org