From 0fa129757fc880195d638401be3eff31df5421ae Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Thu, 24 Apr 2014 20:07:43 +0000 Subject: QPID-5698 : Address review comments by Keith Wall git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589862 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/qpid/server/model/AccessControlProvider.java | 2 -- .../java/org/apache/qpid/server/model/AuthenticationProvider.java | 3 --- .../src/main/java/org/apache/qpid/server/model/Consumer.java | 1 - .../src/main/java/org/apache/qpid/server/model/Exchange.java | 1 - .../broker-core/src/main/java/org/apache/qpid/server/model/Group.java | 1 - .../src/main/java/org/apache/qpid/server/model/GroupMember.java | 2 -- .../src/main/java/org/apache/qpid/server/model/GroupProvider.java | 2 -- .../src/main/java/org/apache/qpid/server/model/KeyStore.java | 4 ---- .../src/main/java/org/apache/qpid/server/model/Session.java | 2 -- .../src/main/java/org/apache/qpid/server/model/TrustStore.java | 3 --- 10 files changed, 21 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java index 0ec51a99b4..e5929c2821 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java @@ -24,8 +24,6 @@ import org.apache.qpid.server.security.AccessControl; @ManagedObject public interface AccessControlProvider> extends ConfiguredObject { - public static final String TYPE = "type"; - //retrieve the underlying AccessControl object AccessControl getAccessControl(); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java index 5873a09c9c..71f951a1e1 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java @@ -32,9 +32,6 @@ import org.apache.qpid.server.security.auth.AuthenticationResult; @ManagedObject( creatable = false ) public interface AuthenticationProvider> extends ConfiguredObject { - - public static final String DESCRIPTION = "description"; - //children Collection getVirtualHostPortBindings(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java index 8e9a0f7d9a..578b648b4d 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java @@ -28,7 +28,6 @@ public interface Consumer> extends ConfiguredObject public String NO_LOCAL = "noLocal"; public String SELECTOR = "selector"; public String SETTLEMENT_MODE = "settlementMode"; - public String STATE = "state"; @ManagedAttribute( automate = true ) String getDistributionMode(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java index 551f27aee2..1c572a1877 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java @@ -28,7 +28,6 @@ import org.apache.qpid.server.message.MessageDestination; @ManagedObject public interface Exchange> extends ConfiguredObject, MessageDestination { - String STATE = "state"; String ALTERNATE_EXCHANGE = "alternateExchange"; // Attributes diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java index b5f8ee4888..48383360f7 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java @@ -22,5 +22,4 @@ package org.apache.qpid.server.model; @ManagedObject public interface Group> extends ConfiguredObject { - String STATE = "state"; } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java index 7ce56f25d8..d1d25265f3 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java @@ -22,6 +22,4 @@ package org.apache.qpid.server.model; @ManagedObject public interface GroupMember> extends ConfiguredObject { - String STATE = "state"; - } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java index 50f5f32b0c..9e063a2103 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java @@ -25,7 +25,5 @@ import java.util.Set; @ManagedObject public interface GroupProvider> extends ConfiguredObject { - public static final String DESCRIPTION = "description"; - Set getGroupPrincipalsForUser(String username); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java index 8ca23af072..26e11210d6 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java @@ -26,9 +26,5 @@ import javax.net.ssl.KeyManager; @ManagedObject( defaultType = "FileKeyStore" ) public interface KeyStore> extends ConfiguredObject { - String STATE = "state"; - String DESCRIPTION = "description"; - public KeyManager[] getKeyManagers() throws GeneralSecurityException; - } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java index 0ddc392430..ee6fa9b8ab 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java @@ -25,8 +25,6 @@ import java.util.Collection; @ManagedObject public interface Session> extends ConfiguredObject { - String STATE = "state"; - String CHANNEL_ID = "channelId"; // PRODUCER_FLOW_BLOCKED is exposed as an interim step. We will expose attribute(s) that exposing // available credit of both producer and consumer sides. diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java index 7ee42258e7..3f61cc61cf 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java @@ -26,12 +26,9 @@ import javax.net.ssl.TrustManager; @ManagedObject( defaultType = "FileTrustStore" ) public interface TrustStore> extends ConfiguredObject { - String DESCRIPTION = "description"; - @ManagedAttribute( secure = true, automate = true, mandatory = true) public String getPassword(); - public void setPassword(String password); public TrustManager[] getTrustManagers() throws GeneralSecurityException; -- cgit v1.2.1