fluo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject incubator-fluo-recipes git commit: Update to reflect changes in apache/fluo#695
Date Thu, 07 Jul 2016 21:45:52 GMT
Repository: incubator-fluo-recipes
Updated Branches:
  refs/heads/master 640c51716 -> f1dce1499


Update to reflect changes in apache/fluo#695

T


Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/commit/f1dce149
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/tree/f1dce149
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/diff/f1dce149

Branch: refs/heads/master
Commit: f1dce149959260303ce20cfdc8f309eaa13e21d3
Parents: 640c517
Author: Keith Turner <keith@deenlo.com>
Authored: Thu Jul 7 17:18:53 2016 -0400
Committer: Keith Turner <keith@deenlo.com>
Committed: Thu Jul 7 17:29:39 2016 -0400

----------------------------------------------------------------------
 .../recipes/accumulo/cmds/CompactTransient.java     |  4 ++--
 .../recipes/accumulo/export/AccumuloExporter.java   |  6 +++---
 .../fluo/recipes/accumulo/ops/TableOperations.java  |  4 ++--
 .../java/org/apache/fluo/recipes/common/Pirtos.java |  4 ++--
 .../fluo/recipes/common/TransientRegistry.java      |  8 ++++----
 .../org/apache/fluo/recipes/export/ExportQueue.java | 16 ++++++++--------
 .../apache/fluo/recipes/map/CollisionFreeMap.java   | 15 ++++++++-------
 .../recipes/serialization/SimpleSerializer.java     |  6 +++---
 .../fluo/recipes/types/TypedSnapshotBase.java       |  1 -
 .../apache/fluo/recipes/export/GsonSerializer.java  |  4 ++--
 .../org/apache/fluo/recipes/map/TestSerializer.java |  4 ++--
 .../fluo/recipes/kryo/KryoSimplerSerializer.java    |  4 ++--
 12 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/f1dce149/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/cmds/CompactTransient.java
----------------------------------------------------------------------
diff --git a/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/cmds/CompactTransient.java
b/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/cmds/CompactTransient.java
index 092d5d2..7ce53c8 100644
--- a/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/cmds/CompactTransient.java
+++ b/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/cmds/CompactTransient.java
@@ -22,10 +22,10 @@ import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 
-import org.apache.commons.configuration.Configuration;
 import org.apache.fluo.api.client.FluoClient;
 import org.apache.fluo.api.client.FluoFactory;
 import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.config.SimpleConfiguration;
 import org.apache.fluo.recipes.accumulo.ops.TableOperations;
 import org.apache.fluo.recipes.common.RowRange;
 import org.apache.fluo.recipes.common.TransientRegistry;
