You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by ct...@apache.org on 2017/08/18 19:26:55 UTC

[fluo-recipes] branch master updated: Follow documented project import order (#137)

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo-recipes.git


The following commit(s) were added to refs/heads/master by this push:
     new b7ac244  Follow documented project import order (#137)
b7ac244 is described below

commit b7ac244db168433631f79f0802b3bb5609f6acae
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Fri Aug 18 15:23:55 2017 -0400

    Follow documented project import order (#137)
---
 .../fluo/recipes/accumulo/ops/TableOperations.java |  2 +-
 .../recipes/core/export/ExportObserverImpl.java    |  3 +--
 .../org/apache/fluo/recipes/core/map/Update.java   |  3 +--
 .../fluo/recipes/core/common/TestGrouping.java     |  3 +--
 .../recipes/test/export/AccumuloReplicatorIT.java  |  4 ++--
 pom.xml                                            | 24 ++++++++++++++++++++++
 6 files changed, 30 insertions(+), 9 deletions(-)

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 c8d5348..5aaeb57 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
@@ -28,8 +28,8 @@ 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.core.common.TableOptimizations;
 import org.apache.fluo.recipes.core.common.RowRange;
+import org.apache.fluo.recipes.core.common.TableOptimizations;
 import org.apache.fluo.recipes.core.common.TransientRegistry;
 import org.apache.hadoop.io.Text;
 import org.slf4j.Logger;
diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportObserverImpl.java b/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportObserverImpl.java
index c54ecc0..a95125d 100644
--- a/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportObserverImpl.java
+++ b/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportObserverImpl.java
@@ -17,14 +17,13 @@ package org.apache.fluo.recipes.core.export;
 
 import java.util.Iterator;
 
+import com.google.common.collect.Iterators;
 import org.apache.fluo.api.client.TransactionBase;
 import org.apache.fluo.api.data.Bytes;
 import org.apache.fluo.api.data.Column;
 import org.apache.fluo.api.observer.Observer;
 import org.apache.fluo.recipes.core.serialization.SimpleSerializer;
 
-import com.google.common.collect.Iterators;
-
 // This class intentionally package private.
 class ExportObserverImpl<K, V> implements Observer {
 
diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/core/map/Update.java b/modules/core/src/main/java/org/apache/fluo/recipes/core/map/Update.java
index 2c0c891..674f367 100644
--- a/modules/core/src/main/java/org/apache/fluo/recipes/core/map/Update.java
+++ b/modules/core/src/main/java/org/apache/fluo/recipes/core/map/Update.java
@@ -18,9 +18,8 @@ package org.apache.fluo.recipes.core.map;
 import java.util.Iterator;
 import java.util.Optional;
 
-import org.apache.fluo.recipes.core.combine.ChangeObserver.Change;
-
 import com.google.common.collect.Iterators;
+import org.apache.fluo.recipes.core.combine.ChangeObserver.Change;
 
 /**
  * @since 1.0.0
diff --git a/modules/core/src/test/java/org/apache/fluo/recipes/core/common/TestGrouping.java b/modules/core/src/test/java/org/apache/fluo/recipes/core/common/TestGrouping.java
index 4c1d7f7..c690439 100644
--- a/modules/core/src/test/java/org/apache/fluo/recipes/core/common/TestGrouping.java
+++ b/modules/core/src/test/java/org/apache/fluo/recipes/core/common/TestGrouping.java
@@ -19,6 +19,7 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.google.common.collect.ImmutableSet;
 import org.apache.fluo.api.config.FluoConfiguration;
 import org.apache.fluo.api.config.SimpleConfiguration;
 import org.apache.fluo.api.data.Bytes;
@@ -28,8 +29,6 @@ import org.apache.fluo.recipes.core.export.ExportQueue;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-
 public class TestGrouping {
   @Test
   public void testTabletGrouping() {
diff --git a/modules/test/src/test/java/org/apache/fluo/recipes/test/export/AccumuloReplicatorIT.java b/modules/test/src/test/java/org/apache/fluo/recipes/test/export/AccumuloReplicatorIT.java
index c78262e..73dedda 100644
--- a/modules/test/src/test/java/org/apache/fluo/recipes/test/export/AccumuloReplicatorIT.java
+++ b/modules/test/src/test/java/org/apache/fluo/recipes/test/export/AccumuloReplicatorIT.java
@@ -32,12 +32,12 @@ import org.apache.fluo.api.observer.ObserverProvider;
 import org.apache.fluo.recipes.accumulo.export.AccumuloReplicator;
 import org.apache.fluo.recipes.accumulo.export.function.AccumuloExporter;
 import org.apache.fluo.recipes.core.export.ExportQueue;
-import org.apache.fluo.recipes.core.transaction.TxLog;
-import org.apache.fluo.recipes.test.AccumuloExportITBase;
 import org.apache.fluo.recipes.core.transaction.RecordingTransaction;
+import org.apache.fluo.recipes.core.transaction.TxLog;
 import org.apache.fluo.recipes.core.types.StringEncoder;
 import org.apache.fluo.recipes.core.types.TypeLayer;
 import org.apache.fluo.recipes.core.types.TypedTransaction;
+import org.apache.fluo.recipes.test.AccumuloExportITBase;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/pom.xml b/pom.xml
index d406c6f..ad6f6c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,6 +240,18 @@
             </systemPropertyVariables>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>net.revelc.code</groupId>
+          <artifactId>impsort-maven-plugin</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <groups>java.,javax.</groups>
+            <staticAfter>true</staticAfter>
+            <excludes>
+              <exclude>**/thrift/*.java</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -296,6 +308,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>net.revelc.code</groupId>
+        <artifactId>impsort-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>sort-imports</id>
+            <goals>
+              <goal>sort</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <profiles>

-- 
To stop receiving notification emails like this one, please contact
['"commits@fluo.apache.org" <co...@fluo.apache.org>'].