Solve #894, code refactor (#895)

pom.xml

@@ -25,7 +25,7 @@
     <module>smart-maven-plugins</module>
     <module>smart-common</module>
     <module>smart-metrics</module>
-    <module>smart-actions</module>
+    <module>smart-action</module>
     <module>smart-metastore</module>
     <module>smart-client</module>
     <module>smart-admin</module>
@@ -36,7 +36,7 @@
     <module>smart-agent</module>
     <module>smart-dist</module>
     <module>smart-integration</module>
-    <module>smart-hadoop</module>
+    <module>smart-hadoop-support</module>
   </modules>
 
   <properties>
@@ -71,7 +71,6 @@
       </activation>
       <modules>
         <module>smart-alluxio</module>
-        <module>smart-erasurecode</module>
       </modules>
     </profile>
 

smart-actions/pom.xml → smart-action/pom.xml

@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>smart-actions</artifactId>
+    <artifactId>smart-action</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 

smart-actions/src/main/java/org/smartdata/actions/AbstractActionFactory.java → smart-action/src/main/java/org/smartdata/action/AbstractActionFactory.java

@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions;
+package org.smartdata.action;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.smartdata.actions.annotation.ActionSignature;
+import org.smartdata.action.annotation.ActionSignature;
 
 import java.util.Collections;
 import java.util.HashMap;

