From cb2ad01319b3b812fb1438c2363ba0485b3d1c4f Mon Sep 17 00:00:00 2001 From: Andrew MacBean Date: Thu, 26 Jun 2014 11:31:39 +0000 Subject: QPID-5821: Remove unused settings interface incorrectly committed git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1605742 13f79535-47bb-0310-9956-ffa450edef68 --- .../store/berkeleydb/BDBConfigurationStore.java | 4 ++-- .../server/store/berkeleydb/BDBMessageStore.java | 4 ++-- .../virtualhost/berkeleydb/BDBHAVirtualHost.java | 4 ++-- .../virtualhost/berkeleydb/BDBVirtualHost.java | 3 ++- .../qpid/server/store/SizeMonitorSettings.java | 26 ---------------------- .../virtualhost/ProvidedStoreVirtualHost.java | 3 ++- .../store/derby/AbstractDerbyMessageStore.java | 2 +- .../server/virtualhost/derby/DerbyVirtualHost.java | 3 ++- 8 files changed, 13 insertions(+), 36 deletions(-) delete mode 100644 qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/SizeMonitorSettings.java (limited to 'qpid/java') diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java index 7fb973d089..9c58be7694 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java @@ -46,7 +46,7 @@ import org.apache.qpid.server.store.ConfiguredObjectRecord; import org.apache.qpid.server.store.DurableConfigurationStore; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.MessageStoreProvider; -import org.apache.qpid.server.store.SizeMonitorSettings; +import org.apache.qpid.server.store.SizeMonitoringSettings; import org.apache.qpid.server.store.StoreException; import org.apache.qpid.server.store.berkeleydb.entry.HierarchyKey; import org.apache.qpid.server.store.berkeleydb.tuple.ConfiguredObjectBinding; @@ -507,7 +507,7 @@ public class BDBConfigurationStore implements MessageStoreProvider, DurableConfi { _parent = parent; - final SizeMonitorSettings sizeMonitorSettings = (SizeMonitorSettings) parent; + final SizeMonitoringSettings sizeMonitorSettings = (SizeMonitoringSettings) parent; _persistentSizeHighThreshold = sizeMonitorSettings.getStoreOverfullSize(); _persistentSizeLowThreshold = sizeMonitorSettings.getStoreUnderfullSize(); diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java index 5b7573c17f..9a3734b5ca 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java @@ -27,7 +27,7 @@ import com.sleepycat.je.DatabaseException; import org.apache.log4j.Logger; import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.store.SizeMonitorSettings; +import org.apache.qpid.server.store.SizeMonitoringSettings; import org.apache.qpid.server.store.StoreException; import org.apache.qpid.util.FileUtils; @@ -67,7 +67,7 @@ public class BDBMessageStore extends AbstractBDBMessageStore { _parent = parent; - final SizeMonitorSettings sizeMonitorSettings = (SizeMonitorSettings) parent; + final SizeMonitoringSettings sizeMonitorSettings = (SizeMonitoringSettings) parent; _persistentSizeHighThreshold = sizeMonitorSettings.getStoreOverfullSize(); _persistentSizeLowThreshold = sizeMonitorSettings.getStoreUnderfullSize(); diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java index 600aa66be6..f231638426 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java @@ -24,10 +24,10 @@ import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.model.DerivedAttribute; import org.apache.qpid.server.model.ManagedAttribute; import org.apache.qpid.server.queue.AMQQueue; -import org.apache.qpid.server.store.SizeMonitorSettings; +import org.apache.qpid.server.store.SizeMonitoringSettings; import org.apache.qpid.server.virtualhost.VirtualHostImpl; -public interface BDBHAVirtualHost> extends VirtualHostImpl, ExchangeImpl>, SizeMonitorSettings +public interface BDBHAVirtualHost> extends VirtualHostImpl, ExchangeImpl>, SizeMonitoringSettings { String REMOTE_TRANSACTION_SYNCHRONIZATION_POLICY = "remoteTransactionSynchronizationPolicy"; String LOCAL_TRANSACTION_SYNCHRONIZATION_POLICY = "localTransactionSynchronizationPolicy"; diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java index 335b39def3..cc0032845f 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java @@ -23,9 +23,10 @@ package org.apache.qpid.server.virtualhost.berkeleydb; import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.model.ManagedAttribute; import org.apache.qpid.server.queue.AMQQueue; +import org.apache.qpid.server.store.SizeMonitoringSettings; import org.apache.qpid.server.virtualhost.VirtualHostImpl; -public interface BDBVirtualHost> extends VirtualHostImpl, ExchangeImpl>, org.apache.qpid.server.store.FileBasedSettings, org.apache.qpid.server.store.SizeMonitorSettings +public interface BDBVirtualHost> extends VirtualHostImpl, ExchangeImpl>, org.apache.qpid.server.store.FileBasedSettings, SizeMonitoringSettings { String STORE_PATH = "storePath"; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/SizeMonitorSettings.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/SizeMonitorSettings.java deleted file mode 100644 index 189e06a6d7..0000000000 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/SizeMonitorSettings.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.qpid.server.store; - -public interface SizeMonitorSettings extends Settings -{ - public Long getStoreUnderfullSize(); - public Long getStoreOverfullSize(); -} diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java index 8f6fbea80f..deb4f1d155 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java @@ -22,8 +22,9 @@ package org.apache.qpid.server.virtualhost; import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.model.ManagedAttribute; import org.apache.qpid.server.queue.AMQQueue; +import org.apache.qpid.server.store.SizeMonitoringSettings; -public interface ProvidedStoreVirtualHost> extends VirtualHostImpl,ExchangeImpl>, org.apache.qpid.server.store.SizeMonitorSettings +public interface ProvidedStoreVirtualHost> extends VirtualHostImpl,ExchangeImpl>, SizeMonitoringSettings { @ManagedAttribute(mandatory = true, defaultValue = "0") Long getStoreUnderfullSize(); diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java index e75a4c8065..6a665a843e 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java +++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java @@ -55,7 +55,7 @@ public abstract class AbstractDerbyMessageStore extends AbstractJDBCMessageStore doOpen(parent); - final SizeMonitorSettings sizeMonitorSettings = (SizeMonitorSettings) parent; + final SizeMonitoringSettings sizeMonitorSettings = (SizeMonitoringSettings) parent; _persistentSizeHighThreshold = sizeMonitorSettings.getStoreOverfullSize(); _persistentSizeLowThreshold = sizeMonitorSettings.getStoreUnderfullSize(); diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java index 4355447971..9411d7906d 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java +++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java @@ -22,9 +22,10 @@ package org.apache.qpid.server.virtualhost.derby; import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.model.ManagedAttribute; import org.apache.qpid.server.queue.AMQQueue; +import org.apache.qpid.server.store.SizeMonitoringSettings; import org.apache.qpid.server.virtualhost.VirtualHostImpl; -public interface DerbyVirtualHost> extends VirtualHostImpl,ExchangeImpl>, org.apache.qpid.server.store.FileBasedSettings, org.apache.qpid.server.store.SizeMonitorSettings +public interface DerbyVirtualHost> extends VirtualHostImpl,ExchangeImpl>, org.apache.qpid.server.store.FileBasedSettings, SizeMonitoringSettings { String STORE_PATH = "storePath"; -- cgit v1.2.1