From 7c6e0c349cc5dfa0b5e3a7a90b427ac68ffd2e01 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 23 Sep 2011 15:33:41 +0100
Subject: [PATCH] Extracted constants from DatabaseComponent interface.
---
api/net/sf/briar/api/db/DatabaseComponent.java | 10 ----------
.../net/sf/briar/db/DatabaseComponentImpl.java | 6 ++++++
components/net/sf/briar/db/DatabaseConstants.java | 14 ++++++++++++++
components/net/sf/briar/db/JdbcDatabase.java | 3 +--
.../net/sf/briar/db/DatabaseComponentImplTest.java | 4 ++--
5 files changed, 23 insertions(+), 14 deletions(-)
create mode 100644 components/net/sf/briar/db/DatabaseConstants.java
diff --git a/api/net/sf/briar/api/db/DatabaseComponent.java b/api/net/sf/briar/api/db/DatabaseComponent.java
index 8f54a123fe..43ea3ae54f 100644
--- a/api/net/sf/briar/api/db/DatabaseComponent.java
+++ b/api/net/sf/briar/api/db/DatabaseComponent.java
@@ -30,16 +30,6 @@ import net.sf.briar.api.transport.ConnectionWindow;
*/
public interface DatabaseComponent {
- static final int MEGABYTES = 1024 * 1024;
-
- // FIXME: These should be configurable
- static final long MIN_FREE_SPACE = 300L * MEGABYTES;
- static final long CRITICAL_FREE_SPACE = 100L * MEGABYTES;
- static final int MAX_BYTES_BETWEEN_SPACE_CHECKS = 5 * MEGABYTES;
- static final long MAX_MS_BETWEEN_SPACE_CHECKS = 60L * 1000L; // 1 min
- static final int BYTES_PER_SWEEP = 5 * MEGABYTES;
- static final long EXPIRY_MODULUS = 60L * 60L * 1000L; // 1 hour
-
/**
* Opens the database.
* @param resume True to reopen an existing database or false to create a
diff --git a/components/net/sf/briar/db/DatabaseComponentImpl.java b/components/net/sf/briar/db/DatabaseComponentImpl.java
index 1a004e350b..97e3a66fab 100644
--- a/components/net/sf/briar/db/DatabaseComponentImpl.java
+++ b/components/net/sf/briar/db/DatabaseComponentImpl.java
@@ -1,5 +1,11 @@
package net.sf.briar.db;
+import static net.sf.briar.db.DatabaseConstants.BYTES_PER_SWEEP;
+import static net.sf.briar.db.DatabaseConstants.CRITICAL_FREE_SPACE;
+import static net.sf.briar.db.DatabaseConstants.MAX_BYTES_BETWEEN_SPACE_CHECKS;
+import static net.sf.briar.db.DatabaseConstants.MAX_MS_BETWEEN_SPACE_CHECKS;
+import static net.sf.briar.db.DatabaseConstants.MIN_FREE_SPACE;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.BitSet;
diff --git a/components/net/sf/briar/db/DatabaseConstants.java b/components/net/sf/briar/db/DatabaseConstants.java
new file mode 100644
index 0000000000..54b4feebc7
--- /dev/null
+++ b/components/net/sf/briar/db/DatabaseConstants.java
@@ -0,0 +1,14 @@
+package net.sf.briar.db;
+
+interface DatabaseConstants {
+
+ static final int MEGABYTE = 1024 * 1024;
+
+ // FIXME: These should be configurable
+ static final long MIN_FREE_SPACE = 300L * MEGABYTE;
+ static final long CRITICAL_FREE_SPACE = 100L * MEGABYTE;
+ static final int MAX_BYTES_BETWEEN_SPACE_CHECKS = 5 * MEGABYTE;
+ static final long MAX_MS_BETWEEN_SPACE_CHECKS = 60L * 1000L; // 1 min
+ static final int BYTES_PER_SWEEP = 5 * MEGABYTE;
+ static final long EXPIRY_MODULUS = 60L * 60L * 1000L; // 1 hour
+}
diff --git a/components/net/sf/briar/db/JdbcDatabase.java b/components/net/sf/briar/db/JdbcDatabase.java
index 0a34ff0699..a93a42d026 100644
--- a/components/net/sf/briar/db/JdbcDatabase.java
+++ b/components/net/sf/briar/db/JdbcDatabase.java
@@ -21,7 +21,6 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.Rating;
-import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.Status;
import net.sf.briar.api.protocol.AuthorId;
@@ -1509,7 +1508,7 @@ abstract class JdbcDatabase implements Database<Connection> {
rs = ps.executeQuery();
if(rs.next()) {
timestamp = rs.getLong(1);
- timestamp -= timestamp % DatabaseComponent.EXPIRY_MODULUS;
+ timestamp -= timestamp % DatabaseConstants.EXPIRY_MODULUS;
}
if(rs.next()) throw new DbStateException();
rs.close();
diff --git a/test/net/sf/briar/db/DatabaseComponentImplTest.java b/test/net/sf/briar/db/DatabaseComponentImplTest.java
index 3c351f3a11..6578ed1c48 100644
--- a/test/net/sf/briar/db/DatabaseComponentImplTest.java
+++ b/test/net/sf/briar/db/DatabaseComponentImplTest.java
@@ -1,7 +1,7 @@
package net.sf.briar.db;
-import static net.sf.briar.api.db.DatabaseComponent.BYTES_PER_SWEEP;
-import static net.sf.briar.api.db.DatabaseComponent.MIN_FREE_SPACE;
+import static net.sf.briar.db.DatabaseConstants.BYTES_PER_SWEEP;
+import static net.sf.briar.db.DatabaseConstants.MIN_FREE_SPACE;
import java.util.Collections;
--
GitLab