small fixes on naming

etl/pom.xml

@@ -38,18 +38,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit4</artifactId>
-                        <version>${surefire.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -77,6 +65,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <!--<plugin>-->
+
+            <!--<groupId>org.apache.maven.plugins</groupId>-->
+            <!--<artifactId>maven-surefire-plugin</artifactId>-->
+            <!--<dependencies>-->
+            <!--<dependency>-->
+            <!--<groupId>org.apache.maven.surefire</groupId>-->
+            <!--<artifactId>surefire-junit4</artifactId>-->
+            <!--<version>${surefire.version}</version>-->
+            <!--</dependency>-->
+            <!--</dependencies>-->
+            <!--</plugin>-->
         </plugins>
     </build>
     <dependencies>
@@ -85,12 +85,12 @@
             <artifactId>orientdb-test-commons</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.testng</groupId>
+                    <artifactId>testng</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

etl/src/main/java/com/orientechnologies/orient/etl/OETLProcessor.java

@@ -110,7 +110,7 @@ public static void main(final String[] args) {
     processor.execute();
   }
 
-  protected static OETLProcessor parseConfigAndParameters(String[] args) {
+  public static OETLProcessor parseConfigAndParameters(String[] args) {
     final OCommandContext context = createDefaultContext();
 
     ODocument configuration = new ODocument().fromJSON("{}");

etl/src/main/java/com/orientechnologies/orient/etl/extractor/OCSVExtractor.java

@@ -22,24 +22,22 @@
  */
 public class OCSVExtractor extends OAbstractSourceExtractor {
 
-  private static String       NULL_STRING     = "NULL";
-  protected OExtractedItem    next;
-  private Map<String, OType>  columnTypes     = new HashMap<String, OType>();
-  private long                skipFrom        = -1;
-  private long                skipTo          = -1;
-  private Character           stringCharacter = '"';
-  private boolean             unicode         = true;
+  private static String NULL_STRING = "NULL";
+  protected OExtractedItem next;
+  private Map<String, OType> columnTypes     = new HashMap<String, OType>();
+  private long               skipFrom        = -1;
+  private long               skipTo          = -1;
+  private Character          stringCharacter = '"';
+  private boolean            unicode         = true;
   private Iterator<CSVRecord> recordIterator;
   private CSVFormat           csvFormat;
-  private String              nullValue       = NULL_STRING;
-  private String              dateFormat      = "yyyy-MM-dd";
+  private String nullValue  = NULL_STRING;
+  private String dateFormat = "yyyy-MM-dd";
 
   @Override
   public ODocument getConfiguration() {
-    return new ODocument()
-        .fromJSON("{parameters:["
-            + getCommonConfigurationParameters()
-            + ",{separator:{optional:true,description:'Column separator'}},"
+    return new ODocument().fromJSON(
+        "{parameters:[" + getCommonConfigurationParameters() + ",{separator:{optional:true,description:'Column separator'}},"
             + "{columnsOnFirstLine:{optional:true,description:'Columns are described in the first line'}},"
             + "{columns:{optional:true,description:'Columns array containing names, and optionally type after : (e.g.: name:String, age:int'}},"
             + "{nullValue:{optional:true,description:'Value to consider as NULL_STRING. Default is NULL'}},"
@@ -69,15 +67,15 @@ public void configure(OETLProcessor iProcessor, ODocument iConfiguration, OComma
     csvFormat = CSVFormat.newFormat(',').withNullString(NULL_STRING).withEscape('\\').withQuote('"');
 
     if (iConfiguration.containsField("predefinedFormat")) {
-      csvFormat = CSVFormat.valueOf(iConfiguration.<String> field("predefinedFormat").toUpperCase());
+      csvFormat = CSVFormat.valueOf(iConfiguration.<String>field("predefinedFormat").toUpperCase());
     }
 
     if (iConfiguration.containsField("separator")) {
       csvFormat = csvFormat.withDelimiter(iConfiguration.field("separator").toString().charAt(0));
     }
 
     if (iConfiguration.containsField("dateFormat")) {
-      dateFormat = iConfiguration.<String> field("dateFormat");
+      dateFormat = iConfiguration.<String>field("dateFormat");
     }
 
     if (iConfiguration.containsField("ignoreEmptyLines")) {
@@ -86,8 +84,8 @@ public void configure(OETLProcessor iProcessor, ODocument iConfiguration, OComma
     }
 
     if (iConfiguration.containsField("columnsOnFirstLine")) {
-      boolean columnsOnFirstLine = (Boolean) iConfiguration.field("columnsOnFirstLine");
-      if (columnsOnFirstLine == true) {
+      Boolean columnsOnFirstLine = (Boolean) iConfiguration.field("columnsOnFirstLine");
+      if (columnsOnFirstLine.equals(Boolean.TRUE)) {
         csvFormat = csvFormat.withHeader();
       }
     } else {
@@ -121,7 +119,7 @@ public void configure(OETLProcessor iProcessor, ODocument iConfiguration, OComma
     }
 
     if (iConfiguration.containsField("nullValue")) {
-      nullValue = iConfiguration.<String> field("nullValue");
+      nullValue = iConfiguration.<String>field("nullValue");
       csvFormat = csvFormat.withNullString(nullValue);
     }
 

etl/src/test/java/com/orientechnologies/orient/etl/ETLBaseTest.java

@@ -32,9 +32,9 @@
  * @author Luca Garulli
  */
 public abstract class ETLBaseTest {
-  protected String[]      names    = new String[] { "Jay", "Luca", "Bill", "Steve", "Jill", "Luigi", "Enrico", "Emanuele" };
-  protected String[]      surnames = new String[] { "Miner", "Ferguson", "Cancelli", "Lavori", "Raggio", "Eagles", "Smiles",
-      "Ironcutter"                };
+  protected String[] names    = new String[] { "Jay", "Luca", "Bill", "Steve", "Jill", "Luigi", "Enrico", "Emanuele" };
+  protected String[] surnames = new String[] { "Miner", "Ferguson", "Cancelli", "Lavori", "Raggio", "Eagles", "Smiles",
+      "Ironcutter" };
 
   protected OrientGraph   graph;
   protected OETLProcessor proc;
@@ -44,7 +44,7 @@ public void setUp() {
     graph = new OrientGraph("memory:ETLBaseTest");
     graph.setUseLightweightEdges(false);
     proc = new OETLProcessor();
-    proc.getFactory().registerLoader(TestLoader.class);
+    proc.getFactory().registerLoader(OETLStubLoader.class);
   }
 
   @After
@@ -53,7 +53,7 @@ public void tearDown() {
   }
 
   protected List<ODocument> getResult() {
-    return ((TestLoader) proc.getLoader()).loadedRecords;
+    return ((OETLStubLoader) proc.getLoader()).loadedRecords;
   }
 
   protected void process(final String cfgJson) {

etl/src/test/java/com/orientechnologies/orient/etl/TestLoader.java → etl/src/test/java/com/orientechnologies/orient/etl/OETLStubLoader.java

@@ -28,14 +28,14 @@
 import java.util.List;
 
 /**
- * ETL Mock loader to check the result in tests.
- * 
+ * ETL Stub loader to check the result in tests.
+ *
  * @author Luca Garulli on 27/11/14.
  */
-public class TestLoader extends OAbstractLoader {
+public class OETLStubLoader extends OAbstractLoader {
   public final List<ODocument> loadedRecords = new ArrayList<ODocument>();
 
-  public TestLoader() {
+  public OETLStubLoader() {
   }
 
   @Override

etl/src/test/java/com/orientechnologies/orient/etl/RandomExtractor.java → etl/src/test/java/com/orientechnologies/orient/etl/OETLStubRandomExtractor.java

@@ -32,7 +32,7 @@
  * 
  * @author Luca Garulli on 27/11/14.
  */
-public class RandomExtractor extends OAbstractExtractor {
+public class OETLStubRandomExtractor extends OAbstractExtractor {
   private long current = 0;
   private int  fields;
   private long items;

etl/src/test/java/com/orientechnologies/orient/etl/extractor/OJsonRandomExtractorTest.java

@@ -24,7 +24,7 @@
 import com.orientechnologies.orient.core.command.OBasicCommandContext;
 import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.etl.ETLBaseTest;
-import com.orientechnologies.orient.etl.RandomExtractor;
+import com.orientechnologies.orient.etl.OETLStubRandomExtractor;
 
 import static org.junit.Assert.assertEquals;
 
@@ -39,7 +39,7 @@ public class OJsonRandomExtractorTest extends ETLBaseTest {
 
   @Ignore
   public void testNonParallel() {
-    proc.getFactory().registerExtractor(RandomExtractor.class);
+    proc.getFactory().registerExtractor(OETLStubRandomExtractor.class);
 
     process("{extractor : { random: {items: " + TOTAL + ", fields: 10} }, "
         + "loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph', class: 'Person', useLightweightEdges:false, "
@@ -56,7 +56,7 @@ public void testNonParallel() {
 
   @Test
   public void testParallel() {
-    proc.getFactory().registerExtractor(RandomExtractor.class);
+    proc.getFactory().registerExtractor(OETLStubRandomExtractor.class);
 
     process("{extractor : { random: {items: " + TOTAL + ", fields: 10, delay: 0} }, "
         + "loader: { orientdb: { dbURL: 'memory:ETLBaseTest', dbType:'graph', class: 'Person', useLightweightEdges:false, "