You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/03/14 22:09:58 UTC
qpid-broker-j git commit: QPID-7873: [Broker-J] Code clean-up
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 890c5cec3 -> 06f06e4fb
QPID-7873: [Broker-J] Code clean-up
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/06f06e4f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/06f06e4f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/06f06e4f
Branch: refs/heads/master
Commit: 06f06e4fb8d4afb16355016cfc6e4905652b2f2c
Parents: 890c5ce
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Mar 14 16:25:26 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Mar 14 16:25:26 2018 +0000
----------------------------------------------------------------------
.../berkeleydb/AbstractBDBMessageStore.java | 25 +++++++++++---------
.../store/berkeleydb/BDBConfigurationStore.java | 18 --------------
.../store/berkeleydb/BDBMessageStore.java | 11 +--------
3 files changed, 15 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/06f06e4f/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index 2e148e6..db467293 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -100,9 +100,9 @@ public abstract class AbstractBDBMessageStore implements MessageStore
setInitialValue(1).
setWrap(true).
setCacheSize(100000);
- protected ConfiguredObject<?> _parent;
- protected long _persistentSizeLowThreshold;
- protected long _persistentSizeHighThreshold;
+ private ConfiguredObject<?> _parent;
+ private long _persistentSizeLowThreshold;
+ private long _persistentSizeHighThreshold;
private boolean _limitBusted;
private long _totalStoreSize;
@@ -168,7 +168,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore
}
}
- protected void deleteMessageStoreDatabases()
+ void deleteMessageStoreDatabases()
{
try
{
@@ -208,9 +208,9 @@ public abstract class AbstractBDBMessageStore implements MessageStore
return createStoredBDBMessage(newMessageId, metaData, false);
}
- public <T extends StorableMessageMetaData> StoredBDBMessage<T> createStoredBDBMessage(final long newMessageId,
- final T metaData,
- final boolean recovered)
+ private <T extends StorableMessageMetaData> StoredBDBMessage<T> createStoredBDBMessage(final long newMessageId,
+ final T metaData,
+ final boolean recovered)
{
final StoredBDBMessage<T> message = new StoredBDBMessage<>(newMessageId, metaData, recovered);
_messages.add(message);
@@ -909,7 +909,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore
return getEnvironmentFacade().openDatabase(XID_DB_NAME, DEFAULT_DATABASE_CONFIG);
}
- protected void checkMessageStoreOpen()
+ private void checkMessageStoreOpen()
{
if (!_messageStoreOpen.get())
{
@@ -922,16 +922,19 @@ public abstract class AbstractBDBMessageStore implements MessageStore
return _messageStoreOpen.get();
}
- protected abstract ConfiguredObject<?> getParent();
+ protected final ConfiguredObject<?> getParent()
+ {
+ return _parent;
+ }
protected abstract EnvironmentFacade getEnvironmentFacade();
- protected long getPersistentSizeLowThreshold()
+ private long getPersistentSizeLowThreshold()
{
return _persistentSizeLowThreshold;
}
- protected long getPersistentSizeHighThreshold()
+ private long getPersistentSizeHighThreshold()
{
return _persistentSizeHighThreshold;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/06f06e4f/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
index f4a1e83..8a13d65 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
@@ -597,24 +597,6 @@ public class BDBConfigurationStore implements MessageStoreProvider, DurableConfi
}
@Override
- protected long getPersistentSizeLowThreshold()
- {
- return _persistentSizeLowThreshold;
- }
-
- @Override
- protected long getPersistentSizeHighThreshold()
- {
- return _persistentSizeHighThreshold;
- }
-
- @Override
- protected ConfiguredObject<?> getParent()
- {
- return _parent;
- }
-
- @Override
protected Logger getLogger()
{
return LOGGER;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/06f06e4f/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
index c3e4133..61b0100 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
@@ -21,14 +21,12 @@ package org.apache.qpid.server.store.berkeleydb;
import java.io.File;
-import java.util.concurrent.atomic.AtomicBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.store.FileBasedSettings;
-import org.apache.qpid.server.store.SizeMonitoringSettings;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.util.FileUtils;
@@ -114,17 +112,10 @@ public class BDBMessageStore extends AbstractBDBMessageStore
return LOGGER;
}
-
- @Override
- protected ConfiguredObject<?> getParent()
- {
- return _parent;
- }
-
@Override
public String getStoreLocation()
{
- return ((FileBasedSettings)_parent).getStorePath();
+ return ((FileBasedSettings)getParent()).getStorePath();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org