[TEST] PDI Step LoadSaveTests

pentaho · May 26, 2016 · b5919f0 · b5919f0
1 parent c443da6
commit b5919f0
Show file tree

Hide file tree

Showing 46 changed files with 1,241 additions and 1,255 deletions.
diff --git a/engine/src/org/pentaho/di/trans/steps/checksum/CheckSumMeta.java b/engine/src/org/pentaho/di/trans/steps/checksum/CheckSumMeta.java
@@ -22,6 +22,7 @@
 
 package org.pentaho.di.trans.steps.checksum;
 
+import java.util.Arrays;
 import java.util.List;
 
 import org.pentaho.di.core.CheckResult;
@@ -98,10 +99,19 @@ public CheckSumMeta() {
     super(); // allocate BaseStepMeta
   }
 
+  // TODO Deprecate one of these setCheckSumType methods
   public void setCheckSumType( int i ) {
     checksumtype = checksumtypeCodes[i];
   }
 
+  public void setCheckSumType( String type ) {
+    if ( Arrays.asList( checksumtypeCodes ).contains( type ) ) {
+      checksumtype = type;
+    } else {
+      checksumtype = checksumtypeCodes[0];
+    }
+
+  }
   public int getTypeByDesc() {
     if ( checksumtype == null ) {
       return 0;

diff --git a/engine/src/org/pentaho/di/trans/steps/constant/ConstantMeta.java b/engine/src/org/pentaho/di/trans/steps/constant/ConstantMeta.java
@@ -2,7 +2,7 @@
  *
  * Pentaho Data Integration
  *
- * Copyright (C) 2002-2013 by Pentaho : http://www.pentaho.com
+ * Copyright (C) 2002-2016 by Pentaho : http://www.pentaho.com
  *
  *******************************************************************************
  *
@@ -61,7 +61,7 @@ public class ConstantMeta extends BaseStepMeta implements StepMetaInterface {
   private String[] currency;
   private String[] decimal;
   private String[] group;
-  private String[] value;
+  private String[] value; // Null-if
 
   private String[] fieldName;
   private String[] fieldType;
@@ -182,12 +182,18 @@ public void setFieldType( String[] fieldType ) {
   }
 
   /**
+   * @deprecated use {@link #isEmptyString()} instead
    * @return the setEmptyString
    */
+  @Deprecated
   public boolean[] isSetEmptyString() {
     return setEmptyString;
   }
 
+  public boolean[] isEmptyString() {
+    return setEmptyString;
+  }
+
   /**
    * @param setEmptyString
    *          the setEmptyString to set

diff --git a/engine/src/org/pentaho/di/trans/steps/creditcardvalidator/CreditCardValidatorMeta.java b/engine/src/org/pentaho/di/trans/steps/creditcardvalidator/CreditCardValidatorMeta.java
@@ -184,11 +184,11 @@ public void getFields( RowMetaInterface inputRowMeta, String name, RowMetaInterf
   public String getXML() {
     StringBuilder retval = new StringBuilder();
 
-    retval.append( "    " + XMLHandler.addTagValue( "fieldname", fieldname ) );
-    retval.append( "    " + XMLHandler.addTagValue( "resultfieldname", resultfieldname ) );
-    retval.append( "    " + XMLHandler.addTagValue( "cardtype", cardtype ) );
+    retval.append( "    " ).append( XMLHandler.addTagValue( "fieldname", fieldname ) );
+    retval.append( "    " ).append( XMLHandler.addTagValue( "resultfieldname", resultfieldname ) );
+    retval.append( "    " ).append( XMLHandler.addTagValue( "cardtype", cardtype ) );
     retval.append( "    " ).append( XMLHandler.addTagValue( "onlydigits", onlydigits ) );
-    retval.append( "    " + XMLHandler.addTagValue( "notvalidmsg", notvalidmsg ) );
+    retval.append( "    " ).append( XMLHandler.addTagValue( "notvalidmsg", notvalidmsg ) );
 
     return retval.toString();
   }

diff --git a/engine/src/org/pentaho/di/trans/steps/fileinput/text/TextFileInputMeta.java b/engine/src/org/pentaho/di/trans/steps/fileinput/text/TextFileInputMeta.java
@@ -192,6 +192,7 @@ public static class Content implements Cloneable {
     public void setDateFormatLocale( String locale ) {
       this.dateFormatLocale = new Locale( locale );
     }
+
   }
 
   /** The filters to use... */
@@ -434,9 +435,6 @@ public Object clone() {
       retval.filter[i] = (TextFileFilter) filter[i].clone();
     }
 
-    retval.content.dateFormatLocale = (Locale) content.dateFormatLocale.clone();
-    retval.content.fileCompression = content.fileCompression;
-
     return retval;
   }
 

diff --git a/engine/src/org/pentaho/di/trans/steps/gettablenames/GetTableNamesMeta.java b/engine/src/org/pentaho/di/trans/steps/gettablenames/GetTableNamesMeta.java
@@ -154,10 +154,15 @@ public void setObjectTypeFieldName( String objecttypefieldname ) {
    * @param issystemobjectfieldname
    *          The issystemobjectfieldname to set.
    */
+  // TODO deprecate one of these
   public void setIsSystemObjectFieldName( String issystemobjectfieldname ) {
     this.issystemobjectfieldname = issystemobjectfieldname;
   }
 
+  public void setSystemObjectFieldName( String issystemobjectfieldname ) {
+    this.issystemobjectfieldname = issystemobjectfieldname;
+  }
+
   /**
    * @return Returns the objecttypefieldname.
    */

diff --git a/engine/src/org/pentaho/di/trans/steps/mailvalidator/MailValidatorMeta.java b/engine/src/org/pentaho/di/trans/steps/mailvalidator/MailValidatorMeta.java
@@ -95,10 +95,16 @@ public String getEmailField() {
   }
 
   /**
+   * @deprecated use {@link #setEmailField(String)} instead
    * @param emailfield
    *          The emailfield to set.
    */
+  @Deprecated
   public void setEmailfield( String emailfield ) {
+    setEmailField( emailfield );
+  }
+
+  public void setEmailField( String emailfield ) {
     this.emailfield = emailfield;
   }
 
@@ -126,16 +132,28 @@ public void setEmailValideMsg( String emailValideMsg ) {
   }
 
   /**
+   * @deprecated use {@link #getEmailValideMsg()} instead
    * @return Returns the emailValideMsg.
    */
+  @Deprecated
   public String getEMailValideMsg() {
+    return getEmailValideMsg();
+  }
+
+  public String getEmailValideMsg() {
     return emailValideMsg;
   }
 
   /**
+   * @deprecated use {@link #getEmailNotValideMsg()} instead
    * @return Returns the emailNotValideMsg.
    */
+  @Deprecated
   public String getEMailNotValideMsg() {
+    return getEmailNotValideMsg();
+  }
+
+  public String getEmailNotValideMsg() {
     return emailNotValideMsg;
   }
 
@@ -185,17 +203,29 @@ public void setDefaultSMTP( String defaultSMTP ) {
   }
 
   /**
+   * @deprecated use {@link #getEmailSender()} instead
    * @return Returns the emailSender.
    */
+  @Deprecated
   public String geteMailSender() {
+    return getEmailSender();
+  }
+
+  public String getEmailSender() {
     return emailSender;
   }
 
   /**
+   * @deprecated use {@link #setEmailSender(String)} instead
    * @param emailSender
    *          The emailSender to set.
    */
+  @Deprecated
   public void seteMailSender( String emailSender ) {
+    setEmailSender( emailSender );
+  }
+
+  public void setEmailSender( String emailSender ) {
     this.emailSender = emailSender;
   }
 
@@ -215,17 +245,29 @@ public void setDefaultSMTPField( String defaultSMTPField ) {
   }
 
   /**
+   * @deprecated use {@link #isDynamicDefaultSMTP()} instead
    * @return Returns the isdynamicDefaultSMTP.
    */
+  @Deprecated
   public boolean isdynamicDefaultSMTP() {
+    return isDynamicDefaultSMTP();
+  }
+
+  public boolean isDynamicDefaultSMTP() {
     return isdynamicDefaultSMTP;
   }
 
   /**
+   * @deprecated use {@link #setDynamicDefaultSMTP(boolean)} instead
    * @param isdynamicDefaultSMTP
    *          The isdynamicDefaultSMTP to set.
    */
+  @Deprecated
   public void setdynamicDefaultSMTP( boolean isdynamicDefaultSMTP ) {
+    setDynamicDefaultSMTP( isdynamicDefaultSMTP );
+  }
+
+  public void setDynamicDefaultSMTP( boolean isdynamicDefaultSMTP ) {
     this.isdynamicDefaultSMTP = isdynamicDefaultSMTP;
   }
 

diff --git a/engine/src/org/pentaho/di/trans/steps/processfiles/ProcessFilesMeta.java b/engine/src/org/pentaho/di/trans/steps/processfiles/ProcessFilesMeta.java
@@ -149,7 +149,16 @@ public void setDynamicTargetFileNameField( String targetfilenamefield ) {
     this.targetfilenamefield = targetfilenamefield;
   }
 
+  /**
+   * @deprecated use {@link #isAddTargetFileNameToResult()}
+   * @return
+   */
+  @Deprecated
   public boolean isaddTargetFileNametoResult() {
+    return isAddTargetFileNameToResult();
+  }
+
+  public boolean isAddTargetFileNameToResult() {
     return addresultfilenames;
   }
 
@@ -161,7 +170,16 @@ public boolean isCreateParentFolder() {
     return createparentfolder;
   }
 
+  /**
+   * @deprecated use {@link #setAddTargetFileNameToResult(boolean)}
+   * @param addresultfilenames
+   */
+  @Deprecated
   public void setaddTargetFileNametoResult( boolean addresultfilenames ) {
+    setAddTargetFileNameToResult( addresultfilenames );
+  }
+
+  public void setAddTargetFileNameToResult( boolean addresultfilenames ) {
     this.addresultfilenames = addresultfilenames;
   }
 
@@ -181,16 +199,19 @@ public boolean isSimulate() {
     return this.simulate;
   }
 
+  @Override
   public void loadXML( Node stepnode, List<DatabaseMeta> databases, IMetaStore metaStore ) throws KettleXMLException {
     readData( stepnode, databases );
   }
 
+  @Override
   public Object clone() {
     ProcessFilesMeta retval = (ProcessFilesMeta) super.clone();
 
     return retval;
   }
 
+  @Override
   public void setDefault() {
     addresultfilenames = false;
     overwritetargetfile = false;
@@ -199,6 +220,7 @@ public void setDefault() {
     operationType = OPERATION_TYPE_COPY;
   }
 
+  @Override
   public String getXML() {
     StringBuilder retval = new StringBuilder();
 
@@ -251,6 +273,7 @@ private static int getOperationTypeByCode( String tt ) {
     return 0;
   }
 
+  @Override
   public void readRep( Repository rep, IMetaStore metaStore, ObjectId id_step, List<DatabaseMeta> databases ) throws KettleException {
     try {
       sourcefilenamefield = rep.getStepAttributeString( id_step, "sourcefilenamefield" );
@@ -268,6 +291,7 @@ public void readRep( Repository rep, IMetaStore metaStore, ObjectId id_step, Lis
     }
   }
 
+  @Override
   public void saveRep( Repository rep, IMetaStore metaStore, ObjectId id_transformation, ObjectId id_step ) throws KettleException {
     try {
       rep.saveStepAttribute( id_transformation, id_step, "sourcefilenamefield", sourcefilenamefield );
@@ -284,6 +308,7 @@ public void saveRep( Repository rep, IMetaStore metaStore, ObjectId id_transform
     }
   }
 
+  @Override
   public void check( List<CheckResultInterface> remarks, TransMeta transMeta, StepMeta stepMeta,
     RowMetaInterface prev, String[] input, String[] output, RowMetaInterface info, VariableSpace space,
     Repository repository, IMetaStore metaStore ) {
@@ -325,15 +350,18 @@ public void check( List<CheckResultInterface> remarks, TransMeta transMeta, Step
 
   }
 
+  @Override
   public StepInterface getStep( StepMeta stepMeta, StepDataInterface stepDataInterface, int cnr,
     TransMeta transMeta, Trans trans ) {
     return new ProcessFiles( stepMeta, stepDataInterface, cnr, transMeta, trans );
   }
 
+  @Override
   public StepDataInterface getStepData() {
     return new ProcessFilesData();
   }
 
+  @Override
   public boolean supportsErrorHandling() {
     return true;
   }