@@ -111,7 +111,7 @@ public class CompactTransient {
     List<RowRange> transientRanges;
 
     try (FluoClient client = FluoFactory.newClient(fluoConfig)) {
-      Configuration appConfig = client.getAppConfiguration();
+      SimpleConfiguration appConfig = client.getAppConfiguration();
 
       TransientRegistry tr = new TransientRegistry(appConfig);
 

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/f1dce149/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/export/AccumuloExporter.java
----------------------------------------------------------------------
diff --git a/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/export/AccumuloExporter.java
b/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/export/AccumuloExporter.java
index 3990c4d..cd112eb 100644
--- a/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/export/AccumuloExporter.java
+++ b/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/export/AccumuloExporter.java
@@ -19,8 +19,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 
 import org.apache.accumulo.core.data.Mutation;
-import org.apache.commons.configuration.Configuration;
 import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.config.SimpleConfiguration;
 import org.apache.fluo.api.observer.Observer.Context;
 import org.apache.fluo.recipes.export.Exporter;
 import org.apache.fluo.recipes.export.SequencedExport;
@@ -37,7 +37,7 @@ public class AccumuloExporter<K> extends Exporter<K, AccumuloExport<K>>
{
   @Override
   public void init(String queueId, Context context) throws Exception {
 
-    Configuration appConf = context.getAppConfiguration();
+    SimpleConfiguration appConf = context.getAppConfiguration();
 
     String instanceName = appConf.getString("recipes.accumuloExporter." + queueId + ".instance");
     String zookeepers = appConf.getString("recipes.accumuloExporter." + queueId + ".zookeepers");
@@ -50,7 +50,7 @@ public class AccumuloExporter<K> extends Exporter<K, AccumuloExport<K>>
{
   }
 
   public static void setExportTableInfo(FluoConfiguration fconf, String queueId, TableInfo
ti) {
-    Configuration appConf = fconf.getAppConfiguration();
+    SimpleConfiguration appConf = fconf.getAppConfiguration();
     appConf.setProperty("recipes.accumuloExporter." + queueId + ".instance", ti.instanceName);
     appConf.setProperty("recipes.accumuloExporter." + queueId + ".zookeepers", ti.zookeepers);
     appConf.setProperty("recipes.accumuloExporter." + queueId + ".user", ti.user);

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/f1dce149/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/ops/TableOperations.java
----------------------------------------------------------------------
diff --git a/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/ops/TableOperations.java
b/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/ops/TableOperations.java
index 180ab5b..e521014 100644
--- a/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/ops/TableOperations.java
+++ b/modules/accumulo/src/main/java/org/apache/fluo/recipes/accumulo/ops/TableOperations.java
@@ -23,10 +23,10 @@ import org.apache.accumulo.core.client.ClientConfiguration;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.commons.configuration.Configuration;
 import org.apache.fluo.api.client.FluoClient;
 import org.apache.fluo.api.client.FluoFactory;
 import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.config.SimpleConfiguration;
 import org.apache.fluo.api.data.Bytes;
 import org.apache.fluo.recipes.common.Pirtos;
 import org.apache.fluo.recipes.common.RowRange;
@@ -105,7 +105,7 @@ public class TableOperations {
     Connector conn = getConnector(fluoConfig);
 
     try (FluoClient client = FluoFactory.newClient(fluoConfig)) {
-      Configuration appConfig = client.getAppConfiguration();
+      SimpleConfiguration appConfig = client.getAppConfiguration();
 
       TransientRegistry transientRegistry = new TransientRegistry(appConfig);
       List<RowRange> ranges = transientRegistry.getTransientRanges();

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/f1dce149/modules/core/src/main/java/org/apache/fluo/recipes/common/Pirtos.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/common/Pirtos.java b/modules/core/src/main/java/org/apache/fluo/recipes/common/Pirtos.java
index 22147f7..bdb9e60 100644
--- a/modules/core/src/main/java/org/apache/fluo/recipes/common/Pirtos.java
+++ b/modules/core/src/main/java/org/apache/fluo/recipes/common/Pirtos.java
@@ -20,10 +20,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
-import org.apache.commons.configuration.Configuration;
 import org.apache.fluo.api.client.FluoClient;
 import org.apache.fluo.api.client.FluoFactory;
 import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.config.SimpleConfiguration;
 import org.apache.fluo.api.data.Bytes;
 import org.apache.fluo.recipes.export.ExportQueue;
 import org.apache.fluo.recipes.map.CollisionFreeMap;
@@ -71,7 +71,7 @@ public class Pirtos {
    */
   public static Pirtos getConfiguredOptimizations(FluoConfiguration fluoConfig) {
     try (FluoClient client = FluoFactory.newClient(fluoConfig)) {
-      Configuration appConfig = client.getAppConfiguration();
+      SimpleConfiguration appConfig = client.getAppConfiguration();
       Pirtos pirtos = new Pirtos();
 
       pirtos.merge(ExportQueue.getTableOptimizations(appConfig));

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/f1dce149/modules/core/src/main/java/org/apache/fluo/recipes/common/TransientRegistry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/common/TransientRegistry.java
b/modules/core/src/main/java/org/apache/fluo/recipes/common/TransientRegistry.java
index 6168e98..681d783 100644
--- a/modules/core/src/main/java/org/apache/fluo/recipes/common/TransientRegistry.java
+++ b/modules/core/src/main/java/org/apache/fluo/recipes/common/TransientRegistry.java
@@ -21,9 +21,9 @@ import java.util.List;
 
 import javax.xml.bind.DatatypeConverter;
 
-import org.apache.commons.configuration.Configuration;
 import org.apache.fluo.api.client.FluoClient;
 import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.config.SimpleConfiguration;
 import org.apache.fluo.api.data.Bytes;
 
 /**
@@ -33,7 +33,7 @@ import org.apache.fluo.api.data.Bytes;
 
 public class TransientRegistry {
 
-  private Configuration appConfig;
+  private SimpleConfiguration appConfig;
   private static final String PREFIX = "recipes.transientRange.";
 
   /**
@@ -43,7 +43,7 @@ public class TransientRegistry {
    *        {@link FluoClient#getAppConfiguration()} or
    *        {@link org.apache.fluo.api.observer.Observer.Context#getAppConfiguration()}
    */
-  public TransientRegistry(Configuration appConfig) {
+  public TransientRegistry(SimpleConfiguration appConfig) {
     this.appConfig = appConfig;
   }
 
@@ -55,7 +55,7 @@ public class TransientRegistry {
     String start = DatatypeConverter.printHexBinary(range.getStart().toArray());
     String end = DatatypeConverter.printHexBinary(range.getEnd().toArray());
 
-    appConfig.addProperty(PREFIX + id, start + ":" + end);
+    appConfig.setProperty(PREFIX + id, start + ":" + end);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/f1dce149/modules/core/src/main/java/org/apache/fluo/recipes/export/ExportQueue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/export/ExportQueue.java b/modules/core/src/main/java/org/apache/fluo/recipes/export/ExportQueue.java
index c63afe7..13518e7 100644
--- a/modules/core/src/main/java/org/apache/fluo/recipes/export/ExportQueue.java
+++ b/modules/core/src/main/java/org/apache/fluo/recipes/export/ExportQueue.java
@@ -25,10 +25,10 @@ import java.util.regex.Pattern;
 
 import com.google.common.base.Preconditions;
 import com.google.common.hash.Hashing;
-import org.apache.commons.configuration.Configuration;
 import org.apache.fluo.api.client.TransactionBase;
 import org.apache.fluo.api.config.FluoConfiguration;
 import org.apache.fluo.api.config.ObserverConfiguration;
+import org.apache.fluo.api.config.SimpleConfiguration;
 import org.apache.fluo.api.data.Bytes;
 import org.apache.fluo.recipes.common.Pirtos;
 import org.apache.fluo.recipes.common.RowRange;
@@ -83,7 +83,7 @@ public class ExportQueue<K, V> {
   }
 
   public static <K2, V2> ExportQueue<K2, V2> getInstance(String exportQueueId,
-      Configuration appConfig) {
+      SimpleConfiguration appConfig) {
     Options opts = new Options(exportQueueId, appConfig);
     try {
       return new ExportQueue<>(opts, SimpleSerializer.getInstance(appConfig));
@@ -99,7 +99,7 @@ public class ExportQueue<K, V> {
    * @param fluoConfig The configuration that will be used to initialize fluo.
    */
   public static void configure(FluoConfiguration fluoConfig, Options opts) {
-    Configuration appConfig = fluoConfig.getAppConfiguration();
+    SimpleConfiguration appConfig = fluoConfig.getAppConfiguration();
     opts.save(appConfig);
 
     fluoConfig.addObserver(new ObserverConfiguration(ExportObserver.class.getName())
@@ -120,7 +120,7 @@ public class ExportQueue<K, V> {
    *        {@code FluoConfiguration.getAppConfiguration()}
    */
 
-  public static Pirtos getTableOptimizations(Configuration appConfig) {
+  public static Pirtos getTableOptimizations(SimpleConfiguration appConfig) {
     HashSet<String> queueIds = new HashSet<>();
     appConfig.getKeys(Options.PREFIX.substring(0, Options.PREFIX.length() - 1)).forEachRemaining(
         k -> queueIds.add(k.substring(Options.PREFIX.length()).split("\\.", 2)[0]));
@@ -138,7 +138,7 @@ public class ExportQueue<K, V> {
    *        {@code FluoClient.getAppConfiguration()} or
    *        {@code FluoConfiguration.getAppConfiguration()}
    */
-  public static Pirtos getTableOptimizations(String queueId, Configuration appConfig) {
+  public static Pirtos getTableOptimizations(String queueId, SimpleConfiguration appConfig)
{
     Options opts = new Options(queueId, appConfig);
 
     List<Bytes> splits = new ArrayList<>();
@@ -181,7 +181,7 @@ public class ExportQueue<K, V> {
     String exporterType;
     String queueId;
 
-    Options(String queueId, Configuration appConfig) {
+    Options(String queueId, SimpleConfiguration appConfig) {
       this.queueId = queueId;
 
       this.numBuckets = appConfig.getInt(PREFIX + queueId + ".buckets");
@@ -190,7 +190,7 @@ public class ExportQueue<K, V> {
       this.valueType = appConfig.getString(PREFIX + queueId + ".val");
       this.bufferSize = appConfig.getLong(PREFIX + queueId + ".bufferSize", DEFAULT_BUFFER_SIZE);
       this.bucketsPerTablet =
-          appConfig.getInteger(PREFIX + queueId + ".bucketsPerTablet", DEFAULT_BUCKETS_PER_TABLET);
+          appConfig.getInt(PREFIX + queueId + ".bucketsPerTablet", DEFAULT_BUCKETS_PER_TABLET);
     }
 
     public Options(String queueId, String exporterType, String keyType, String valueType,
@@ -256,7 +256,7 @@ public class ExportQueue<K, V> {
       return bucketsPerTablet;
     }
 
-    void save(Configuration appConfig) {
+    void save(SimpleConfiguration appConfig) {
       appConfig.setProperty(PREFIX + queueId + ".buckets", numBuckets + "");
       appConfig.setProperty(PREFIX + queueId + ".exporter", exporterType + "");
       appConfig.setProperty(PREFIX + queueId + ".key", keyType);

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/f1dce149/modules/core/src/main/java/org/apache/fluo/recipes/map/CollisionFreeMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/map/CollisionFreeMap.java
b/modules/core/src/main/java/org/apache/fluo/recipes/map/CollisionFreeMap.java
index 4183fcd..bc7bffd 100644
--- a/modules/core/src/main/java/org/apache/fluo/recipes/map/CollisionFreeMap.java
+++ b/modules/core/src/main/java/org/apache/fluo/recipes/map/CollisionFreeMap.java
@@ -33,12 +33,12 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Sets;
 import com.google.common.hash.Hashing;
-import org.apache.commons.configuration.Configuration;
 import org.apache.fluo.api.client.SnapshotBase;
 import org.apache.fluo.api.client.TransactionBase;
 import org.apache.fluo.api.config.FluoConfiguration;
 import org.apache.fluo.api.config.ObserverConfiguration;
 import org.apache.fluo.api.config.ScannerConfiguration;
+import org.apache.fluo.api.config.SimpleConfiguration;
 import org.apache.fluo.api.data.Bytes;
 import org.apache.fluo.api.data.BytesBuilder;
 import org.apache.fluo.api.data.Column;
@@ -375,7 +375,8 @@ public class CollisionFreeMap<K, V> {
   }
 
 
-  public static <K2, V2> CollisionFreeMap<K2, V2> getInstance(String mapId, Configuration
appConf) {
+  public static <K2, V2> CollisionFreeMap<K2, V2> getInstance(String mapId,
+      SimpleConfiguration appConf) {
     Options opts = new Options(mapId, appConf);
     try {
       return new CollisionFreeMap<>(opts, SimpleSerializer.getInstance(appConf));
@@ -448,7 +449,7 @@ public class CollisionFreeMap<K, V> {
 
     private static final String PREFIX = "recipes.cfm.";
 
-    Options(String mapId, Configuration appConfig) {
+    Options(String mapId, SimpleConfiguration appConfig) {
       this.mapId = mapId;
 
       this.numBuckets = appConfig.getInt(PREFIX + mapId + ".buckets");
@@ -458,7 +459,7 @@ public class CollisionFreeMap<K, V> {
       this.updateObserverType = appConfig.getString(PREFIX + mapId + ".updateObserver", null);
       this.bufferSize = appConfig.getLong(PREFIX + mapId + ".bufferSize", DEFAULT_BUFFER_SIZE);
       this.bucketsPerTablet =
-          appConfig.getInteger(PREFIX + mapId + ".bucketsPerTablet", DEFAULT_BUCKETS_PER_TABLET);
+          appConfig.getInt(PREFIX + mapId + ".bucketsPerTablet", DEFAULT_BUCKETS_PER_TABLET);
     }
 
     public Options(String mapId, String combinerType, String keyType, String valType, int
buckets) {
@@ -544,7 +545,7 @@ public class CollisionFreeMap<K, V> {
           .getName(), buckets);
     }
 
-    void save(Configuration appConfig) {
+    void save(SimpleConfiguration appConfig) {
       appConfig.setProperty(PREFIX + mapId + ".buckets", numBuckets + "");
       appConfig.setProperty(PREFIX + mapId + ".combiner", combinerType + "");
       appConfig.setProperty(PREFIX + mapId + ".key", keyType);
@@ -584,7 +585,7 @@ public class CollisionFreeMap<K, V> {
    *        {@code FluoClient.getAppConfiguration()} or
    *        {@code FluoConfiguration.getAppConfiguration()}
    */
-  public static Pirtos getTableOptimizations(Configuration appConfig) {
+  public static Pirtos getTableOptimizations(SimpleConfiguration appConfig) {
     HashSet<String> mapIds = new HashSet<>();
     appConfig.getKeys(Options.PREFIX.substring(0, Options.PREFIX.length() - 1)).forEachRemaining(
         k -> mapIds.add(k.substring(Options.PREFIX.length()).split("\\.", 2)[0]));
@@ -602,7 +603,7 @@ public class CollisionFreeMap<K, V> {
    *        {@code FluoClient.getAppConfiguration()} or
    *        {@code FluoConfiguration.getAppConfiguration()}
    */
-  public static Pirtos getTableOptimizations(String mapId, Configuration appConfig) {
+  public static Pirtos getTableOptimizations(String mapId, SimpleConfiguration appConfig)
{
     Options opts = new Options(mapId, appConfig);
 
     BytesBuilder rowBuilder = Bytes.newBuilder();

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/f1dce149/modules/core/src/main/java/org/apache/fluo/recipes/serialization/SimpleSerializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/serialization/SimpleSerializer.java
b/modules/core/src/main/java/org/apache/fluo/recipes/serialization/SimpleSerializer.java
index c359514..0d823e2 100644
--- a/modules/core/src/main/java/org/apache/fluo/recipes/serialization/SimpleSerializer.java
+++ b/modules/core/src/main/java/org/apache/fluo/recipes/serialization/SimpleSerializer.java
@@ -15,15 +15,15 @@
 
 package org.apache.fluo.recipes.serialization;
 
-import org.apache.commons.configuration.Configuration;
 import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.config.SimpleConfiguration;
 
 public interface SimpleSerializer {
 
   /**
    * Called immediately after construction and passed Fluo application configuration.
    */
-  public void init(Configuration appConfig);
+  public void init(SimpleConfiguration appConfig);
 
   // TODO refactor to support reuse of objects and byte arrays???
   public <T> byte[] serialize(T obj);
@@ -39,7 +39,7 @@ public interface SimpleSerializer {
     fluoConfig.getAppConfiguration().setProperty("recipes.serializer", serializerType);
   }
 
-  public static SimpleSerializer getInstance(Configuration appConfig) {
+  public static SimpleSerializer getInstance(SimpleConfiguration appConfig) {
     String serType =
         appConfig.getString("recipes.serializer",
             "org.apache.fluo.recipes.kryo.KryoSimplerSerializer");

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/f1dce149/modules/core/src/main/java/org/apache/fluo/recipes/types/TypedSnapshotBase.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/types/TypedSnapshotBase.java
b/modules/core/src/main/java/org/apache/fluo/recipes/types/TypedSnapshotBase.java
index 3c48cc8..30b807f 100644
--- a/modules/core/src/main/java/org/apache/fluo/recipes/types/TypedSnapshotBase.java
+++ b/modules/core/src/main/java/org/apache/fluo/recipes/types/TypedSnapshotBase.java
@@ -26,7 +26,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections.map.DefaultedMap;
 import org.apache.fluo.api.client.SnapshotBase;

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/f1dce149/modules/core/src/test/java/org/apache/fluo/recipes/export/GsonSerializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/fluo/recipes/export/GsonSerializer.java
b/modules/core/src/test/java/org/apache/fluo/recipes/export/GsonSerializer.java
index 4bc4670..61bb833 100644
--- a/modules/core/src/test/java/org/apache/fluo/recipes/export/GsonSerializer.java
+++ b/modules/core/src/test/java/org/apache/fluo/recipes/export/GsonSerializer.java
@@ -18,7 +18,7 @@ package org.apache.fluo.recipes.export;
 import java.nio.charset.StandardCharsets;
 
 import com.google.gson.Gson;
-import org.apache.commons.configuration.Configuration;
+import org.apache.fluo.api.config.SimpleConfiguration;
 import org.apache.fluo.recipes.serialization.SimpleSerializer;
 
 public class GsonSerializer implements SimpleSerializer {
@@ -26,7 +26,7 @@ public class GsonSerializer implements SimpleSerializer {
   private Gson gson = new Gson();
 
   @Override
-  public void init(Configuration appConfig) {
+  public void init(SimpleConfiguration appConfig) {
 
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/f1dce149/modules/core/src/test/java/org/apache/fluo/recipes/map/TestSerializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/fluo/recipes/map/TestSerializer.java b/modules/core/src/test/java/org/apache/fluo/recipes/map/TestSerializer.java
index 9579df6..4143b3f 100644
--- a/modules/core/src/test/java/org/apache/fluo/recipes/map/TestSerializer.java
+++ b/modules/core/src/test/java/org/apache/fluo/recipes/map/TestSerializer.java
@@ -15,7 +15,7 @@
 
 package org.apache.fluo.recipes.map;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.fluo.api.config.SimpleConfiguration;
 import org.apache.fluo.recipes.serialization.SimpleSerializer;
 
 public class TestSerializer implements SimpleSerializer {
@@ -40,6 +40,6 @@ public class TestSerializer implements SimpleSerializer {
   }
 
   @Override
-  public void init(Configuration appConfig) {}
+  public void init(SimpleConfiguration appConfig) {}
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/f1dce149/modules/kryo/src/main/java/org/apache/fluo/recipes/kryo/KryoSimplerSerializer.java
----------------------------------------------------------------------
diff --git a/modules/kryo/src/main/java/org/apache/fluo/recipes/kryo/KryoSimplerSerializer.java
b/modules/kryo/src/main/java/org/apache/fluo/recipes/kryo/KryoSimplerSerializer.java
index aa219b1..1ade68f 100644
--- a/modules/kryo/src/main/java/org/apache/fluo/recipes/kryo/KryoSimplerSerializer.java
+++ b/modules/kryo/src/main/java/org/apache/fluo/recipes/kryo/KryoSimplerSerializer.java
@@ -28,8 +28,8 @@ import com.esotericsoftware.kryo.pool.KryoCallback;
 import com.esotericsoftware.kryo.pool.KryoFactory;
 import com.esotericsoftware.kryo.pool.KryoPool;
 import com.google.common.base.Preconditions;
-import org.apache.commons.configuration.Configuration;
 import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.config.SimpleConfiguration;
 import org.apache.fluo.recipes.serialization.SimpleSerializer;
 
 public class KryoSimplerSerializer implements SimpleSerializer, Serializable {
@@ -96,7 +96,7 @@ public class KryoSimplerSerializer implements SimpleSerializer, Serializable
{
   }
 
   @Override
-  public void init(Configuration appConfig) {
+  public void init(SimpleConfiguration appConfig) {
     Preconditions.checkArgument(factory == null && factoryType == null, "Already
initialized");
     factoryType = appConfig.getString(KRYO_FACTORY_PROP, DefaultFactory.class.getName());
   }


Mime
View raw message