smart-actions/src/main/java/org/smartdata/actions/ActionException.java → smart-action/src/main/java/org/smartdata/action/ActionException.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions;
+package org.smartdata.action;
 
 public class ActionException extends Exception {
   public ActionException(String errorMsg) {

smart-actions/src/main/java/org/smartdata/actions/ActionFactory.java → smart-action/src/main/java/org/smartdata/action/ActionFactory.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions;
+package org.smartdata.action;
 
 import java.util.Map;
 

smart-actions/src/main/java/org/smartdata/actions/ActionRegistry.java → smart-action/src/main/java/org/smartdata/action/ActionRegistry.java

@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions;
+package org.smartdata.action;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.smartdata.actions.annotation.ActionSignature;
+import org.smartdata.action.annotation.ActionSignature;
 import org.smartdata.model.ActionDescriptor;
 
 import java.io.IOException;

smart-actions/src/main/java/org/smartdata/actions/ActionType.java → smart-action/src/main/java/org/smartdata/action/ActionType.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions;
+package org.smartdata.action;
 
 /**
  * Internal actions supported.

smart-actions/src/main/java/org/smartdata/actions/HelloAction.java → smart-action/src/main/java/org/smartdata/action/HelloAction.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions;
+package org.smartdata.action;
 
-import org.smartdata.actions.annotation.ActionSignature;
+import org.smartdata.action.annotation.ActionSignature;
 
 @ActionSignature(
   actionId = "hello",

smart-actions/src/main/java/org/smartdata/actions/SmartAction.java → smart-action/src/main/java/org/smartdata/action/SmartAction.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions;
+package org.smartdata.action;
 
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.commons.lang.exception.ExceptionUtils;

smart-actions/src/main/java/org/smartdata/actions/Utils.java → smart-action/src/main/java/org/smartdata/action/Utils.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions;
+package org.smartdata.action;
 
 import java.util.Date;
 

smart-actions/src/main/java/org/smartdata/actions/annotation/ActionSignature.java → smart-action/src/main/java/org/smartdata/action/annotation/ActionSignature.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions.annotation;
+package org.smartdata.action.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

smart-actions/src/test/java/org/smartdata/actions/MockActionStatusReporter.java → smart-action/src/test/java/org/smartdata/action/MockActionStatusReporter.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions;
+package org.smartdata.action;
 
 import org.junit.Assert;
 import org.smartdata.protocol.message.ActionFinished;

smart-alluxio/pom.xml

@@ -75,7 +75,7 @@
         </dependency>
         <dependency>
             <groupId>org.smartdata</groupId>
-            <artifactId>smart-actions</artifactId>
+            <artifactId>smart-action</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
@@ -88,7 +88,7 @@
         </dependency>
         <dependency>
             <groupId>org.smartdata</groupId>
-            <artifactId>smart-actions</artifactId>
+            <artifactId>smart-action</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>test</scope>
             <type>test-jar</type>

smart-alluxio/src/main/java/org/smartdata/actions/alluxio/AlluxioAction.java → smart-alluxio/src/main/java/org/smartdata/action/alluxio/AlluxioAction.java

@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions.alluxio;
+package org.smartdata.action.alluxio;
 
 import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.smartdata.actions.SmartAction;
+import org.smartdata.action.SmartAction;
 
 import alluxio.AlluxioURI;
 import alluxio.client.file.FileSystem;

smart-alluxio/src/main/java/org/smartdata/actions/alluxio/AlluxioActionType.java → smart-alluxio/src/main/java/org/smartdata/action/alluxio/AlluxioActionType.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions.alluxio;
+package org.smartdata.action.alluxio;
 
 public enum AlluxioActionType {
   None(0), // doing nothing

smart-alluxio/src/main/java/org/smartdata/actions/alluxio/AlluxioCopyRunner.java → smart-alluxio/src/main/java/org/smartdata/action/alluxio/AlluxioCopyRunner.java

@@ -15,9 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions.alluxio;
+package org.smartdata.action.alluxio;
 
-import java.io.IOException;
 /*
 import org.smartdata.hdfs.actions.copy.CopyRunner;
 

smart-alluxio/src/main/java/org/smartdata/actions/alluxio/FreeAction.java → smart-alluxio/src/main/java/org/smartdata/action/alluxio/FreeAction.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions.alluxio;
+package org.smartdata.action.alluxio;
 
 import java.util.Map;
 

smart-alluxio/src/main/java/org/smartdata/actions/alluxio/LoadAction.java → smart-alluxio/src/main/java/org/smartdata/action/alluxio/LoadAction.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions.alluxio;
+package org.smartdata.action.alluxio;
 
 import java.util.ArrayList;
 import java.util.List;

smart-alluxio/src/main/java/org/smartdata/actions/alluxio/PersistAction.java → smart-alluxio/src/main/java/org/smartdata/action/alluxio/PersistAction.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions.alluxio;
+package org.smartdata.action.alluxio;
 
 import java.util.ArrayList;
 import java.util.List;

smart-alluxio/src/main/java/org/smartdata/actions/alluxio/PinAction.java → smart-alluxio/src/main/java/org/smartdata/action/alluxio/PinAction.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions.alluxio;
+package org.smartdata.action.alluxio;
 
 import java.util.Map;
 

smart-alluxio/src/main/java/org/smartdata/actions/alluxio/SetTTLAction.java → smart-alluxio/src/main/java/org/smartdata/action/alluxio/SetTTLAction.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions.alluxio;
+package org.smartdata.action.alluxio;
 
 import java.util.Map;
 

smart-alluxio/src/main/java/org/smartdata/actions/alluxio/UnpinAction.java → smart-alluxio/src/main/java/org/smartdata/action/alluxio/UnpinAction.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.actions.alluxio;
+package org.smartdata.action.alluxio;
 
 import java.util.Map;
 

smart-alluxio/src/test/java/org/smartdata/actions/alluxio/TestAlluxioActions.java → smart-alluxio/src/test/java/org/smartdata/action/alluxio/TestAlluxioActions.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.smartdata.actions.alluxio;
+package org.smartdata.action.alluxio;
 
 import static org.junit.Assert.*;
 

smart-alluxio/src/test/java/org/smartdata/actions/alluxio/metric/fetcher/TestAlluxioNamespaceFetcher.java → smart-alluxio/src/test/java/org/smartdata/action/alluxio/metric/fetcher/TestAlluxioNamespaceFetcher.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.smartdata.actions.alluxio.metric.fetcher;
+package org.smartdata.action.alluxio.metric.fetcher;
 
 import alluxio.AlluxioURI;
 import alluxio.client.WriteType;

smart-common/src/main/java/org/smartdata/conf/SmartConfKeys.java

@@ -46,7 +46,7 @@ public class SmartConfKeys {
   public static final String SMART_STATES_UPDATE_SERVICE_KEY = "smart.states.update.service";
   public static final String SMART_STATES_UPDATE_SERVICE_DEFAULT = "org.smartdata.hdfs.HdfsStatesUpdateService";
   public static final String SMART_ACTION_SCHEDULER_SERVICE_KEY = "smart.action.scheduler.service";
-  public static final String SMART_ACTION_SCHEDULER_SERVICE_DEFAULT = "org.smartdata.hdfs.metric.fetcher.MoverPreProcessService";
+  public static final String SMART_ACTION_SCHEDULER_SERVICE_DEFAULT = "org.smartdata.hdfs.scheduler.MoverPreProcessService";
 
   // RuleManager
   public final static String SMART_RULE_EXECUTORS_KEY = "smart.rule.executors";

smart-common/src/main/java/org/smartdata/model/actions/ActionPreProcessor.java → smart-common/src/main/java/org/smartdata/model/action/ActionPreProcessor.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.smartdata.model.actions;
+package org.smartdata.model.action;
 
 import org.smartdata.model.LaunchAction;
 

smart-dist/pom.xml

@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.smartdata</groupId>
-            <artifactId>smart-actions</artifactId>
+            <artifactId>smart-action</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
@@ -92,11 +92,6 @@
                 <jdk>[1.8,)</jdk>
             </activation>
             <dependencies>
-                <dependency>
-                    <groupId>org.smartdata</groupId>
-                    <artifactId>smart-erasurecodec</artifactId>
-                    <version>1.0-SNAPSHOT</version>
-                </dependency>
             </dependencies>
         </profile>
         <profile>

smart-engine/pom.xml

@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.smartdata</groupId>
-            <artifactId>smart-hadoop-base</artifactId>
+            <artifactId>smart-hadoop</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
@@ -60,7 +60,7 @@
         </dependency>
         <dependency>
             <groupId>org.smartdata</groupId>
-            <artifactId>smart-actions</artifactId>
+            <artifactId>smart-action</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>

smart-engine/src/main/java/org/smartdata/server/cluster/HazelcastWorker.java

@@ -24,7 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.smartdata.SmartContext;
-import org.smartdata.actions.ActionException;
+import org.smartdata.action.ActionException;
 import org.smartdata.model.CmdletState;
 import org.smartdata.protocol.message.CmdletStatusUpdate;
 import org.smartdata.server.engine.cmdlet.CmdletExecutor;

smart-engine/src/main/java/org/smartdata/server/engine/CmdletManager.java

@@ -24,9 +24,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.smartdata.AbstractService;
-import org.smartdata.actions.ActionException;
-import org.smartdata.actions.ActionRegistry;
-import org.smartdata.actions.SmartAction;
+import org.smartdata.action.ActionException;
+import org.smartdata.action.ActionRegistry;
+import org.smartdata.action.SmartAction;
 import org.smartdata.hdfs.action.AbstractMoveFileAction;
 import org.smartdata.metastore.MetaStore;
 import org.smartdata.metastore.MetaStoreException;
@@ -44,7 +44,7 @@
 import org.smartdata.server.engine.cmdlet.CmdletDispatcher;
 import org.smartdata.server.engine.cmdlet.CmdletExecutorService;
 import org.smartdata.metastore.ActionPreProcessService;
-import org.smartdata.model.actions.ActionPreProcessor;
+import org.smartdata.model.action.ActionPreProcessor;
 import org.smartdata.model.LaunchAction;
 import org.smartdata.server.engine.cmdlet.message.LaunchCmdlet;
 

smart-engine/src/main/java/org/smartdata/server/engine/RuleManager.java

@@ -20,7 +20,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.smartdata.AbstractService;
-import org.smartdata.actions.ActionRegistry;
+import org.smartdata.action.ActionRegistry;
 import org.smartdata.model.CmdletDescriptor;
 import org.smartdata.model.RuleInfo;
 import org.smartdata.model.RuleState;

smart-engine/src/main/java/org/smartdata/server/engine/cmdlet/Cmdlet.java

@@ -18,7 +18,7 @@
 package org.smartdata.server.engine.cmdlet;
 
 import org.smartdata.model.CmdletState;
-import org.smartdata.actions.SmartAction;
+import org.smartdata.action.SmartAction;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

smart-engine/src/main/java/org/smartdata/server/engine/cmdlet/CmdletExecutor.java

@@ -24,7 +24,7 @@
 import com.google.common.util.concurrent.MoreExecutors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.smartdata.actions.SmartAction;
+import org.smartdata.action.SmartAction;
 import org.smartdata.protocol.message.ActionStatus;
 import org.smartdata.protocol.message.StatusReporter;
 import org.smartdata.protocol.message.ActionStatusReport;

smart-engine/src/main/java/org/smartdata/server/engine/cmdlet/CmdletFactory.java

@@ -20,9 +20,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.smartdata.SmartContext;
-import org.smartdata.actions.ActionException;
-import org.smartdata.actions.ActionRegistry;
-import org.smartdata.actions.SmartAction;
+import org.smartdata.action.ActionException;
+import org.smartdata.action.ActionRegistry;
+import org.smartdata.action.SmartAction;
 import org.smartdata.hdfs.HadoopUtil;
 import org.smartdata.hdfs.action.HdfsAction;
 import org.smartdata.hdfs.client.SmartDFSClient;