diff options
Diffstat (limited to 'qpid/java/bdbstore')
2 files changed, 5 insertions, 8 deletions
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8.java index 8f3cf73275..0d4e40fdcb 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8.java @@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.model.Model; import org.apache.qpid.server.model.UUIDGenerator; import org.apache.qpid.server.store.ConfiguredObjectRecord; import org.apache.qpid.server.store.StoreException; @@ -68,7 +68,7 @@ public class UpgradeFrom7To8 extends AbstractStoreUpgrade Cursor objectsCursor = null; - String stringifiedConfigVersion = Model.MODEL_VERSION; + String stringifiedConfigVersion = BrokerModel.MODEL_VERSION; int configVersion = getConfigVersion(configVersionDb); if (configVersion > -1) { diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/VirtualHostTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/VirtualHostTest.java index 5ad113f827..abaaaa6d72 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/VirtualHostTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/VirtualHostTest.java @@ -36,13 +36,12 @@ import org.apache.qpid.server.configuration.ConfigurationEntryStore; import org.apache.qpid.server.configuration.RecovererProvider; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ConfiguredObjectFactory; import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl; -import org.apache.qpid.server.model.Model; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.VirtualHost; -import org.apache.qpid.server.plugin.ConfiguredObjectTypeFactory; import org.apache.qpid.server.stats.StatisticsGatherer; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacadeFactory; @@ -149,12 +148,10 @@ public class VirtualHostTest extends QpidTestCase private VirtualHost<?,?,?> createHost(Map<String, Object> attributes) { - ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(Model.getInstance()); - ConfiguredObjectTypeFactory vhostFactory = - factory.getConfiguredObjectTypeFactory(VirtualHost.class, attributes); + ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()); attributes = new HashMap<String, Object>(attributes); attributes.put(ConfiguredObject.ID, UUID.randomUUID()); - return (VirtualHost<?,?,?>) vhostFactory.create(attributes,_broker); + return (VirtualHost<?,?,?>) factory.create(VirtualHost.class, attributes,_broker); } } |