Skip to content

Commit

Permalink
[BACKLOG-38435] Code changes for moving Mail Validator from core to p…
Browse files Browse the repository at this point in the history
…lugin. (pentaho#9031)

Co-authored-by: Peter Rinehart <[email protected]>
  • Loading branch information
ssindhu23 and peterrinehart authored Sep 22, 2023
1 parent 2e6e348 commit e83ddad
Show file tree
Hide file tree
Showing 39 changed files with 592 additions and 37 deletions.
6 changes: 3 additions & 3 deletions assemblies/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
<pentaho-s3-vfs-plugin.version>${project.version}</pentaho-s3-vfs-plugin.version>
<pdi-avro-format-plugin.version>${project.version}</pdi-avro-format-plugin.version>
<mail-plugin.version>${project.version}</mail-plugin.version>
<mail-validator-job-plugin.version>${project.version}</mail-validator-job-plugin.version>
<pentaho-metaverse.version>10.1.0.0-SNAPSHOT</pentaho-metaverse.version>
<pdi-xml-plugin.version>10.1.0.0-SNAPSHOT</pdi-xml-plugin.version>
<pdi-json-plugin.version>10.1.0.0-SNAPSHOT</pdi-json-plugin.version>
Expand All @@ -75,6 +74,7 @@
<connected-to-repository-plugin.version>${project.version}</connected-to-repository-plugin.version>
<export-repository-plugin.version>${project.version}</export-repository-plugin.version>
<ftp-delete-plugin.version>${project.version}</ftp-delete-plugin.version>
<mail-validator-plugin.version>${project.version}</mail-validator-plugin.version>
<email-messages-plugin.version>${project.version}</email-messages-plugin.version>
<put-a-file-with-ftp-plugin.version>${project.version}</put-a-file-with-ftp-plugin.version>
<get-file-with-ftp.version>${project.version}</get-file-with-ftp.version>
Expand Down Expand Up @@ -215,8 +215,8 @@
</dependency>
<dependency>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>mail-validator-job-plugins</artifactId>
<version>${mail-validator-job-plugin.version}</version>
<artifactId>mail-validator-plugins</artifactId>
<version>${mail-validator-plugin.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
Expand Down
1 change: 0 additions & 1 deletion engine/src/main/resources/kettle-steps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
<step id="FileExists"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.FileExists</description> <classname>org.pentaho.di.trans.steps.fileexists.FileExistsMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Lookup</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.FileExists</tooltip> <iconfile>ui/images/FEX.svg</iconfile> <documentation_url>Products/File_exists_(Step)</documentation_url> <cases_url/> <forum_url/> </step>
<step id="RandomValue"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.RandomValue</description> <classname>org.pentaho.di.trans.steps.randomvalue.RandomValueMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Input</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.RandomValue</tooltip> <iconfile>ui/images/RVA.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Generate+Random+Value</documentation_url> <cases_url/> <forum_url/> </step>
<step id="GetSubFolders"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.GetSubFolders</description> <classname>org.pentaho.di.trans.steps.getsubfolders.GetSubFoldersMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Input</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.GetSubFolders</tooltip> <iconfile>ui/images/LSF.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Get+SubFolder+names</documentation_url> <cases_url/> <forum_url/> </step>
<step id="MailValidator"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.MailValidator</description> <classname>org.pentaho.di.trans.steps.mailvalidator.MailValidatorMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Validation</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.MailValidator</tooltip> <iconfile>ui/images/MAV.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Mail+Validator</documentation_url> <cases_url/> <forum_url/> </step>
<step id="ProcessFiles"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.ProcessFiles</description> <classname>org.pentaho.di.trans.steps.processfiles.ProcessFilesMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Utility</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.ProcessFiles</tooltip> <iconfile>ui/images/PPF.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Process+files</documentation_url> <cases_url/> <forum_url/> </step>
<step id="DetectLastRow"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.DetectLastRow</description> <classname>org.pentaho.di.trans.steps.detectlastrow.DetectLastRowMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Flow</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.DetectLastRow</tooltip> <iconfile>ui/images/DLR.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Identify+last+row+in+a+stream</documentation_url> <cases_url/> <forum_url/> </step>
<step id="DetectEmptyStream"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.DetectEmptyStream</description> <classname>org.pentaho.di.trans.steps.detectemptystream.DetectEmptyStreamMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Flow</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.DetectEmptyStream</tooltip> <iconfile>ui/images/EMS.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Detect+empty+stream</documentation_url> <cases_url/> <forum_url/> </step>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ BaseStep.TypeTooltipDesc.MondrianInput=Execute and retrieve data using an MDX qu
BaseStep.TypeTooltipDesc.OlapInput=Execute and retrieve data using an MDX query against any XML/A OLAP datasource using olap4j
BaseStep.Log.ErrorInThreadSleeping=Interupted while trying to put a new row in a buffer\:
BaseStep.TypeTooltipDesc.Update=Update data in a database table based upon keys
BaseStep.TypeTooltipDesc.MailValidator=Check if an email address is valid.
BaseStep.TypeLongDesc.DatabaseJoin=Database join
BaseStep.Log.AllowedRelationships=Only 1-1, 1-n, n-1 and n-n relationships are allowed\!
BaseStep.TypeLongDesc.StepMetastructure=Metadata structure of stream
Expand Down Expand Up @@ -276,7 +275,6 @@ BaseStep.TypeTooltipDesc.CopyRowsToResult=Use this step to write rows to the exe
BaseStep.TypeTooltipDesc.MapValues=Maps values of a certain field from one value to another
BaseStepDialog.Cancel=&Cancel
BaseStep.TypeLongDesc.SynchronizeAfterMerge=Synchronize after merge
BaseStep.TypeLongDesc.MailValidator=Mail validator
BaseStep.TypeTooltipDesc.Uniquerows=Remove double rows and leave only unique occurrences.\nThis works only on a sorted input.\nIf the input is not sorted, only double consecutive rows are handled correctly.
BaseStep.TypeLongDesc.XMLOutput=XML output
BaseStep.TypeTooltipDesc.Janino=Calculate the result of a Java Expression using Janino
Expand Down
2 changes: 1 addition & 1 deletion plugins/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ __List of the current core plugins:__
* hl7
* json
* mail
* mail-validator-job
* palo
* s3csvinput
* sap
Expand Down Expand Up @@ -49,6 +48,7 @@ __List of the current core plugins:__
* connected-to-repository
* export-repository
* ftp-delete
* mail-validator
* email-messages
* put-a-file-with-ftp
* get-file-with-ftp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,29 @@

<parent>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>mail-validator-job-assemblies</artifactId>
<artifactId>mail-validator-assemblies</artifactId>
<version>10.1.0.0-SNAPSHOT</version>
</parent>


<artifactId>mail-validator-job-plugins</artifactId>
<artifactId>mail-validator-plugins</artifactId>
<version>10.1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Mail Validator Job Plugins Distribution</name>
<name>PDI Mail Validator Plugins Distribution</name>
<description></description>
<properties>
<resources.directory>${project.basedir}/src/main/resources</resources.directory>
</properties>
<dependencies>
<dependency>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>mail-validator-job-plugins-impl</artifactId>
<artifactId>mail-validator-plugins-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>mail-validator-job-plugins-ui</artifactId>
<artifactId>mail-validator-plugins-ui</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand All @@ -47,7 +47,7 @@
<configuration>
<outputDirectory>${project.build.directory}/assembly/lib</outputDirectory>
<includeScope>compile</includeScope>
<excludeArtifactIds>mail-validator-job-plugins-impl,mail-validator-job-plugins-ui</excludeArtifactIds>
<excludeArtifactIds>mail-validator-plugins-impl,mail-validator-plugins-ui</excludeArtifactIds>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>mail-validator-job-plugin</id>
<id>mail-validator-plugin</id>
<formats>
<format>zip</format>
</formats>
<baseDirectory>mail-validator-job-plugins</baseDirectory>
<baseDirectory>mail-validator-plugins</baseDirectory>

<files>
<file>
Expand Down Expand Up @@ -32,8 +32,8 @@
<dependencySet>
<outputDirectory>.</outputDirectory>
<includes>
<include>org.pentaho.di.plugins:mail-validator-job-plugins-impl:jar</include>
<include>org.pentaho.di.plugins:mail-validator-job-plugins-ui:jar</include>
<include>org.pentaho.di.plugins:mail-validator-plugins-impl:jar</include>
<include>org.pentaho.di.plugins:mail-validator-plugins-ui:jar</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

<parent>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>mail-validator-job</artifactId>
<artifactId>mail-validator</artifactId>
<version>10.1.0.0-SNAPSHOT</version>
</parent>

<artifactId>mail-validator-job-assemblies</artifactId>
<artifactId>mail-validator-assemblies</artifactId>
<version>10.1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Mail Validator Job Plugins Assemblies</name>
<name>PDI Mail Validator Plugins Assemblies</name>

<modules>
<module>plugin</module>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

<parent>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>mail-validator-job</artifactId>
<artifactId>mail-validator</artifactId>
<version>10.1.0.0-SNAPSHOT</version>
</parent>

<artifactId>mail-validator-job-plugins-impl</artifactId>
<artifactId>mail-validator-plugins-impl</artifactId>
<name>PDI Mail Validator Job Plugins Impl</name>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* Pentaho Data Integration
*
* Copyright (C) 2002-2017 by Hitachi Vantara : http://www.pentaho.com
* Copyright (C) 2002-2023 by Hitachi Vantara : http://www.pentaho.com
*
*******************************************************************************
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* Pentaho Data Integration
*
* Copyright (C) 2002-2017 by Hitachi Vantara : http://www.pentaho.com
* Copyright (C) 2002-2023 by Hitachi Vantara : http://www.pentaho.com
*
*******************************************************************************
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* Pentaho Data Integration
*
* Copyright (C) 2002-2017 by Hitachi Vantara : http://www.pentaho.com
* Copyright (C) 2002-2023 by Hitachi Vantara : http://www.pentaho.com
*
*******************************************************************************
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* Pentaho Data Integration
*
* Copyright (C) 2002-2017 by Hitachi Vantara : http://www.pentaho.com
* Copyright (C) 2002-2023 by Hitachi Vantara : http://www.pentaho.com
*
*******************************************************************************
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* Pentaho Data Integration
*
* Copyright (C) 2002-2017 by Hitachi Vantara : http://www.pentaho.com
* Copyright (C) 2002-2023 by Hitachi Vantara : http://www.pentaho.com
*
*******************************************************************************
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* Pentaho Data Integration
*
* Copyright (C) 2002-2017 by Hitachi Vantara : http://www.pentaho.com
* Copyright (C) 2002-2023 by Hitachi Vantara : http://www.pentaho.com
*
*******************************************************************************
*
Expand Down Expand Up @@ -49,12 +49,19 @@
import org.pentaho.di.trans.step.StepMetaInterface;
import org.pentaho.metastore.api.IMetaStore;
import org.w3c.dom.Node;
import org.pentaho.di.core.annotations.Step;

/*
* Created on 03-Juin-2008
*
*/

@Step(id = "MailValidator", name = "BaseStep.TypeLongDesc.MailValidator",
i18nPackageName = "org.pentaho.di.trans.step.mailvalidator",
description = "BaseStep.TypeTooltipDesc.MailValidator",
categoryDescription = "i18n:org.pentaho.di.trans.step:BaseStep.Category.Validation",
image = "ui/images/MAV.svg",
documentationUrl = "http://wiki.pentaho.com/display/EAI/Mail+Validator")
public class MailValidatorMeta extends BaseStepMeta implements StepMetaInterface {
private static Class<?> PKG = MailValidatorMeta.class; // for i18n purposes, needed by Translator2!!

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
#File generated by Hitachi Vantara Translator for package 'org.pentaho.di.trans.steps.MailValidator' in locale 'en_US'
#
#
#Thu Jun 19 19:10:46 CEST 2008

BaseStep.TypeLongDesc.MailValidator=Mail validator
BaseStep.TypeTooltipDesc.MailValidator=Check if an email address is valid.
MailValidatorDialog.Shell.Title=Mail validator
MailValidatorDialog.FailedToGetFields.DialogMessage=Unable to get fields from previous steps because of an error
MailValidatorMeta.Exception.UnexpectedErrorReadingStepInfo=Unexpected error reading step information from the repository
MailValidatorDialog.Stepname.Label=Step name
MailValidator.Log.UnexpectedError=Unexpected error in ''
MailValidatorDialog.emailFieldName.Label=email fieldname
MailValidatorDialog.FailedToGetFields.DialogTitle=Get fields failed
MailValidator.LineNumber=linenr {0}
MailValidatorMeta.CheckResult.TableFieldOK=Table fieldname is provided
MailValidator.ErrorInStepRunning=Because of an error, this step can''t continue\:
MailValidator.Log.ErrorFindingField=Error finding field\:
MailValidatorMeta.Exception.UnableToSaveStepInfo=Unable to save step information to the repository for id_step\=
MailValidatorMeta.CheckResult.CouldNotReadFields=Couldn''t read fields from the previous step.

MailValidatorMeta.CheckResult.NoInpuReceived=No input received from other steps\!
MailValidator.Exception.CouldnotFindField=Couldn''t find field ''{0}'' in row\!
MailValidatorMeta.CheckResult.ReceivingInfoFromOtherSteps=Step is receiving info from other steps.
MailValidatorDialog.ResultField.Label=Result fieldname
MailValidatorDialog.ResultField.Tooltip=Result fieldname

MailValidator.Error.FilenameFieldMissing=Filename is missing\!
MailValidatorMeta.CheckResult.ResultFieldMissing=Result fieldname is missing\!
MailValidatorMeta.CheckResult.ResultFieldOk=Result fieldname was specified.

MailValidatorMeta.CheckResult.ErrorOccurred=An error occurred\:

MailValidatorMeta.Exception.UnableToReadStepInfo=Unable to read step information from XML
MailValidatorMeta.CheckResult.eMailFieldMissing=Email field name is missing\!
MailValidatorMeta.CheckResult.eMailFieldOK=Email field name was specified
MailValidatorDialog.ResultGroup.label=Result
MailValidatorDialog.ResultAsString.Label=Result is a string
MailValidatorDialog.ResultAsString.Tooltip=Result is a string
MailValidatorDialog.ResultStringTrueField.Label=Email is valid
MailValidatorDialog.ResultStringTrueField.Tooltip=display when email address is valid
MailValidatorDialog.ResultStringFalseField.Label=Email is not valid
MailValidatorDialog.ResultStringFalseField.Tooltip=display when email is not valid
MailValidatorMeta.CheckResult.eMailValidMsgMissing=eMail valid message is missing!
MailValidatorMeta.CheckResult.eMailValidMsgOk=eMail valid message was specified.
MailValidatorMeta.CheckResult.eMailNotValidMsgMissing=eMail not valid message is missing!
MailValidatorMeta.CheckResult.eMailNotValidMsgOk=eMail not valid message was specified.
MailValidatorDialog.ErrorMsgField.Label=Errors field
MailValidatorDialog.ErrorMsgField.Tooltip=Errors field
MailValidator.Error.ResultFieldNameMissing=Result fieldname is missing or empty!
MailValidatorDialog.SettingsGroup.Label=Settings
MailValidatorDialog.SMTPCheck.Label=SMTP check?
MailValidatorDialog.SMTPCheck.Tooltip=If you select this option, PDI will perform a SMTP check.\nBy default, only the mail structure will be checked.
MailValidatorDialog.eMailSenderField.Label=Email sender
MailValidatorDialog.eMailSenderField.Tooltip=This address will be used when performing SMTP check.
MailValidatorDialog.TimeOutField.Label=Time out (milliseconds)
MailValidatorDialog.TimeOutField.Tooltip=In order to perform a SMTP check, PDI will open a socket.\nSpecify here the timeout in milliseconds.
MailValidatorDialog.DefaultSMTPField.Label=Default SMTP server
MailValidatorDialog.DefaultSMTPField.Tooltip=When PDI perform a SMTP check,\nit extracts exhangers list from email's domain name.\nDepending on the size of the list, the process can last.\nIf you know which SMTP server to query, please specify it as default SMTP server\nin that case, PDI will query only this server.
MailValidatorMeta.CheckResult.eMailSenderMissing=Email sender is missing!
MailValidatorMeta.CheckResult.eMailSenderOk=Email sender was specified.
MailValidatorDialog.dynamicDefaultSMTP.Label=dynamic default SMTP?
MailValidatorDialog.dynamicDefaultSMTP.Tooltip=Select this option if you want to get dynamically\ndefault SMTP server.You must select below the field that contain value.
MailValidatorDialog.defaultSMTPField.Label=Default SMTP field
MailValidatorMeta.CheckResult.dynamicDefaultSMTPFieldMissing=Dynamic default SMTP field is missing!
MailValidatorMeta.CheckResult.dynamicDefaultSMTPFieldOk=Dynamic default SMTP field was specified.
MailValidator.Error.EmailValidMsgMissing=Email valid message is empty!
MailValidatorMeta.CheckResult.EmailValidMsgOk=Email valid message was specified.
MailValidator.Error.EmailNotValidMsgMissing=Email not valid message is empty!
MailValidatorMeta.CheckResult.EmailNotValidMsgOk=Email not valid message was specified.
MailValidator.Error.EMailValidMsgMissing=Email valid message is empty!
MailValidator.Error.EMailNotValidMsgMissing=Email not valid message is empty!
MailValidator.NoMatchName=No match for name '{0}'
MailValidator.MalformedAddress=Malformed address {0}!
MailValidator.ClassName=Email Validator
MailValidator.NoMachinesInDomain=We do not find machines for domain : {0}!
MailValidator.ErrorGettingMachinesInDomain=Error getting machines : {0}
MailValidator.ExchangersFound=We found {0} exchanger(s).
MailValidator.TryingExchanger=Trying Exchanger : {0} ...
MailValidator.InvalidHeader=Invalid header
MailValidator.SayHello= 1°) Let''s say Hello to server : EHLO {0}
MailValidator.CheckSender= 2°) Let''s check sender. MAIL FROM: <{0}>
MailValidator.ServerReplied=Server successfully replied : {0}
MailValidator.SenderRejected=Sender rejected
MailValidator.SenderAccepted=Sender accepted : {0}
MailValidator.CheckReceiver=3°) Let''s check receiver. RCPT TO: <{0}>
MailValidator.AddressNotValid=Address : {0} is not valid!
MailValidator.ReceiverAccepted=Receiver {0} accepted : {1}

MailValidator.Error.DefaultSMTPFieldMissing=Default SMTP server is missing!
MailValidator.Error.ResultFieldMissing=Result fieldname is missing!
MailValidatorMeta.CheckResult.EmailNotValidMsgMissing=EMail not valid message is missing!
MailValidatorMeta.CheckResult.EmailValidMsgMissing=EMail valid message is missing!
MailValidator.Error.MailEmpty=Email address is empty!
MailValidator.ConnectingTo=Connecting to {0} on port {1} ...{2}
Loading

0 comments on commit e83ddad

Please sign in to comment.