diff --git a/.github/workflows/pr_build_code.yml b/.github/workflows/pr_build_code.yml index 8d2f92f4801..7fdd5df6450 100644 --- a/.github/workflows/pr_build_code.yml +++ b/.github/workflows/pr_build_code.yml @@ -49,5 +49,7 @@ jobs: ${{ runner.os }}- - name: RAT Check run: mvn clean apache-rat:check + - name: Checkstyle + run: mvn clean checkstyle:check - name: Build with Maven run: MAVEN_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"; mvn clean install -T 1C -B -C -e -fae -V -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2 -Dassemblies=false -Djacoco.skip=true --file pom.xml diff --git a/engine/src/main/java/org/apache/hop/run/HopRun.java b/engine/src/main/java/org/apache/hop/run/HopRun.java index 2e1221e7438..58ca1169477 100644 --- a/engine/src/main/java/org/apache/hop/run/HopRun.java +++ b/engine/src/main/java/org/apache/hop/run/HopRun.java @@ -17,6 +17,10 @@ package org.apache.hop.run; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Map; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.hop.IExecutionConfiguration; @@ -29,7 +33,12 @@ import org.apache.hop.core.exception.HopException; import org.apache.hop.core.extension.ExtensionPointHandler; import org.apache.hop.core.extension.HopExtensionPoint; -import org.apache.hop.core.logging.*; +import org.apache.hop.core.logging.FileLoggingEventListener; +import org.apache.hop.core.logging.HopLogStore; +import org.apache.hop.core.logging.ILogChannel; +import org.apache.hop.core.logging.LogChannel; +import org.apache.hop.core.logging.LogLevel; +import org.apache.hop.core.logging.LoggingObject; import org.apache.hop.core.metadata.SerializableMetadataProvider; import org.apache.hop.core.parameters.INamedParameterDefinitions; import org.apache.hop.core.parameters.INamedParameters; @@ -63,11 +72,6 @@ import picocli.CommandLine.Option; import picocli.CommandLine.ParameterException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.Map; - @Command(versionProvider = HopVersionProvider.class) public class HopRun implements Runnable, IHasHopMetadataProvider { diff --git a/plugins/actions/mailvalidator/src/main/java/org/apache/hop/workflow/actions/mailvalidator/ActionMailValidatorDialog.java b/plugins/actions/mailvalidator/src/main/java/org/apache/hop/workflow/actions/mailvalidator/ActionMailValidatorDialog.java index f37db9af71a..3783699cdf6 100644 --- a/plugins/actions/mailvalidator/src/main/java/org/apache/hop/workflow/actions/mailvalidator/ActionMailValidatorDialog.java +++ b/plugins/actions/mailvalidator/src/main/java/org/apache/hop/workflow/actions/mailvalidator/ActionMailValidatorDialog.java @@ -39,7 +39,12 @@ import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.*; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.MessageBox; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; public class ActionMailValidatorDialog extends ActionDialog implements IActionDialog { private static final Class PKG = ActionMailValidator.class; // For Translator diff --git a/plugins/actions/mailvalidator/src/main/java/org/apache/hop/workflow/actions/mailvalidator/MailValidation.java b/plugins/actions/mailvalidator/src/main/java/org/apache/hop/workflow/actions/mailvalidator/MailValidation.java index b9cc4fd0239..d41990970bf 100644 --- a/plugins/actions/mailvalidator/src/main/java/org/apache/hop/workflow/actions/mailvalidator/MailValidation.java +++ b/plugins/actions/mailvalidator/src/main/java/org/apache/hop/workflow/actions/mailvalidator/MailValidation.java @@ -17,7 +17,11 @@ package org.apache.hop.workflow.actions.mailvalidator; -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.net.Socket; import java.util.ArrayList; import java.util.Hashtable; diff --git a/plugins/actions/truncatetables/src/test/java/org/apache/hop/workflow/actions/truncatetables/ActionTruncateTablesLoadSaveTest.java b/plugins/actions/truncatetables/src/test/java/org/apache/hop/workflow/actions/truncatetables/ActionTruncateTablesLoadSaveTest.java index d6daed0fe74..0f35feffbf9 100644 --- a/plugins/actions/truncatetables/src/test/java/org/apache/hop/workflow/actions/truncatetables/ActionTruncateTablesLoadSaveTest.java +++ b/plugins/actions/truncatetables/src/test/java/org/apache/hop/workflow/actions/truncatetables/ActionTruncateTablesLoadSaveTest.java @@ -17,7 +17,12 @@ package org.apache.hop.workflow.actions.truncatetables; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.UUID; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.hop.junit.rules.RestoreHopEngineEnvironment; import org.apache.hop.pipeline.transforms.loadsave.validator.IFieldLoadSaveValidator; diff --git a/plugins/engines/beam/src/main/java/org/apache/hop/beam/engines/spark/BeamSparkPipelineRunConfiguration.java b/plugins/engines/beam/src/main/java/org/apache/hop/beam/engines/spark/BeamSparkPipelineRunConfiguration.java index 1c36ccbab6e..68ef7e2d68f 100644 --- a/plugins/engines/beam/src/main/java/org/apache/hop/beam/engines/spark/BeamSparkPipelineRunConfiguration.java +++ b/plugins/engines/beam/src/main/java/org/apache/hop/beam/engines/spark/BeamSparkPipelineRunConfiguration.java @@ -36,7 +36,7 @@ import java.util.Arrays; import org.apache.beam.runners.spark.SparkPipelineOptions; -import org.apache.beam.sdk.io.azure.options.*; +import org.apache.beam.sdk.io.azure.options.BlobstoreOptions; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.commons.lang.StringUtils; diff --git a/plugins/tech/azure/src/main/java/org/apache/hop/vfs/azure/AzureFileObject.java b/plugins/tech/azure/src/main/java/org/apache/hop/vfs/azure/AzureFileObject.java index db024dfef14..c577e83fe9b 100644 --- a/plugins/tech/azure/src/main/java/org/apache/hop/vfs/azure/AzureFileObject.java +++ b/plugins/tech/azure/src/main/java/org/apache/hop/vfs/azure/AzureFileObject.java @@ -19,14 +19,13 @@ package org.apache.hop.vfs.azure; import com.microsoft.azure.storage.StorageException; -import com.microsoft.azure.storage.blob.*; -import org.apache.commons.vfs2.FileObject; -import org.apache.commons.vfs2.FileSystemException; -import org.apache.commons.vfs2.FileType; -import org.apache.commons.vfs2.provider.AbstractFileName; -import org.apache.commons.vfs2.provider.AbstractFileObject; -import org.apache.commons.vfs2.provider.UriParser; - +import com.microsoft.azure.storage.blob.CloudAppendBlob; +import com.microsoft.azure.storage.blob.CloudBlob; +import com.microsoft.azure.storage.blob.CloudBlobClient; +import com.microsoft.azure.storage.blob.CloudBlobContainer; +import com.microsoft.azure.storage.blob.CloudBlobDirectory; +import com.microsoft.azure.storage.blob.CloudBlockBlob; +import com.microsoft.azure.storage.blob.ListBlobItem; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -38,6 +37,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileType; +import org.apache.commons.vfs2.provider.AbstractFileName; +import org.apache.commons.vfs2.provider.AbstractFileObject; +import org.apache.commons.vfs2.provider.UriParser; public class AzureFileObject extends AbstractFileObject { diff --git a/plugins/tech/azure/src/test/java/org/apache/hop/vfs/azure/AzureFileNameParserTest.java b/plugins/tech/azure/src/test/java/org/apache/hop/vfs/azure/AzureFileNameParserTest.java index 7f1655b0fb0..7c8f714686d 100644 --- a/plugins/tech/azure/src/test/java/org/apache/hop/vfs/azure/AzureFileNameParserTest.java +++ b/plugins/tech/azure/src/test/java/org/apache/hop/vfs/azure/AzureFileNameParserTest.java @@ -17,19 +17,17 @@ package org.apache.hop.vfs.azure; +import java.util.Arrays; +import java.util.Collection; import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.FileType; import org.apache.commons.vfs2.provider.VfsComponentContext; +import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.mockito.Mockito; - -import java.util.Arrays; -import java.util.Collection; - -import static org.junit.Assert.*; @RunWith(Parameterized.class) public class AzureFileNameParserTest { diff --git a/plugins/tech/google/src/main/java/org/apache/hop/pipeline/transforms/googlesheets/GoogleSheetsCredentials.java b/plugins/tech/google/src/main/java/org/apache/hop/pipeline/transforms/googlesheets/GoogleSheetsCredentials.java index 6768f4041c2..5d682977287 100644 --- a/plugins/tech/google/src/main/java/org/apache/hop/pipeline/transforms/googlesheets/GoogleSheetsCredentials.java +++ b/plugins/tech/google/src/main/java/org/apache/hop/pipeline/transforms/googlesheets/GoogleSheetsCredentials.java @@ -17,23 +17,18 @@ */ package org.apache.hop.pipeline.transforms.googlesheets; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; -import com.google.api.services.sqladmin.*; - +import com.google.api.client.http.HttpRequest; +import com.google.api.client.http.HttpRequestInitializer; +import com.google.api.services.sqladmin.SQLAdminScopes; import com.google.auth.http.HttpCredentialsAdapter; import com.google.auth.oauth2.GoogleCredentials; -import com.google.api.client.http.HttpRequestInitializer; -import com.google.api.client.http.*; - -import org.apache.commons.lang.StringUtils; -import org.apache.hop.core.exception.HopFileException; -import org.apache.hop.core.vfs.HopVfs; - import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.util.Collections; +import org.apache.commons.lang.StringUtils; +import org.apache.hop.core.exception.HopFileException; +import org.apache.hop.core.vfs.HopVfs; /** Describe your transform plugin. */ public class GoogleSheetsCredentials { diff --git a/plugins/transforms/excel/src/main/java/org/apache/hop/pipeline/transforms/excelinput/ExcelInputDialog.java b/plugins/transforms/excel/src/main/java/org/apache/hop/pipeline/transforms/excelinput/ExcelInputDialog.java index dc11aac7940..9f54bcbb8cd 100644 --- a/plugins/transforms/excel/src/main/java/org/apache/hop/pipeline/transforms/excelinput/ExcelInputDialog.java +++ b/plugins/transforms/excel/src/main/java/org/apache/hop/pipeline/transforms/excelinput/ExcelInputDialog.java @@ -46,8 +46,12 @@ import org.apache.hop.pipeline.transform.BaseTransformMeta; import org.apache.hop.pipeline.transform.ITransformDialog; import org.apache.hop.pipeline.transform.TransformMeta; +import static org.apache.hop.pipeline.transforms.excelinput.ExcelInputMeta.EIFile; +import static org.apache.hop.pipeline.transforms.excelinput.ExcelInputMeta.EISheet; +import static org.apache.hop.pipeline.transforms.excelinput.ExcelInputMeta.RequiredFilesCode; import org.apache.hop.pipeline.transforms.fileinput.text.DirectoryDialogButtonListenerFactory; import org.apache.hop.staticschema.metadata.SchemaDefinition; +import org.apache.hop.staticschema.util.SchemaDefinitionUtil; import org.apache.hop.ui.core.PropsUi; import org.apache.hop.ui.core.dialog.BaseDialog; import org.apache.hop.ui.core.dialog.EnterListDialog; @@ -58,7 +62,11 @@ import org.apache.hop.ui.core.dialog.MessageBox; import org.apache.hop.ui.core.dialog.PreviewRowsDialog; import org.apache.hop.ui.core.gui.GuiResource; -import org.apache.hop.ui.core.widget.*; +import org.apache.hop.ui.core.widget.ColumnInfo; +import org.apache.hop.ui.core.widget.MetaSelectionLine; +import org.apache.hop.ui.core.widget.TableView; +import org.apache.hop.ui.core.widget.TextVar; +import org.apache.hop.ui.core.widget.VariableButtonListenerFactory; import org.apache.hop.ui.pipeline.dialog.PipelinePreviewProgressDialog; import org.apache.hop.ui.pipeline.transform.BaseTransformDialog; import org.apache.hop.ui.pipeline.transform.ComponentSelectionListener; @@ -81,12 +89,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; -import org.apache.hop.staticschema.util.SchemaDefinitionUtil; -import org.apache.hop.staticschema.metadata.SchemaDefinition; - -import static org.apache.hop.pipeline.transforms.excelinput.ExcelInputMeta.EIFile; -import static org.apache.hop.pipeline.transforms.excelinput.ExcelInputMeta.EISheet; -import static org.apache.hop.pipeline.transforms.excelinput.ExcelInputMeta.RequiredFilesCode; public class ExcelInputDialog extends BaseTransformDialog implements ITransformDialog { private static final Class PKG = ExcelInputMeta.class; // For Translator diff --git a/plugins/transforms/excel/src/main/java/org/apache/hop/pipeline/transforms/excelwriter/ExcelWriterTransformDialog.java b/plugins/transforms/excel/src/main/java/org/apache/hop/pipeline/transforms/excelwriter/ExcelWriterTransformDialog.java index 320b55438be..a207f3b661d 100644 --- a/plugins/transforms/excel/src/main/java/org/apache/hop/pipeline/transforms/excelwriter/ExcelWriterTransformDialog.java +++ b/plugins/transforms/excel/src/main/java/org/apache/hop/pipeline/transforms/excelwriter/ExcelWriterTransformDialog.java @@ -17,6 +17,10 @@ package org.apache.hop.pipeline.transforms.excelwriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.apache.hop.core.Const; import org.apache.hop.core.Props; import org.apache.hop.core.exception.HopException; @@ -25,7 +29,6 @@ import org.apache.hop.core.row.IRowMeta; import org.apache.hop.core.row.IValueMeta; import org.apache.hop.core.row.value.ValueMetaFactory; -import org.apache.hop.core.row.value.ValueMetaString; import org.apache.hop.core.util.Utils; import org.apache.hop.core.variables.IVariables; import org.apache.hop.i18n.BaseMessages; @@ -42,7 +45,12 @@ import org.apache.hop.ui.core.dialog.ErrorDialog; import org.apache.hop.ui.core.dialog.MessageBox; import org.apache.hop.ui.core.gui.GuiResource; -import org.apache.hop.ui.core.widget.*; +import org.apache.hop.ui.core.widget.ColumnInfo; +import org.apache.hop.ui.core.widget.ComboVar; +import org.apache.hop.ui.core.widget.MetaSelectionLine; +import org.apache.hop.ui.core.widget.PasswordTextVar; +import org.apache.hop.ui.core.widget.TableView; +import org.apache.hop.ui.core.widget.TextVar; import org.apache.hop.ui.pipeline.transform.BaseTransformDialog; import org.apache.hop.ui.pipeline.transform.ITableItemInsertListener; import org.apache.poi.ss.usermodel.BuiltinFormats; @@ -51,7 +59,12 @@ import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.custom.ScrolledComposite; -import org.eclipse.swt.events.*; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; @@ -64,11 +77,6 @@ import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - public class ExcelWriterTransformDialog extends BaseTransformDialog implements ITransformDialog { private static final Class PKG = ExcelWriterTransformMeta.class; // For Translator diff --git a/plugins/transforms/filemetadata/src/main/java/org/apache/hop/pipeline/transforms/filemetadata/FileMetadataDialog.java b/plugins/transforms/filemetadata/src/main/java/org/apache/hop/pipeline/transforms/filemetadata/FileMetadataDialog.java index 4b9fbd84807..340382ced62 100644 --- a/plugins/transforms/filemetadata/src/main/java/org/apache/hop/pipeline/transforms/filemetadata/FileMetadataDialog.java +++ b/plugins/transforms/filemetadata/src/main/java/org/apache/hop/pipeline/transforms/filemetadata/FileMetadataDialog.java @@ -17,6 +17,9 @@ package org.apache.hop.pipeline.transforms.filemetadata; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; import org.apache.hop.core.Const; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.row.IRowMeta; @@ -25,6 +28,7 @@ import org.apache.hop.pipeline.PipelineMeta; import org.apache.hop.pipeline.transform.BaseTransformMeta; import org.apache.hop.pipeline.transform.ITransformDialog; +import static org.apache.hop.pipeline.transforms.filemetadata.FileMetadataMeta.FMCandidate; import org.apache.hop.ui.core.PropsUi; import org.apache.hop.ui.core.dialog.BaseDialog; import org.apache.hop.ui.core.dialog.ErrorDialog; @@ -35,18 +39,22 @@ import org.apache.hop.ui.pipeline.transform.BaseTransformDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; -import org.eclipse.swt.events.*; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.*; - -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; - -import static org.apache.hop.pipeline.transforms.filemetadata.FileMetadataMeta.FMCandidate; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Text; /** */ public class FileMetadataDialog extends BaseTransformDialog implements ITransformDialog { diff --git a/plugins/transforms/jdbc-metadata/src/main/java/org/apache/pipeline/transform/jdbcmetadata/JdbcMetadata.java b/plugins/transforms/jdbc-metadata/src/main/java/org/apache/pipeline/transform/jdbcmetadata/JdbcMetadata.java index c7574663868..66a13445681 100644 --- a/plugins/transforms/jdbc-metadata/src/main/java/org/apache/pipeline/transform/jdbcmetadata/JdbcMetadata.java +++ b/plugins/transforms/jdbc-metadata/src/main/java/org/apache/pipeline/transform/jdbcmetadata/JdbcMetadata.java @@ -19,7 +19,11 @@ import java.lang.reflect.Array; import java.lang.reflect.Method; -import java.sql.*; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.sql.Types; import java.util.List; import org.apache.hop.core.database.Database; import org.apache.hop.core.database.DatabaseMeta; diff --git a/plugins/transforms/jdbc-metadata/src/main/java/org/apache/pipeline/transform/jdbcmetadata/JdbcMetadataDialog.java b/plugins/transforms/jdbc-metadata/src/main/java/org/apache/pipeline/transform/jdbcmetadata/JdbcMetadataDialog.java index bf10a252c3b..033a1332ea7 100644 --- a/plugins/transforms/jdbc-metadata/src/main/java/org/apache/pipeline/transform/jdbcmetadata/JdbcMetadataDialog.java +++ b/plugins/transforms/jdbc-metadata/src/main/java/org/apache/pipeline/transform/jdbcmetadata/JdbcMetadataDialog.java @@ -17,6 +17,8 @@ package org.apache.pipeline.transform.jdbcmetadata; +import java.util.ArrayList; +import java.util.List; import org.apache.hop.core.Const; import org.apache.hop.core.Props; import org.apache.hop.core.database.DatabaseMeta; @@ -45,10 +47,15 @@ import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.*; - -import java.util.ArrayList; -import java.util.List; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Text; public class JdbcMetadataDialog extends BaseTransformDialog implements ITransformDialog { private static final Class PKG = JdbcMetadataMeta.class; // for i18n purposes diff --git a/plugins/transforms/json/src/test/java/org/apache/hop/pipeline/transforms/jsonoutput/JsonOutputTest.java b/plugins/transforms/json/src/test/java/org/apache/hop/pipeline/transforms/jsonoutput/JsonOutputTest.java index 2519b704b10..a739455b192 100644 --- a/plugins/transforms/json/src/test/java/org/apache/hop/pipeline/transforms/jsonoutput/JsonOutputTest.java +++ b/plugins/transforms/json/src/test/java/org/apache/hop/pipeline/transforms/jsonoutput/JsonOutputTest.java @@ -19,6 +19,11 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.File; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import junit.framework.TestCase; import org.apache.commons.io.FileUtils; import org.apache.hop.TestUtilities; @@ -47,15 +52,15 @@ import org.apache.hop.pipeline.transforms.rowgenerator.RowGeneratorMeta; import org.json.simple.JSONObject; import org.junit.Assert; - -import java.io.File; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import static org.mockito.Matchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class JsonOutputTest extends TestCase { diff --git a/plugins/transforms/memgroupby/src/test/java/org/apache/hop/pipeline/transforms/memgroupby/MemoryGroupByMetaTest.java b/plugins/transforms/memgroupby/src/test/java/org/apache/hop/pipeline/transforms/memgroupby/MemoryGroupByMetaTest.java index 7dd6e843220..98cf7af62d8 100644 --- a/plugins/transforms/memgroupby/src/test/java/org/apache/hop/pipeline/transforms/memgroupby/MemoryGroupByMetaTest.java +++ b/plugins/transforms/memgroupby/src/test/java/org/apache/hop/pipeline/transforms/memgroupby/MemoryGroupByMetaTest.java @@ -16,6 +16,8 @@ */ package org.apache.hop.pipeline.transforms.memgroupby; +import java.util.Arrays; +import java.util.List; import org.apache.hop.core.HopEnvironment; import org.apache.hop.core.plugins.PluginRegistry; import org.apache.hop.core.row.IRowMeta; @@ -32,15 +34,28 @@ import org.apache.hop.core.row.value.ValueMetaTimestamp; import org.apache.hop.core.variables.Variables; import org.apache.hop.pipeline.transform.TransformSerializationTestUtil; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.Average; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.ConcatComma; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.ConcatString; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.CountAll; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.CountAny; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.CountDistinct; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.First; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.FirstIncludingNull; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.Last; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.LastIncludingNull; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.Maximum; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.Median; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.Minimum; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.Percentile; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.StandardDeviation; +import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.Sum; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; -import java.util.Arrays; -import java.util.List; - -import static org.apache.hop.pipeline.transforms.memgroupby.MemoryGroupByMeta.GroupType.*; -import static org.junit.Assert.*; - public class MemoryGroupByMetaTest { @Before diff --git a/plugins/transforms/replacestring/src/test/java/org/apache/hop/pipeline/transforms/replacestring/ReplaceStringTest.java b/plugins/transforms/replacestring/src/test/java/org/apache/hop/pipeline/transforms/replacestring/ReplaceStringTest.java index f981fd6cd68..733bea641eb 100644 --- a/plugins/transforms/replacestring/src/test/java/org/apache/hop/pipeline/transforms/replacestring/ReplaceStringTest.java +++ b/plugins/transforms/replacestring/src/test/java/org/apache/hop/pipeline/transforms/replacestring/ReplaceStringTest.java @@ -17,6 +17,8 @@ package org.apache.hop.pipeline.transforms.replacestring; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.apache.hop.core.logging.ILoggingObject; import org.apache.hop.core.row.IRowMeta; import org.apache.hop.core.row.RowMeta; @@ -24,17 +26,15 @@ import org.apache.hop.pipeline.transforms.mock.TransformMockHelper; import org.junit.After; import org.junit.Assert; +import static org.junit.Assert.assertArrayEquals; import org.junit.Before; import org.junit.Test; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static org.junit.Assert.assertArrayEquals; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** User: Dzmitry Stsiapanau Date: 1/31/14 Time: 11:19 AM */ public class ReplaceStringTest { diff --git a/plugins/transforms/salesforce/src/main/java/org/apache/hop/pipeline/transforms/salesforceinput/SalesforceInputDialog.java b/plugins/transforms/salesforce/src/main/java/org/apache/hop/pipeline/transforms/salesforceinput/SalesforceInputDialog.java index b76c7710a70..a6a6a3c9f0f 100644 --- a/plugins/transforms/salesforce/src/main/java/org/apache/hop/pipeline/transforms/salesforceinput/SalesforceInputDialog.java +++ b/plugins/transforms/salesforce/src/main/java/org/apache/hop/pipeline/transforms/salesforceinput/SalesforceInputDialog.java @@ -20,6 +20,8 @@ import com.sforce.soap.partner.Field; import com.sforce.soap.partner.sobject.SObject; import com.sforce.ws.bind.XmlObject; +import java.util.HashSet; +import java.util.Set; import org.apache.hop.core.Const; import org.apache.hop.core.Props; import org.apache.hop.core.exception.HopException; @@ -37,7 +39,12 @@ import org.apache.hop.pipeline.transforms.salesforce.SalesforceTransformDialog; import org.apache.hop.pipeline.transforms.salesforce.SalesforceTransformMeta; import org.apache.hop.ui.core.PropsUi; -import org.apache.hop.ui.core.dialog.*; +import org.apache.hop.ui.core.dialog.BaseDialog; +import org.apache.hop.ui.core.dialog.EnterNumberDialog; +import org.apache.hop.ui.core.dialog.EnterTextDialog; +import org.apache.hop.ui.core.dialog.ErrorDialog; +import org.apache.hop.ui.core.dialog.MessageBox; +import org.apache.hop.ui.core.dialog.PreviewRowsDialog; import org.apache.hop.ui.core.gui.GuiResource; import org.apache.hop.ui.core.widget.ColumnInfo; import org.apache.hop.ui.core.widget.ComboVar; @@ -78,9 +85,6 @@ import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; -import java.util.HashSet; -import java.util.Set; - public class SalesforceInputDialog extends SalesforceTransformDialog { private static final Class PKG = SalesforceInputMeta.class; // For Translator diff --git a/plugins/transforms/schemamapping/src/main/java/org/apache/hop/pipeline/transforms/schemamapping/SchemaMappingDialog.java b/plugins/transforms/schemamapping/src/main/java/org/apache/hop/pipeline/transforms/schemamapping/SchemaMappingDialog.java index 0cd438ab522..ef1241511c1 100644 --- a/plugins/transforms/schemamapping/src/main/java/org/apache/hop/pipeline/transforms/schemamapping/SchemaMappingDialog.java +++ b/plugins/transforms/schemamapping/src/main/java/org/apache/hop/pipeline/transforms/schemamapping/SchemaMappingDialog.java @@ -56,7 +56,11 @@ import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.*; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Text; public class SchemaMappingDialog extends BaseTransformDialog implements ITransformDialog { private static final Class PKG = SchemaMappingDialog.class; // For Translator diff --git a/plugins/transforms/tableinput/src/main/java/org/apache/hop/pipeline/transforms/tableinput/TableInputDialog.java b/plugins/transforms/tableinput/src/main/java/org/apache/hop/pipeline/transforms/tableinput/TableInputDialog.java index ec4a7ee53d3..63ecb6b6df3 100644 --- a/plugins/transforms/tableinput/src/main/java/org/apache/hop/pipeline/transforms/tableinput/TableInputDialog.java +++ b/plugins/transforms/tableinput/src/main/java/org/apache/hop/pipeline/transforms/tableinput/TableInputDialog.java @@ -60,7 +60,10 @@ import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.*; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; public class TableInputDialog extends BaseTransformDialog implements ITransformDialog { private static final Class PKG = TableInputMeta.class; // For Translator diff --git a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/csvinput/CsvInputDialog.java b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/csvinput/CsvInputDialog.java index 2df1103d1b7..b0b68033fa4 100644 --- a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/csvinput/CsvInputDialog.java +++ b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/csvinput/CsvInputDialog.java @@ -62,7 +62,11 @@ import org.apache.hop.ui.core.dialog.MessageBox; import org.apache.hop.ui.core.dialog.MessageDialogWithToggle; import org.apache.hop.ui.core.dialog.PreviewRowsDialog; -import org.apache.hop.ui.core.widget.*; +import org.apache.hop.ui.core.widget.ColumnInfo; +import org.apache.hop.ui.core.widget.ComboVar; +import org.apache.hop.ui.core.widget.MetaSelectionLine; +import org.apache.hop.ui.core.widget.TableView; +import org.apache.hop.ui.core.widget.TextVar; import org.apache.hop.ui.hopgui.HopGui; import org.apache.hop.ui.hopgui.file.pipeline.HopGuiPipelineGraph; import org.apache.hop.ui.pipeline.dialog.PipelinePreviewProgressDialog; @@ -73,12 +77,22 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.SWTException; import org.eclipse.swt.custom.CCombo; -import org.eclipse.swt.events.*; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.*; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Text; public class CsvInputDialog extends BaseTransformDialog implements ITransformDialog, diff --git a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java index 4ada0497714..38cb0f5a4d2 100644 --- a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java +++ b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java @@ -18,6 +18,15 @@ // CHECKSTYLE:FileLength:OFF package org.apache.hop.pipeline.transforms.fileinput.text; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.Vector; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.vfs2.FileObject; @@ -48,9 +57,9 @@ import org.apache.hop.pipeline.transform.BaseTransformMeta; import org.apache.hop.pipeline.transform.ITransformDialog; import org.apache.hop.pipeline.transform.TransformMeta; -import org.apache.hop.staticschema.metadata.SchemaDefinition; import org.apache.hop.pipeline.transforms.common.ICsvInputAwareMeta; import org.apache.hop.pipeline.transforms.file.BaseFileField; +import org.apache.hop.staticschema.metadata.SchemaDefinition; import org.apache.hop.staticschema.util.SchemaDefinitionUtil; import org.apache.hop.ui.core.PropsUi; import org.apache.hop.ui.core.dialog.BaseDialog; @@ -76,7 +85,12 @@ import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.custom.ScrolledComposite; -import org.eclipse.swt.events.*; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.FillLayout; @@ -92,16 +106,6 @@ import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Locale; -import java.util.Vector; - public class TextFileInputDialog extends BaseTransformDialog implements ITransformDialog, IGetFieldsCapableTransformDialog, diff --git a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java index 5ea0120519c..936f7da796a 100644 --- a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java +++ b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java @@ -17,6 +17,9 @@ package org.apache.hop.pipeline.transforms.textfileoutput; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; import org.apache.hop.core.Const; import org.apache.hop.core.Props; import org.apache.hop.core.compress.CompressionProviderFactory; @@ -43,24 +46,36 @@ import org.apache.hop.ui.core.dialog.ErrorDialog; import org.apache.hop.ui.core.dialog.MessageBox; import org.apache.hop.ui.core.gui.GuiResource; -import org.apache.hop.ui.core.widget.*; +import org.apache.hop.ui.core.widget.ColumnInfo; +import org.apache.hop.ui.core.widget.ComboVar; +import org.apache.hop.ui.core.widget.MetaSelectionLine; +import org.apache.hop.ui.core.widget.TableView; +import org.apache.hop.ui.core.widget.TextVar; import org.apache.hop.ui.pipeline.transform.BaseTransformDialog; import org.apache.hop.ui.pipeline.transform.ITableItemInsertListener; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.swt.events.*; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.*; - -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Text; public class TextFileOutputDialog extends BaseTransformDialog implements ITransformDialog { private static final Class PKG = TextFileOutputMeta.class; // For Translator diff --git a/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoader.java b/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoader.java index 9459f6ed77a..0e04079a00d 100644 --- a/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoader.java +++ b/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoader.java @@ -20,11 +20,18 @@ import com.google.common.annotations.VisibleForTesting; import com.vertica.jdbc.VerticaConnection; import com.vertica.jdbc.VerticaCopyStream; -import java.io.*; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InterruptedIOException; +import java.io.PipedInputStream; import java.sql.Connection; import java.sql.SQLException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; import java.util.concurrent.Executors; import java.util.stream.Collectors; import javax.sql.PooledConnection; diff --git a/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderDialog.java b/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderDialog.java index e1239c20366..f71a62c2b43 100644 --- a/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderDialog.java +++ b/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderDialog.java @@ -17,9 +17,17 @@ package org.apache.hop.pipeline.transforms.vertica.bulkloader; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; import java.util.List; -import org.apache.hop.core.*; +import java.util.Map; +import java.util.Set; +import org.apache.hop.core.Const; +import org.apache.hop.core.DbCache; +import org.apache.hop.core.Props; +import org.apache.hop.core.SourceToTargetMapping; +import org.apache.hop.core.SqlStatement; import org.apache.hop.core.database.Database; import org.apache.hop.core.database.DatabaseMeta; import org.apache.hop.core.exception.HopException; @@ -50,11 +58,24 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.swt.events.*; +import org.eclipse.swt.events.FocusAdapter; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.*; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.MessageBox; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Text; public class VerticaBulkLoaderDialog extends BaseTransformDialog implements ITransformDialog { diff --git a/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderMeta.java b/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderMeta.java index 0560b175ce1..8cfbb52647c 100644 --- a/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderMeta.java +++ b/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderMeta.java @@ -20,7 +20,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.hop.core.*; +import org.apache.hop.core.CheckResult; +import org.apache.hop.core.Const; +import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.IProvidesModelerMeta; +import org.apache.hop.core.SqlStatement; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.database.Database; import org.apache.hop.core.database.DatabaseMeta; diff --git a/pom.xml b/pom.xml index 2fdf388a993..747ddc91152 100644 --- a/pom.xml +++ b/pom.xml @@ -848,6 +848,24 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + true + /tools/maven/checkstyle.xml + true + true + + + + + check + + + + diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml new file mode 100644 index 00000000000..3ddf49601d1 --- /dev/null +++ b/tools/maven/checkstyle.xml @@ -0,0 +1,29 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/ConditionEditor.java b/ui/src/main/java/org/apache/hop/ui/core/widget/ConditionEditor.java index 3d78f7ec6fa..dccd86d2633 100644 --- a/ui/src/main/java/org/apache/hop/ui/core/widget/ConditionEditor.java +++ b/ui/src/main/java/org/apache/hop/ui/core/widget/ConditionEditor.java @@ -17,7 +17,13 @@ package org.apache.hop.ui.core.widget; +import java.util.ArrayList; import org.apache.hop.core.Condition; +import static org.apache.hop.core.Condition.Function.NOT_NULL; +import static org.apache.hop.core.Condition.Function.NULL; +import static org.apache.hop.core.Condition.Operator.AND; +import static org.apache.hop.core.Condition.Operator.NONE; +import static org.apache.hop.core.Condition.Operator.lookupType; import org.apache.hop.core.Const; import org.apache.hop.core.exception.HopValueException; import org.apache.hop.core.exception.HopXmlException; @@ -57,12 +63,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; -import java.util.ArrayList; - -import static org.apache.hop.core.Condition.Function.NOT_NULL; -import static org.apache.hop.core.Condition.Function.NULL; -import static org.apache.hop.core.Condition.Operator.*; - /** Widget that allows you to edit a Condition in a graphical way. */ public class ConditionEditor extends Canvas implements MouseMoveListener { private static final Class PKG = ConditionEditor.class; // For Translator