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 2017/06/16 09:04:15 UTC
qpid-broker-j git commit: QPID-7826: Simplify ACO#addChildAsync
implementations
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 9713e49a0 -> 1a1aed8af
QPID-7826: Simplify ACO#addChildAsync implementations
Also removed MapValueConverter
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/1a1aed8a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/1a1aed8a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/1a1aed8a
Branch: refs/heads/master
Commit: 1a1aed8af1a1afecf729209ab6802e2abdd41892
Parents: 9713e49
Author: Keith Wall <kw...@apache.org>
Authored: Fri Jun 16 09:59:39 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Fri Jun 16 10:03:37 2017 +0100
----------------------------------------------------------------------
.../berkeleydb/BDBHAVirtualHostNodeImpl.java | 11 ----------
.../server/model/AbstractConfiguredObject.java | 3 +--
.../apache/qpid/server/model/BrokerImpl.java | 6 ++----
.../adapter/FileBasedGroupProviderImpl.java | 21 ++++++++++----------
.../qpid/server/model/port/AbstractPort.java | 11 ----------
.../apache/qpid/server/queue/AbstractQueue.java | 12 +++++------
...lPasswordManagingAuthenticationProvider.java | 7 +++++--
.../PrincipalDatabaseAuthenticationManager.java | 8 +++++---
.../qpid/server/security/group/GroupImpl.java | 16 ---------------
.../transport/AbstractAMQPConnection.java | 6 +++---
.../server/virtualhost/AbstractVirtualHost.java | 8 +-------
.../AbstractStandardVirtualHostNode.java | 12 -----------
.../RedirectingVirtualHostNodeImpl.java | 6 ++++--
.../testmodels/hierarchy/TestKitCarImpl.java | 10 ----------
.../hierarchy/TestStandardCarImpl.java | 9 ---------
.../server/logging/logback/AbstractLogger.java | 7 -------
16 files changed, 36 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
index 9ed790e..126e105 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
@@ -285,17 +285,6 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
+ ", state=" + getState() + ", priority=" + _priority + ", designatedPrimary=" + _designatedPrimary + ", quorumOverride=" + _quorumOverride + ", role=" + getRole() + "]";
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Override
- protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass, Map<String, Object> attributes)
- {
- if(childClass == VirtualHost.class)
- {
- return getObjectFactory().createAsync(childClass, attributes, this);
- }
- return super.addChildAsync(childClass, attributes);
- }
-
@Override
public BDBConfigurationStore getConfigurationStore()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
index 695a97d..1e75b20 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
@@ -2131,11 +2131,10 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
});
}
-
protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass,
Map<String, Object> attributes)
{
- throw new UnsupportedOperationException();
+ return getObjectFactory().createAsync(childClass, attributes, this);
}
private <C extends ConfiguredObject> void registerChild(final C child)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
index ab374e3..c14289f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
@@ -709,7 +709,7 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
@SuppressWarnings("unchecked")
@Override
- public <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(final Class<C> childClass,
+ protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(final Class<C> childClass,
final Map<String, Object> attributes)
{
if (childClass == VirtualHostNode.class)
@@ -718,10 +718,8 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
}
else
{
- return getObjectFactory().createAsync(childClass, attributes, this);
+ return super.addChildAsync(childClass, attributes);
}
-
-
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
index 3c190ff..d7aae85 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
@@ -194,7 +194,7 @@ public class FileBasedGroupProviderImpl
}
@Override
- public <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass,
+ protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass,
Map<String, Object> attributes)
{
if (childClass == Group.class)
@@ -217,10 +217,10 @@ public class FileBasedGroupProviderImpl
return Futures.immediateFuture((C) groupAdapter);
}
-
- throw new IllegalArgumentException(
- "This group provider does not support creating children of type: "
- + childClass);
+ else
+ {
+ return super.addChildAsync(childClass, attributes);
+ }
}
private Set<Principal> getGroupPrincipals()
@@ -357,9 +357,8 @@ public class FileBasedGroupProviderImpl
}
}
-
@Override
- public <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass,
+ protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass,
Map<String, Object> attributes)
{
if (childClass == GroupMember.class)
@@ -376,10 +375,10 @@ public class FileBasedGroupProviderImpl
return Futures.immediateFuture((C) groupMemberAdapter);
}
-
- throw new IllegalArgumentException(
- "This group provider does not support creating children of type: "
- + childClass);
+ else
+ {
+ return super.addChildAsync(childClass, attributes);
+ }
}
@StateTransition( currentState = State.ACTIVE, desiredState = State.DELETED )
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/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 262d401..b97dd7a 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
@@ -395,17 +395,6 @@ public abstract class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
return null;
}
- @Override
- public <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(final Class<C> childClass,
- final Map<String, Object> attributes)
- {
- if (VirtualHostAlias.class.isAssignableFrom(childClass))
- {
- return getObjectFactory().createAsync(childClass, attributes, this);
- }
- return super.addChildAsync(childClass, attributes);
- }
-
protected State onActivate()
{
// no-op: expected to be overridden by subclass
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index f888c64..2a9d3b5 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -118,10 +118,9 @@ import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.Deletable;
import org.apache.qpid.server.util.DeleteDeleteTask;
-import org.apache.qpid.server.util.MapValueConverter;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.MessageDestinationIsAlternateException;
import org.apache.qpid.server.virtualhost.HouseKeepingTask;
+import org.apache.qpid.server.virtualhost.MessageDestinationIsAlternateException;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostUnavailableException;
@@ -407,9 +406,9 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
}
else if(_exclusive == ExclusivityPolicy.PRINCIPAL)
{
- String owner = MapValueConverter.getStringAttribute(Queue.OWNER, attributes, null);
- if(owner != null)
+ if (attributes.get(Queue.OWNER) != null)
{
+ String owner = String.valueOf(attributes.get(Queue.OWNER));
Principal ownerPrincipal;
try
{
@@ -424,10 +423,9 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
}
else if(_exclusive == ExclusivityPolicy.CONTAINER)
{
- String owner = MapValueConverter.getStringAttribute(Queue.OWNER, attributes, null);
- if(owner != null)
+ if (attributes.get(Queue.OWNER) != null)
{
- _exclusiveOwner = owner;
+ _exclusiveOwner = String.valueOf(attributes.get(Queue.OWNER));
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
index b39f624..408686e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
@@ -223,7 +223,7 @@ public abstract class ConfigModelPasswordManagingAuthenticationProvider<X extend
}
@Override
- public <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(final Class<C> childClass,
+ protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(final Class<C> childClass,
final Map<String, Object> attributes)
{
if(childClass == User.class)
@@ -238,7 +238,10 @@ public abstract class ConfigModelPasswordManagingAuthenticationProvider<X extend
user.create();
return Futures.immediateFuture((C)getUser(username));
}
- return super.addChildAsync(childClass, attributes);
+ else
+ {
+ return super.addChildAsync(childClass, attributes);
+ }
}
abstract void validateUser(final ManagedUser managedUser);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
index 4c149ee..c2e0bb8 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
@@ -307,7 +307,7 @@ public abstract class PrincipalDatabaseAuthenticationManager<T extends Principal
}
@Override
- public <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass,
+ protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass,
Map<String, Object> attributes)
{
if(childClass == User.class)
@@ -333,8 +333,10 @@ public abstract class PrincipalDatabaseAuthenticationManager<T extends Principal
_userMap.put(p, principalAdapter);
return Futures.immediateFuture((C)principalAdapter);
}
-
- return super.addChildAsync(childClass, attributes);
+ else
+ {
+ return super.addChildAsync(childClass, attributes);
+ }
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java
index 96aa2ca..dc35562 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java
@@ -26,9 +26,7 @@ import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import org.apache.qpid.server.model.AbstractConfiguredObject;
-import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Group;
-import org.apache.qpid.server.model.GroupMember;
import org.apache.qpid.server.model.GroupProvider;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
@@ -48,20 +46,6 @@ public class GroupImpl extends AbstractConfiguredObject<GroupImpl> implements Gr
super(provider, attributes);
}
- @Override
- protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(final Class<C> childClass,
- final Map<String, Object> attributes)
- {
- if(childClass == GroupMember.class)
- {
- return getObjectFactory().createAsync(childClass, attributes, this);
- }
- else
- {
- return super.addChildAsync(childClass, attributes);
- }
- }
-
@StateTransition( currentState = { State.UNINITIALIZED, State.QUIESCED, State.ERRORED }, desiredState = State.ACTIVE )
private ListenableFuture<Void> activate()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java b/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
index 4ba537b..6cc2bdd 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
@@ -70,13 +70,13 @@ import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.sasl.SaslSettings;
import org.apache.qpid.server.stats.StatisticsCounter;
import org.apache.qpid.server.stats.StatisticsGatherer;
+import org.apache.qpid.server.transport.network.NetworkConnection;
+import org.apache.qpid.server.transport.network.Ticker;
import org.apache.qpid.server.txn.FlowToDiskTransactionObserver;
import org.apache.qpid.server.txn.LocalTransaction;
import org.apache.qpid.server.txn.TransactionObserver;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.FixedKeyMapCreator;
-import org.apache.qpid.server.transport.network.NetworkConnection;
-import org.apache.qpid.server.transport.network.Ticker;
public abstract class AbstractAMQPConnection<C extends AbstractAMQPConnection<C,T>, T>
extends AbstractConfiguredObject<C>
@@ -641,7 +641,7 @@ public abstract class AbstractAMQPConnection<C extends AbstractAMQPConnection<C,
}
@Override
- public <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass,
+ protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass,
Map<String, Object> attributes)
{
if(childClass == Session.class)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 8647e1c..463ae26 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -835,13 +835,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
Map<String, Object> attributes)
{
checkVHostStateIsActive();
-
- if(childClass == Exchange.class || childClass == Queue.class || childClass == VirtualHostLogger.class || childClass == VirtualHostAccessControlProvider.class)
- {
- return getObjectFactory().createAsync(childClass, attributes, this);
- }
-
- throw new IllegalArgumentException("Cannot create a child of class " + childClass.getSimpleName());
+ return super.addChildAsync(childClass, attributes);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
index 9760869..aa9ee9c 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
@@ -58,18 +58,6 @@ public abstract class AbstractStandardVirtualHostNode<X extends AbstractStandard
super(parent, attributes);
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Override
- protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass,
- Map<String, Object> attributes)
- {
- if(childClass == VirtualHost.class)
- {
- return getObjectFactory().createAsync(childClass, attributes, this);
- }
- return super.addChildAsync(childClass, attributes);
- }
-
@Override
protected ListenableFuture<Void> activate()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java
index 546342f..84217b4 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java
@@ -277,7 +277,6 @@ public class RedirectingVirtualHostNodeImpl
}
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass,
Map<String, Object> attributes)
@@ -287,7 +286,10 @@ public class RedirectingVirtualHostNodeImpl
throw new UnsupportedOperationException("The redirecting virtualhost node automatically manages the creation"
+ " of the redirecting virtualhost. Creating it explicitly is not supported.");
}
- return super.addChildAsync(childClass, attributes);
+ else
+ {
+ return super.addChildAsync(childClass, attributes);
+ }
}
public static Map<String, Collection<String>> getSupportedChildTypes()
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java
index fc94da0..7a34dd1 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java
@@ -20,11 +20,8 @@ package org.apache.qpid.server.model.testmodels.hierarchy;
import java.util.Map;
-import com.google.common.util.concurrent.ListenableFuture;
-
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.model.AbstractConfiguredObject;
-import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
@@ -55,13 +52,6 @@ public class TestKitCarImpl extends AbstractConfiguredObject<TestKitCarImpl>
}
@Override
- protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(final Class<C> childClass,
- final Map<String, Object> attributes)
- {
- return getObjectFactory().createAsync(childClass, attributes, this);
- }
-
- @Override
protected void logOperation(final String operation)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java
index bdcd61a..0e007e6 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java
@@ -25,8 +25,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import com.google.common.util.concurrent.ListenableFuture;
-
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -76,13 +74,6 @@ public class TestStandardCarImpl extends AbstractConfiguredObject<TestStandardCa
}
@Override
- protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(final Class<C> childClass,
- final Map<String, Object> attributes)
- {
- return getObjectFactory().createAsync(childClass, attributes, this);
- }
-
- @Override
protected void logOperation(final String operation)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1a1aed8a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java
index 38f8470..2bed26d 100644
--- a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java
+++ b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java
@@ -123,13 +123,6 @@ public abstract class AbstractLogger<X extends AbstractLogger<X>> extends Abstra
});
}
- @Override
- protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass,
- Map<String, Object> attributes)
- {
- return getObjectFactory().createAsync(childClass, attributes, this);
- }
-
public final long getErrorCount()
{
return _compositeFilter.getErrorCount();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org