Merge pull request #44 from keith-turner/api-update
Changes for updates in Fluo API
diff --git a/pom.xml b/pom.xml
index 2464c34..1c66a0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<url>https://github.com/astralway/stresso</url>
<properties>
- <accumulo.version>1.6.4</accumulo.version>
+ <accumulo.version>1.7.2</accumulo.version>
<hadoop.version>2.6.3</hadoop.version>
<fluo.version>1.0.0-incubating-SNAPSHOT</fluo.version>
<fluo-recipes.version>1.0.0-incubating-SNAPSHOT</fluo-recipes.version>
diff --git a/src/test/java/stresso/TrieBasicIT.java b/src/test/java/stresso/TrieBasicIT.java
index ba4867c..c227efa 100644
--- a/src/test/java/stresso/TrieBasicIT.java
+++ b/src/test/java/stresso/TrieBasicIT.java
@@ -22,7 +22,7 @@
import org.apache.fluo.api.client.FluoClient;
import org.apache.fluo.api.client.FluoFactory;
import org.apache.fluo.api.client.LoaderExecutor;
-import org.apache.fluo.api.config.ObserverConfiguration;
+import org.apache.fluo.api.config.ObserverSpecification;
import org.apache.fluo.api.config.SimpleConfiguration;
import org.apache.fluo.integration.ITBaseMini;
import org.apache.fluo.recipes.core.types.TypedSnapshot;
@@ -46,8 +46,8 @@
private static final Logger log = LoggerFactory.getLogger(TrieBasicIT.class);
@Override
- protected List<ObserverConfiguration> getObservers() {
- return Collections.singletonList(new ObserverConfiguration(NodeObserver.class.getName()));
+ protected List<ObserverSpecification> getObservers() {
+ return Collections.singletonList(new ObserverSpecification(NodeObserver.class.getName()));
}
@Override
diff --git a/src/test/java/stresso/TrieMapRedIT.java b/src/test/java/stresso/TrieMapRedIT.java
index c6338e6..ad26539 100644
--- a/src/test/java/stresso/TrieMapRedIT.java
+++ b/src/test/java/stresso/TrieMapRedIT.java
@@ -20,7 +20,7 @@
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.apache.fluo.api.config.ObserverConfiguration;
+import org.apache.fluo.api.config.ObserverSpecification;
import org.apache.fluo.api.config.SimpleConfiguration;
import org.apache.fluo.integration.ITBaseMini;
import org.apache.hadoop.util.ToolRunner;
@@ -40,8 +40,8 @@
public class TrieMapRedIT extends ITBaseMini {
@Override
- protected List<ObserverConfiguration> getObservers() {
- return Collections.singletonList(new ObserverConfiguration(NodeObserver.class.getName()));
+ protected List<ObserverSpecification> getObservers() {
+ return Collections.singletonList(new ObserverSpecification(NodeObserver.class.getName()));
}
@Override
diff --git a/src/test/java/stresso/TrieStopLevelIT.java b/src/test/java/stresso/TrieStopLevelIT.java
index a9f6901..dc838d2 100644
--- a/src/test/java/stresso/TrieStopLevelIT.java
+++ b/src/test/java/stresso/TrieStopLevelIT.java
@@ -18,7 +18,7 @@
import java.util.List;
import org.apache.fluo.api.client.Snapshot;
-import org.apache.fluo.api.config.ObserverConfiguration;
+import org.apache.fluo.api.config.ObserverSpecification;
import org.apache.fluo.api.config.SimpleConfiguration;
import org.apache.fluo.api.data.Bytes;
import org.junit.Assert;
@@ -30,8 +30,8 @@
public class TrieStopLevelIT extends TrieMapRedIT {
@Override
- protected List<ObserverConfiguration> getObservers() {
- return Collections.singletonList(new ObserverConfiguration(NodeObserver.class.getName()));
+ protected List<ObserverSpecification> getObservers() {
+ return Collections.singletonList(new ObserverSpecification(NodeObserver.class.getName()));
}
@Override