You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2014/01/17 12:01:01 UTC
git commit: simplify ID generator API
Updated Branches:
refs/heads/develop f13182312 -> 5229ba4c2
simplify ID generator API
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/5229ba4c
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/5229ba4c
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/5229ba4c
Branch: refs/heads/develop
Commit: 5229ba4c2af7769944c86260244167a326086598
Parents: f131823
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Jan 17 12:00:58 2014 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Jan 17 12:00:58 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/marmotta/kiwi/generator/IDGenerator.java | 5 +----
.../apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java | 4 +---
.../apache/marmotta/kiwi/generator/UUIDRandomIDGenerator.java | 4 +---
.../org/apache/marmotta/kiwi/generator/UUIDTimeIDGenerator.java | 4 +---
.../org/apache/marmotta/kiwi/persistence/KiWiPersistence.java | 2 +-
.../org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java | 2 +-
.../org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java | 2 +-
7 files changed, 7 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5229ba4c/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGenerator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGenerator.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGenerator.java
index 19a122c..56cf989 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGenerator.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGenerator.java
@@ -17,8 +17,6 @@
package org.apache.marmotta.kiwi.generator;
-import org.apache.marmotta.kiwi.persistence.KiWiPersistence;
-
/**
* An interface for database ID generators.
*
@@ -35,7 +33,6 @@ public interface IDGenerator {
/**
* Shut down this id generator, performing any cleanups that might be necessary.
*
- * @param persistence
*/
- public void shutdown(KiWiPersistence persistence);
+ public void shutdown();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5229ba4c/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java
index 823ae9d..0e74bf7 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java
@@ -17,7 +17,6 @@
package org.apache.marmotta.kiwi.generator;
-import org.apache.marmotta.kiwi.persistence.KiWiPersistence;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -148,10 +147,9 @@ public class SnowflakeIDGenerator implements IDGenerator {
/**
* Shut down this id generator, performing any cleanups that might be necessary.
*
- * @param persistence
*/
@Override
- public void shutdown(KiWiPersistence persistence) {
+ public void shutdown() {
//To change body of implemented methods use File | Settings | File Templates.
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5229ba4c/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDRandomIDGenerator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDRandomIDGenerator.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDRandomIDGenerator.java
index 9ce8b75..3dd0c98 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDRandomIDGenerator.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDRandomIDGenerator.java
@@ -19,7 +19,6 @@ package org.apache.marmotta.kiwi.generator;
import com.fasterxml.uuid.Generators;
import com.fasterxml.uuid.impl.RandomBasedGenerator;
-import org.apache.marmotta.kiwi.persistence.KiWiPersistence;
/**
* Generate a long id using the least significant bits of a secure random UUDI
@@ -38,10 +37,9 @@ public class UUIDRandomIDGenerator implements IDGenerator {
/**
* Shut down this id generator, performing any cleanups that might be necessary.
*
- * @param persistence
*/
@Override
- public void shutdown(KiWiPersistence persistence) {
+ public void shutdown() {
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5229ba4c/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDTimeIDGenerator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDTimeIDGenerator.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDTimeIDGenerator.java
index a91bf61..35142e6 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDTimeIDGenerator.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDTimeIDGenerator.java
@@ -21,7 +21,6 @@ import com.fasterxml.uuid.EthernetAddress;
import com.fasterxml.uuid.Generators;
import com.fasterxml.uuid.ext.FileBasedTimestampSynchronizer;
import com.fasterxml.uuid.impl.TimeBasedGenerator;
-import org.apache.marmotta.kiwi.persistence.KiWiPersistence;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,10 +58,9 @@ public class UUIDTimeIDGenerator implements IDGenerator {
/**
* Shut down this id generator, performing any cleanups that might be necessary.
*
- * @param persistence
*/
@Override
- public void shutdown(KiWiPersistence persistence) {
+ public void shutdown() {
try {
synchronizer.deactivate();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5229ba4c/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
index 0dca557..a3cf60c 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
@@ -463,7 +463,7 @@ public class KiWiPersistence {
log.info("shutting down KiWi persistence ...");
initialized = false;
- idGenerator.shutdown(this);
+ idGenerator.shutdown();
garbageCollector.shutdown();
cacheManager.shutdown();
connectionPool.close();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5229ba4c/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java
index f96627b..250e591 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java
@@ -42,7 +42,7 @@ public class UUIDRandomTest {
@After
public void shutdown() {
- generator.shutdown(null);
+ generator.shutdown();
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5229ba4c/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java
index be37894..4ba92ea 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java
@@ -42,7 +42,7 @@ public class UUIDTimeTest {
@After
public void shutdown() {
- generator.shutdown(null);
+ generator.shutdown();
}
/**