This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 01475494ed use Lombok getters/setters for improved readability and
maintainability (#6946)
01475494ed is described below
commit 01475494ed0480e6173e9ff2a5cab7728455e882
Author: Lance <[email protected]>
AuthorDate: Fri Apr 3 21:33:47 2026 +0800
use Lombok getters/setters for improved readability and maintainability
(#6946)
Signed-off-by: lance <[email protected]>
---
.../java/org/apache/hop/core/config/HopConfig.java | 23 +--
.../apache/hop/core/config/plugin/ConfigFile.java | 52 +-----
.../java/org/apache/hop/core/database/Catalog.java | 33 +---
.../org/apache/hop/core/database/Database.java | 50 +-----
.../database/DatabaseConnectionPoolParameter.java | 52 +-----
.../org/apache/hop/core/database/DatabaseMeta.java | 20 +--
.../hop/core/database/DatabaseMetaInformation.java | 181 +--------------------
.../hop/core/database/DatabaseTestResults.java | 21 +--
.../apache/hop/core/database/DelegatingDriver.java | 2 +-
.../hop/core/database/PartitionDatabaseMeta.java | 91 +----------
.../java/org/apache/hop/core/database/Schema.java | 33 +---
.../hop/core/database/SqlScriptStatement.java | 103 +-----------
.../core/database/map/DatabaseConnectionMap.java | 6 +-
.../hop/core/exception/HopConversionException.java | 46 +-----
.../core/exception/HopDatabaseBatchException.java | 26 +--
.../core/exception/HopFileNotFoundException.java | 13 +-
.../core/exception/HopPluginLoaderException.java | 11 +-
17 files changed, 73 insertions(+), 690 deletions(-)
diff --git a/core/src/main/java/org/apache/hop/core/config/HopConfig.java
b/core/src/main/java/org/apache/hop/core/config/HopConfig.java
index f757a630ce..fba02b1b16 100644
--- a/core/src/main/java/org/apache/hop/core/config/HopConfig.java
+++ b/core/src/main/java/org/apache/hop/core/config/HopConfig.java
@@ -23,6 +23,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.hop.core.Const;
import org.apache.hop.core.config.plugin.ConfigFile;
import org.apache.hop.core.exception.HopRuntimeException;
@@ -34,10 +36,9 @@ import org.apache.hop.core.variables.DescribedVariable;
* includes all options of the various plugins in the Hop ecosystem.
*/
public class HopConfig extends ConfigFile {
-
private static final String HOP_GUI_PROPERTIES_KEY = "guiProperties";
- private String configFilename;
+ @Setter @Getter private String configFilename;
@JsonIgnore private static HopConfig instance;
@@ -202,24 +203,6 @@ public class HopConfig extends ConfigFile {
readGuiProperties().putAll(map);
}
- /**
- * Gets configFilename
- *
- * @return value of configFilename
- */
- @Override
- public String getConfigFilename() {
- return configFilename;
- }
-
- /**
- * @param configFilename The configFilename to set
- */
- @Override
- public void setConfigFilename(String configFilename) {
- this.configFilename = configFilename;
- }
-
public void reload() {
try {
readFromFile();
diff --git
a/core/src/main/java/org/apache/hop/core/config/plugin/ConfigFile.java
b/core/src/main/java/org/apache/hop/core/config/plugin/ConfigFile.java
index d16578b42d..00c81905c6 100644
--- a/core/src/main/java/org/apache/hop/core/config/plugin/ConfigFile.java
+++ b/core/src/main/java/org/apache/hop/core/config/plugin/ConfigFile.java
@@ -25,6 +25,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.hop.core.Const;
import org.apache.hop.core.config.ConfigFileSerializer;
import org.apache.hop.core.config.ConfigNoFileSerializer;
@@ -40,10 +42,12 @@ public abstract class ConfigFile implements IConfigFile {
public static final String HOP_VARIABLES_KEY = "variables";
public static final String HOP_CONFIG_KEY = "config";
+ @Getter
+ @Setter
@JsonProperty("config")
protected Map<String, Object> configMap;
- @JsonIgnore protected IHopConfigSerializer serializer;
+ @Getter @Setter @JsonIgnore protected IHopConfigSerializer serializer;
public ConfigFile() {
configMap = new HashMap<>();
@@ -163,50 +167,4 @@ public abstract class ConfigFile implements IConfigFile {
public void setDescribedVariables(List<DescribedVariable>
describedVariables) {
configMap.put(HOP_VARIABLES_KEY, describedVariables);
}
-
- /**
- * Gets filename
- *
- * @return value of filename
- */
- @Override
- public abstract String getConfigFilename();
-
- /**
- * @param filename The filename to set
- */
- @Override
- public abstract void setConfigFilename(String filename);
-
- /**
- * Gets configMap
- *
- * @return value of configMap
- */
- public Map<String, Object> getConfigMap() {
- return configMap;
- }
-
- /**
- * @param configMap The configMap to set
- */
- public void setConfigMap(Map<String, Object> configMap) {
- this.configMap = configMap;
- }
-
- /**
- * Gets serializer
- *
- * @return value of serializer
- */
- public IHopConfigSerializer getSerializer() {
- return serializer;
- }
-
- /**
- * @param serializer The serializer to set
- */
- public void setSerializer(IHopConfigSerializer serializer) {
- this.serializer = serializer;
- }
}
diff --git a/core/src/main/java/org/apache/hop/core/database/Catalog.java
b/core/src/main/java/org/apache/hop/core/database/Catalog.java
index ac9365da43..a4b4a4e9b1 100644
--- a/core/src/main/java/org/apache/hop/core/database/Catalog.java
+++ b/core/src/main/java/org/apache/hop/core/database/Catalog.java
@@ -17,7 +17,12 @@
package org.apache.hop.core.database;
+import lombok.Getter;
+import lombok.Setter;
+
/** Contains the information that's stored in a single catalog. */
+@Getter
+@Setter
public class Catalog {
private String catalogName;
private String[] items;
@@ -30,32 +35,4 @@ public class Catalog {
public Catalog(String catalogName) {
this(catalogName, new String[] {});
}
-
- /**
- * @return Returns the catalogName.
- */
- public String getCatalogName() {
- return catalogName;
- }
-
- /**
- * @param catalogName The catalogName to set.
- */
- public void setCatalogName(String catalogName) {
- this.catalogName = catalogName;
- }
-
- /**
- * @return Returns the items.
- */
- public String[] getItems() {
- return items;
- }
-
- /**
- * @param items The items to set.
- */
- public void setItems(String[] items) {
- this.items = items;
- }
}
diff --git a/core/src/main/java/org/apache/hop/core/database/Database.java
b/core/src/main/java/org/apache/hop/core/database/Database.java
index 959640f145..2332bd5415 100644
--- a/core/src/main/java/org/apache/hop/core/database/Database.java
+++ b/core/src/main/java/org/apache/hop/core/database/Database.java
@@ -45,6 +45,8 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.vfs2.FileObject;
import org.apache.hop.core.Const;
@@ -150,8 +152,8 @@ public class Database implements IVariables,
ILoggingObject, AutoCloseable {
/** The copy is equal to opened at the time of creation. */
private volatile int copy;
- private String connectionGroup;
- private String partitionId;
+ @Getter @Setter private String connectionGroup;
+ @Getter @Setter private String partitionId;
private IVariables variables = new Variables();
@@ -159,7 +161,7 @@ public class Database implements IVariables,
ILoggingObject, AutoCloseable {
private String containerObjectId;
- private int nrExecutedCommits;
+ @Getter @Setter private int nrExecutedCommits;
private SshTunnelManager sshTunnelManager;
@@ -4060,34 +4062,6 @@ public class Database implements IVariables,
ILoggingObject, AutoCloseable {
this.opened = opened;
}
- /**
- * @return the connectionGroup
- */
- public String getConnectionGroup() {
- return connectionGroup;
- }
-
- /**
- * @param connectionGroup the connectionGroup to set
- */
- public void setConnectionGroup(String connectionGroup) {
- this.connectionGroup = connectionGroup;
- }
-
- /**
- * @return the partitionId
- */
- public String getPartitionId() {
- return partitionId;
- }
-
- /**
- * @param partitionId the partitionId to set
- */
- public void setPartitionId(String partitionId) {
- this.partitionId = partitionId;
- }
-
/**
* @return the copy
*/
@@ -4621,20 +4595,6 @@ public class Database implements IVariables,
ILoggingObject, AutoCloseable {
return null;
}
- /**
- * @return the nrExecutedCommits
- */
- public int getNrExecutedCommits() {
- return nrExecutedCommits;
- }
-
- /**
- * @param nrExecutedCommits the nrExecutedCommits to set
- */
- public void setNrExecutedCommits(int nrExecutedCommits) {
- this.nrExecutedCommits = nrExecutedCommits;
- }
-
/**
* Execute an SQL statement inside a file on the database connection (has to
be open)
*
diff --git
a/core/src/main/java/org/apache/hop/core/database/DatabaseConnectionPoolParameter.java
b/core/src/main/java/org/apache/hop/core/database/DatabaseConnectionPoolParameter.java
index 811159a11e..c14778c77a 100644
---
a/core/src/main/java/org/apache/hop/core/database/DatabaseConnectionPoolParameter.java
+++
b/core/src/main/java/org/apache/hop/core/database/DatabaseConnectionPoolParameter.java
@@ -19,11 +19,15 @@ package org.apache.hop.core.database;
import java.util.ArrayList;
import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.hop.core.RowMetaAndData;
import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.row.RowMeta;
import org.apache.hop.core.row.value.ValueMetaString;
+@Getter
+@Setter
public class DatabaseConnectionPoolParameter {
private String parameter;
private String defaultValue;
@@ -44,49 +48,7 @@ public class DatabaseConnectionPoolParameter {
this.description = description;
}
- /**
- * @return the defaultValue
- */
- public String getDefaultValue() {
- return defaultValue;
- }
-
- /**
- * @param defaultValue the defaultValue to set
- */
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @param description the description to set
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * @return the parameter
- */
- public String getParameter() {
- return parameter;
- }
-
- /**
- * @param parameter the parameter to set
- */
- public void setParameter(String parameter) {
- this.parameter = parameter;
- }
-
- public static final String[]
getParameterNames(DatabaseConnectionPoolParameter[] poolParameters) {
+ public static String[] getParameterNames(DatabaseConnectionPoolParameter[]
poolParameters) {
String[] names = new String[poolParameters.length];
for (int i = 0; i < names.length; i++) {
names[i] = poolParameters[i].getParameter();
@@ -94,7 +56,7 @@ public class DatabaseConnectionPoolParameter {
return names;
}
- public static final DatabaseConnectionPoolParameter findParameter(
+ public static DatabaseConnectionPoolParameter findParameter(
String parameterName, DatabaseConnectionPoolParameter[] poolParameters) {
for (DatabaseConnectionPoolParameter poolParameter : poolParameters) {
if (poolParameter.getParameter().equalsIgnoreCase(parameterName)) {
@@ -104,7 +66,7 @@ public class DatabaseConnectionPoolParameter {
return null;
}
- public static final List<RowMetaAndData> getRowList(
+ public static List<RowMetaAndData> getRowList(
DatabaseConnectionPoolParameter[] poolParameters,
String titleParameter,
String titleDefaultValue,
diff --git a/core/src/main/java/org/apache/hop/core/database/DatabaseMeta.java
b/core/src/main/java/org/apache/hop/core/database/DatabaseMeta.java
index 79a6f53b24..6c93b73fc9 100644
--- a/core/src/main/java/org/apache/hop/core/database/DatabaseMeta.java
+++ b/core/src/main/java/org/apache/hop/core/database/DatabaseMeta.java
@@ -28,6 +28,8 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.apache.hop.core.Const;
import org.apache.hop.core.RowMetaAndData;
@@ -79,6 +81,8 @@ public class DatabaseMeta extends HopMetadataBase implements
Cloneable, IHopMeta
public static final Comparator<DatabaseMeta> comparator =
(DatabaseMeta dbm1, DatabaseMeta dbm2) ->
dbm1.getName().compareToIgnoreCase(dbm2.getName());
+ @Getter
+ @Setter
@HopMetadataProperty(key = "rdbms")
private IDatabase iDatabase;
@@ -192,22 +196,6 @@ public class DatabaseMeta extends HopMetadataBase
implements Cloneable, IHopMeta
replaceMeta(databaseMeta);
}
- /**
- * @return the system dependend database interface for this database
metadata definition
- */
- public IDatabase getIDatabase() {
- return iDatabase;
- }
-
- /**
- * Set the system dependend database interface for this database metadata
definition
- *
- * @param iDatabase the system dependend database interface
- */
- public void setIDatabase(IDatabase iDatabase) {
- this.iDatabase = iDatabase;
- }
-
/**
* Search for the right type of IDatabase object and clone it.
*
diff --git
a/core/src/main/java/org/apache/hop/core/database/DatabaseMetaInformation.java
b/core/src/main/java/org/apache/hop/core/database/DatabaseMetaInformation.java
index 77d5c7eaab..2845372ee6 100644
---
a/core/src/main/java/org/apache/hop/core/database/DatabaseMetaInformation.java
+++
b/core/src/main/java/org/apache/hop/core/database/DatabaseMetaInformation.java
@@ -24,6 +24,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.hop.core.IProgressMonitor;
import org.apache.hop.core.ProgressNullMonitorListener;
import org.apache.hop.core.exception.HopDatabaseException;
@@ -35,6 +37,8 @@ import org.apache.hop.i18n.BaseMessages;
/**
* Contains the schema's, catalogs, tables, views, synonyms, etc. we can find
in the databases...
*/
+@Getter
+@Setter
public class DatabaseMetaInformation {
private static final Class<?> PKG = Database.class;
@@ -47,7 +51,6 @@ public class DatabaseMetaInformation {
private Catalog[] catalogs;
private Schema[] schemas;
private String[] procedures;
-
private IVariables variables;
private DatabaseMeta databaseMeta;
@@ -310,180 +313,4 @@ public class DatabaseMetaInformation {
monitor.done();
}
}
-
- /**
- * Gets tables
- *
- * @return value of tables
- */
- public String[] getTables() {
- return tables;
- }
-
- /**
- * @param tables The tables to set
- */
- public void setTables(String[] tables) {
- this.tables = tables;
- }
-
- /**
- * Gets tableMap
- *
- * @return value of tableMap
- */
- public Map<String, Collection<String>> getTableMap() {
- return tableMap;
- }
-
- /**
- * @param tableMap The tableMap to set
- */
- public void setTableMap(Map<String, Collection<String>> tableMap) {
- this.tableMap = tableMap;
- }
-
- /**
- * Gets views
- *
- * @return value of views
- */
- public String[] getViews() {
- return views;
- }
-
- /**
- * @param views The views to set
- */
- public void setViews(String[] views) {
- this.views = views;
- }
-
- /**
- * Gets viewMap
- *
- * @return value of viewMap
- */
- public Map<String, Collection<String>> getViewMap() {
- return viewMap;
- }
-
- /**
- * @param viewMap The viewMap to set
- */
- public void setViewMap(Map<String, Collection<String>> viewMap) {
- this.viewMap = viewMap;
- }
-
- /**
- * Gets synonyms
- *
- * @return value of synonyms
- */
- public String[] getSynonyms() {
- return synonyms;
- }
-
- /**
- * @param synonyms The synonyms to set
- */
- public void setSynonyms(String[] synonyms) {
- this.synonyms = synonyms;
- }
-
- /**
- * Gets synonymMap
- *
- * @return value of synonymMap
- */
- public Map<String, Collection<String>> getSynonymMap() {
- return synonymMap;
- }
-
- /**
- * @param synonymMap The synonymMap to set
- */
- public void setSynonymMap(Map<String, Collection<String>> synonymMap) {
- this.synonymMap = synonymMap;
- }
-
- /**
- * Gets catalogs
- *
- * @return value of catalogs
- */
- public Catalog[] getCatalogs() {
- return catalogs;
- }
-
- /**
- * @param catalogs The catalogs to set
- */
- public void setCatalogs(Catalog[] catalogs) {
- this.catalogs = catalogs;
- }
-
- /**
- * Gets schemas
- *
- * @return value of schemas
- */
- public Schema[] getSchemas() {
- return schemas;
- }
-
- /**
- * @param schemas The schemas to set
- */
- public void setSchemas(Schema[] schemas) {
- this.schemas = schemas;
- }
-
- /**
- * Gets procedures
- *
- * @return value of procedures
- */
- public String[] getProcedures() {
- return procedures;
- }
-
- /**
- * @param procedures The procedures to set
- */
- public void setProcedures(String[] procedures) {
- this.procedures = procedures;
- }
-
- /**
- * Gets variables
- *
- * @return value of variables
- */
- public IVariables getVariables() {
- return variables;
- }
-
- /**
- * @param variables The variables to set
- */
- public void setVariables(IVariables variables) {
- this.variables = variables;
- }
-
- /**
- * Gets databaseMeta
- *
- * @return value of databaseMeta
- */
- public DatabaseMeta getDatabaseMeta() {
- return databaseMeta;
- }
-
- /**
- * @param databaseMeta The databaseMeta to set
- */
- public void setDatabaseMeta(DatabaseMeta databaseMeta) {
- this.databaseMeta = databaseMeta;
- }
}
diff --git
a/core/src/main/java/org/apache/hop/core/database/DatabaseTestResults.java
b/core/src/main/java/org/apache/hop/core/database/DatabaseTestResults.java
index 223158a9c5..3bd4280070 100644
--- a/core/src/main/java/org/apache/hop/core/database/DatabaseTestResults.java
+++ b/core/src/main/java/org/apache/hop/core/database/DatabaseTestResults.java
@@ -17,23 +17,12 @@
package org.apache.hop.core.database;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
public class DatabaseTestResults {
private String message;
private boolean success;
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public boolean isSuccess() {
- return success;
- }
-
- public void setSuccess(boolean success) {
- this.success = success;
- }
}
diff --git
a/core/src/main/java/org/apache/hop/core/database/DelegatingDriver.java
b/core/src/main/java/org/apache/hop/core/database/DelegatingDriver.java
index 799f666125..99f1a6c86e 100644
--- a/core/src/main/java/org/apache/hop/core/database/DelegatingDriver.java
+++ b/core/src/main/java/org/apache/hop/core/database/DelegatingDriver.java
@@ -73,7 +73,7 @@ public class DelegatingDriver implements Driver {
/**
* This method is added to make this driver compile on Java7
*
- * @return always null until we finally switch over to Java7 with the
codebase (TODO)
+ * @return always null until we finally switch over to Java7 with the
codebase
*/
@Override
public Logger getParentLogger() {
diff --git
a/core/src/main/java/org/apache/hop/core/database/PartitionDatabaseMeta.java
b/core/src/main/java/org/apache/hop/core/database/PartitionDatabaseMeta.java
index 1e0414e14c..29a6293c45 100644
--- a/core/src/main/java/org/apache/hop/core/database/PartitionDatabaseMeta.java
+++ b/core/src/main/java/org/apache/hop/core/database/PartitionDatabaseMeta.java
@@ -17,7 +17,12 @@
package org.apache.hop.core.database;
-/** Class to contain the information needed to parition (cluster): id,
hostname, port, database */
+import lombok.Getter;
+import lombok.Setter;
+
+/** Class to contain the information needed to partition (cluster): id,
hostname, port, database */
+@Getter
+@Setter
public class PartitionDatabaseMeta {
String partitionId;
@@ -43,88 +48,4 @@ public class PartitionDatabaseMeta {
this.port = port;
this.databaseName = database;
}
-
- /**
- * @return the partitionId
- */
- public String getPartitionId() {
- return partitionId;
- }
-
- /**
- * @param partitionId the partitionId to set
- */
- public void setPartitionId(String partitionId) {
- this.partitionId = partitionId;
- }
-
- /**
- * @return the database
- */
- public String getDatabaseName() {
- return databaseName;
- }
-
- /**
- * @param database the database to set
- */
- public void setDatabaseName(String database) {
- this.databaseName = database;
- }
-
- /**
- * @return the hostname
- */
- public String getHostname() {
- return hostname;
- }
-
- /**
- * @param hostname the hostname to set
- */
- public void setHostname(String hostname) {
- this.hostname = hostname;
- }
-
- /**
- * @return the port
- */
- public String getPort() {
- return port;
- }
-
- /**
- * @param port the port to set
- */
- public void setPort(String port) {
- this.port = port;
- }
-
- /**
- * @return the password
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * @param password the password to set
- */
- public void setPassword(String password) {
- this.password = password;
- }
-
- /**
- * @return the username
- */
- public String getUsername() {
- return username;
- }
-
- /**
- * @param username the username to set
- */
- public void setUsername(String username) {
- this.username = username;
- }
}
diff --git a/core/src/main/java/org/apache/hop/core/database/Schema.java
b/core/src/main/java/org/apache/hop/core/database/Schema.java
index 0b1363443f..27fb1bff0e 100644
--- a/core/src/main/java/org/apache/hop/core/database/Schema.java
+++ b/core/src/main/java/org/apache/hop/core/database/Schema.java
@@ -17,7 +17,12 @@
package org.apache.hop.core.database;
+import lombok.Getter;
+import lombok.Setter;
+
/** Contains the information that's stored in a single schema. */
+@Getter
+@Setter
public class Schema {
private String schemaName;
private String[] items;
@@ -30,32 +35,4 @@ public class Schema {
public Schema(String schemaName) {
this(schemaName, new String[] {});
}
-
- /**
- * @return Returns the schemaName.
- */
- public String getSchemaName() {
- return schemaName;
- }
-
- /**
- * @param schemaName The catalogName to set.
- */
- public void setSchemaName(String schemaName) {
- this.schemaName = schemaName;
- }
-
- /**
- * @return Returns the items.
- */
- public String[] getItems() {
- return items;
- }
-
- /**
- * @param items The items to set.
- */
- public void setItems(String[] items) {
- this.items = items;
- }
}
diff --git
a/core/src/main/java/org/apache/hop/core/database/SqlScriptStatement.java
b/core/src/main/java/org/apache/hop/core/database/SqlScriptStatement.java
index fa637b63e9..4dd9b5c345 100644
--- a/core/src/main/java/org/apache/hop/core/database/SqlScriptStatement.java
+++ b/core/src/main/java/org/apache/hop/core/database/SqlScriptStatement.java
@@ -17,6 +17,11 @@
package org.apache.hop.core.database;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
public class SqlScriptStatement {
private String statement;
private int fromIndex;
@@ -44,102 +49,4 @@ public class SqlScriptStatement {
public String toString() {
return statement;
}
-
- /**
- * @return the statement
- */
- public String getStatement() {
- return statement;
- }
-
- /**
- * @param statement the statement to set
- */
- public void setStatement(String statement) {
- this.statement = statement;
- }
-
- /**
- * @return the fromIndex
- */
- public int getFromIndex() {
- return fromIndex;
- }
-
- /**
- * @param fromIndex the fromIndex to set
- */
- public void setFromIndex(int fromIndex) {
- this.fromIndex = fromIndex;
- }
-
- /**
- * @return the toIndex
- */
- public int getToIndex() {
- return toIndex;
- }
-
- /**
- * @param toIndex the toIndex to set
- */
- public void setToIndex(int toIndex) {
- this.toIndex = toIndex;
- }
-
- /**
- * @return the query
- */
- public boolean isQuery() {
- return query;
- }
-
- /**
- * @param query the query to set
- */
- public void setQuery(boolean query) {
- this.query = query;
- }
-
- /**
- * @return the ok
- */
- public boolean isOk() {
- return ok;
- }
-
- /**
- * @param ok the ok to set
- */
- public void setOk(boolean ok) {
- this.ok = ok;
- }
-
- /**
- * @return the loggingText
- */
- public String getLoggingText() {
- return loggingText;
- }
-
- /**
- * @param loggingText the loggingText to set
- */
- public void setLoggingText(String loggingText) {
- this.loggingText = loggingText;
- }
-
- /**
- * @return the complete
- */
- public boolean isComplete() {
- return complete;
- }
-
- /**
- * @param complete the complete to set
- */
- public void setComplete(boolean complete) {
- this.complete = complete;
- }
}
diff --git
a/core/src/main/java/org/apache/hop/core/database/map/DatabaseConnectionMap.java
b/core/src/main/java/org/apache/hop/core/database/map/DatabaseConnectionMap.java
index d9fd078a5c..348f5962e4 100644
---
a/core/src/main/java/org/apache/hop/core/database/map/DatabaseConnectionMap.java
+++
b/core/src/main/java/org/apache/hop/core/database/map/DatabaseConnectionMap.java
@@ -37,10 +37,10 @@ import org.apache.hop.core.util.Utils;
public class DatabaseConnectionMap {
private final ConcurrentMap<String, Database> map;
- private static final DatabaseConnectionMap connectionMap = new
DatabaseConnectionMap();
+ private static final DatabaseConnectionMap CONNECTION_MAP = new
DatabaseConnectionMap();
public static synchronized DatabaseConnectionMap getInstance() {
- return connectionMap;
+ return CONNECTION_MAP;
}
private DatabaseConnectionMap() {
@@ -51,7 +51,7 @@ public class DatabaseConnectionMap {
* Tries to obtain an existing <i>Database</i> instance for specified
parameters. If none is
* found, then maps the key's value to <i>database</i>. Similarly to
{@linkplain
* ConcurrentHashMap#putIfAbsent(Object, Object)} returns <i>null</i> if
there was no value for
- * the specified key and they mapped value otherwise.
+ * the specified key, and they mapped value otherwise.
*
* @param connectionGroup connection group
* @param partitionID partition's id
diff --git
a/core/src/main/java/org/apache/hop/core/exception/HopConversionException.java
b/core/src/main/java/org/apache/hop/core/exception/HopConversionException.java
index 08fe2efb6b..4cfad9fa50 100644
---
a/core/src/main/java/org/apache/hop/core/exception/HopConversionException.java
+++
b/core/src/main/java/org/apache/hop/core/exception/HopConversionException.java
@@ -19,8 +19,12 @@ package org.apache.hop.core.exception;
import java.io.Serial;
import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.hop.core.row.IValueMeta;
+@Setter
+@Getter
public class HopConversionException extends HopException {
private List<Exception> causes;
@@ -50,46 +54,4 @@ public class HopConversionException extends HopException {
this.fields = fields;
this.rowData = rowData;
}
-
- /**
- * @return the causes
- */
- public List<Exception> getCauses() {
- return causes;
- }
-
- /**
- * @param causes the causes to set
- */
- public void setCauses(List<Exception> causes) {
- this.causes = causes;
- }
-
- /**
- * @return the fields
- */
- public List<IValueMeta> getFields() {
- return fields;
- }
-
- /**
- * @param fields the fields to set
- */
- public void setFields(List<IValueMeta> fields) {
- this.fields = fields;
- }
-
- /**
- * @return the rowData
- */
- public Object[] getRowData() {
- return rowData;
- }
-
- /**
- * @param rowData the rowData to set
- */
- public void setRowData(Object[] rowData) {
- this.rowData = rowData;
- }
}
diff --git
a/core/src/main/java/org/apache/hop/core/exception/HopDatabaseBatchException.java
b/core/src/main/java/org/apache/hop/core/exception/HopDatabaseBatchException.java
index bff51ddfe7..04eb6d5db6 100644
---
a/core/src/main/java/org/apache/hop/core/exception/HopDatabaseBatchException.java
+++
b/core/src/main/java/org/apache/hop/core/exception/HopDatabaseBatchException.java
@@ -19,8 +19,12 @@ package org.apache.hop.core.exception;
import java.io.Serial;
import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
/** This exception is used by the Database class. */
+@Setter
+@Getter
public class HopDatabaseBatchException extends HopDatabaseException {
@Serial private static final long serialVersionUID = 0x8D8EA0264F7A1C0EL;
@@ -65,26 +69,4 @@ public class HopDatabaseBatchException extends
HopDatabaseException {
public HopDatabaseBatchException(String message, Throwable cause) {
super(message, cause);
}
-
- /**
- * @return Returns the updateCounts.
- */
- public int[] getUpdateCounts() {
- return updateCounts;
- }
-
- /**
- * @param updateCounts The updateCounts to set.
- */
- public void setUpdateCounts(int[] updateCounts) {
- this.updateCounts = updateCounts;
- }
-
- public void setExceptionsList(List<Exception> exceptionsList) {
- this.exceptionsList = exceptionsList;
- }
-
- public List<Exception> getExceptionsList() {
- return exceptionsList;
- }
}
diff --git
a/core/src/main/java/org/apache/hop/core/exception/HopFileNotFoundException.java
b/core/src/main/java/org/apache/hop/core/exception/HopFileNotFoundException.java
index 6c58b3835e..36b8486d4f 100644
---
a/core/src/main/java/org/apache/hop/core/exception/HopFileNotFoundException.java
+++
b/core/src/main/java/org/apache/hop/core/exception/HopFileNotFoundException.java
@@ -17,19 +17,16 @@
package org.apache.hop.core.exception;
+import lombok.Getter;
+import lombok.Setter;
+
/** Exception thrown when a files does not exists */
+@Setter
+@Getter
public class HopFileNotFoundException extends HopFileException {
private String filepath;
- public String getFilepath() {
- return filepath;
- }
-
- public void setFilepath(String filepath) {
- this.filepath = filepath;
- }
-
public HopFileNotFoundException() {
super();
}
diff --git
a/core/src/main/java/org/apache/hop/core/exception/HopPluginLoaderException.java
b/core/src/main/java/org/apache/hop/core/exception/HopPluginLoaderException.java
index 7af4b2d66e..79ebe27d1e 100644
---
a/core/src/main/java/org/apache/hop/core/exception/HopPluginLoaderException.java
+++
b/core/src/main/java/org/apache/hop/core/exception/HopPluginLoaderException.java
@@ -18,12 +18,12 @@
package org.apache.hop.core.exception;
import java.io.Serial;
+import lombok.Getter;
/** This Exception is throws when an error occurs loading plugins. */
public class HopPluginLoaderException extends HopException {
@Serial private static final long serialVersionUID = 0x8D8EA0264F7A1C16L;
-
- private final String pluginId;
+ @Getter private final String pluginId;
/**
* Constructs a new throwable with null as its detail message.
@@ -73,11 +73,4 @@ public class HopPluginLoaderException extends HopException {
super(message, cause);
this.pluginId = pluginId;
}
-
- /**
- * @return The ID of the missing plugin that caused this exception
- */
- public String getPluginId() {
- return pluginId;
- }
}
