Author: rgodfrey
Date: Sun Mar 27 19:30:32 2016
New Revision: 1736810
URL: http://svn.apache.org/viewvc?rev=1736810&view=rev
Log:
QPID-7095 : Ensure Broker context defaults are processed, and that unresolved
context dependencies are determined only at the completion of processing
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java?rev=1736810&r1=1736809&r2=1736810&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
Sun Mar 27 19:30:32 2016
@@ -336,8 +336,31 @@ public class ConfiguredObjectTypeRegistr
}
}
+
+ validateContextDependencies();
+
}
+ private void validateContextDependencies()
+ {
+ for(Map.Entry<Class<? extends ConfiguredObject>, Set<String>> entry :
_contextUses.entrySet())
+ {
+ for (String dependency : entry.getValue())
+ {
+ if(!_contextDefinitions.containsKey(dependency))
+ {
+ throw new IllegalArgumentException("Class "
+ +
entry.getKey().getSimpleName()
+ + " defines a context
dependency on a context variable '"
+ + dependency
+ + "' which is never
defined");
+ }
+ }
+ }
+ }
+
+
+
private boolean factoryExists(final Class<? extends ConfiguredObject>
categoryClass, final String type)
{
try
@@ -627,7 +650,6 @@ public class ConfiguredObjectTypeRegistr
{
return;
}
-
doWithAllParents(clazz, new Action<Class<? extends
ConfiguredObject>>()
{
@Override
@@ -685,19 +707,7 @@ public class ConfiguredObjectTypeRegistr
ManagedContextDependency dependencies =
clazz.getAnnotation(ManagedContextDependency.class);
for (String dependency : dependencies.value())
{
- if (_contextDefinitions.containsKey(dependency))
- {
- contextSet.add(dependency);
- }
- else
- {
- throw new IllegalArgumentException("Class "
- + clazz.getSimpleName()
- + " defines a context
dependency on a context variable '"
- + dependency
- + "' which is never
defined");
- }
-
+ contextSet.add(dependency);
}
}
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java?rev=1736810&r1=1736809&r2=1736810&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
Sun Mar 27 19:30:32 2016
@@ -26,6 +26,9 @@ import java.util.Set;
import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.qpid.configuration.CommonProperties;
+
+@ManagedContextDependency({CommonProperties.QPID_SECURITY_TLS_PROTOCOL_WHITE_LIST,
CommonProperties.QPID_SECURITY_TLS_CIPHER_SUITE_BLACK_LIST})
@ManagedObject( description = Port.CLASS_DESCRIPTION )
public interface Port<X extends Port<X>> extends ConfiguredObject<X>
{
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1736810&r1=1736809&r2=1736810&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Sun Mar 27 19:30:32 2016
@@ -83,6 +83,7 @@ import org.apache.qpid.server.store.File
import org.apache.qpid.server.virtualhost.VirtualHostPropertiesNodeCreator;
import org.apache.qpid.util.SystemUtils;
+@ManagedObject( category = false, type = "Broker" )
public class BrokerAdapter extends AbstractConfiguredObject<BrokerAdapter>
implements Broker<BrokerAdapter>, StatisticsGatherer
{
private static final Logger LOGGER =
LoggerFactory.getLogger(BrokerAdapter.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
