This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 9a7388b HOP-3011 Remove I18nPackageName from plugin annotation
new 787b62f Merge pull request #905 from nadment/HOP-3011
9a7388b is described below
commit 9a7388bdffe523bf20635f78cce43b66a034de1b
Author: nadment <[email protected]>
AuthorDate: Sun Jun 27 23:58:16 2021 +0200
HOP-3011 Remove I18nPackageName from plugin annotation
---
.../hop/core/config/plugin/ConfigPluginType.java | 6 ---
.../hop/core/database/DatabasePluginType.java | 6 ---
.../TwoWayPasswordEncoderPluginType.java | 6 ---
.../core/extension/ExtensionPointPluginType.java | 5 ---
.../apache/hop/core/gui/plugin/GuiPluginType.java | 6 ---
.../apache/hop/core/logging/LoggingPluginType.java | 5 ---
.../apache/hop/core/plugins/BaseFragmentType.java | 6 ---
.../apache/hop/core/plugins/BasePluginType.java | 49 ++++++++++------------
.../hop/core/plugins/BasePluginTypeExposer.java | 19 +++------
.../hop/core/row/value/ValueMetaPluginType.java | 6 ---
.../core/search/SearchableAnalyserPluginType.java | 5 ---
.../apache/hop/core/vfs/plugin/VfsPluginType.java | 5 ---
.../hop/metadata/plugin/MetadataPluginType.java | 5 ---
.../org/apache/hop/core/annotations/Action.java | 7 ----
.../auth/AuthenticationConsumerPluginType.java | 5 ---
.../auth/AuthenticationProviderPluginType.java | 5 ---
.../hop/core/compress/CompressionPluginType.java | 5 ---
.../apache/hop/core/plugins/ActionPluginType.java | 5 ---
.../hop/core/plugins/HopServerPluginType.java | 5 ---
.../hop/core/plugins/PartitionerPluginType.java | 5 ---
.../hop/core/plugins/TransformPluginType.java | 5 ---
.../pipeline/engine/PipelineEnginePluginType.java | 5 ---
.../transform/RowDistributionPluginType.java | 6 ---
.../workflow/engine/WorkflowEnginePluginType.java | 6 ---
.../core/compress/CompressionPluginTypeTest.java | 3 --
.../WorkflowActionWriteToLogLoadSaveTest.java | 4 +-
.../ui/pipeline/dialog/PipelineDialogPlugin.java | 7 ----
.../pipeline/dialog/PipelineDialogPluginType.java | 5 ---
.../ui/workflow/dialog/WorkflowDialogPlugin.java | 7 ----
.../workflow/dialog/WorkflowDialogPluginType.java | 5 ---
30 files changed, 29 insertions(+), 190 deletions(-)
diff --git
a/core/src/main/java/org/apache/hop/core/config/plugin/ConfigPluginType.java
b/core/src/main/java/org/apache/hop/core/config/plugin/ConfigPluginType.java
index 1ccd834..30b07fc 100644
--- a/core/src/main/java/org/apache/hop/core/config/plugin/ConfigPluginType.java
+++ b/core/src/main/java/org/apache/hop/core/config/plugin/ConfigPluginType.java
@@ -18,7 +18,6 @@
package org.apache.hop.core.config.plugin;
import org.apache.hop.core.plugins.BasePluginType;
-import org.apache.hop.core.plugins.IPluginType;
import org.apache.hop.core.plugins.PluginAnnotationType;
import org.apache.hop.core.plugins.PluginMainClassType;
@@ -80,11 +79,6 @@ public class ConfigPluginType extends
BasePluginType<ConfigPlugin> {
}
@Override
- protected String extractI18nPackageName( ConfigPlugin annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, ConfigPlugin annotation ) {
}
diff --git
a/core/src/main/java/org/apache/hop/core/database/DatabasePluginType.java
b/core/src/main/java/org/apache/hop/core/database/DatabasePluginType.java
index 765d613..b448c16 100644
--- a/core/src/main/java/org/apache/hop/core/database/DatabasePluginType.java
+++ b/core/src/main/java/org/apache/hop/core/database/DatabasePluginType.java
@@ -20,7 +20,6 @@ package org.apache.hop.core.database;
import org.apache.commons.lang.StringUtils;
import org.apache.hop.core.Const;
import org.apache.hop.core.plugins.BasePluginType;
-import org.apache.hop.core.plugins.IPluginType;
import java.util.Map;
@@ -83,11 +82,6 @@ public class DatabasePluginType extends
BasePluginType<DatabaseMetaPlugin> {
}
@Override
- protected String extractI18nPackageName( DatabaseMetaPlugin annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, DatabaseMetaPlugin annotation ) {
}
diff --git
a/core/src/main/java/org/apache/hop/core/encryption/TwoWayPasswordEncoderPluginType.java
b/core/src/main/java/org/apache/hop/core/encryption/TwoWayPasswordEncoderPluginType.java
index af6d2c0..b1e521f 100644
---
a/core/src/main/java/org/apache/hop/core/encryption/TwoWayPasswordEncoderPluginType.java
+++
b/core/src/main/java/org/apache/hop/core/encryption/TwoWayPasswordEncoderPluginType.java
@@ -18,7 +18,6 @@
package org.apache.hop.core.encryption;
import org.apache.hop.core.plugins.BasePluginType;
-import org.apache.hop.core.plugins.IPluginType;
import org.apache.hop.core.plugins.PluginAnnotationType;
import org.apache.hop.core.plugins.PluginMainClassType;
@@ -78,11 +77,6 @@ public class TwoWayPasswordEncoderPluginType extends
BasePluginType<TwoWayPasswo
}
@Override
- protected String extractI18nPackageName( TwoWayPasswordEncoderPlugin
annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, TwoWayPasswordEncoderPlugin annotation ) {
}
diff --git
a/core/src/main/java/org/apache/hop/core/extension/ExtensionPointPluginType.java
b/core/src/main/java/org/apache/hop/core/extension/ExtensionPointPluginType.java
index e2020be..d005921 100644
---
a/core/src/main/java/org/apache/hop/core/extension/ExtensionPointPluginType.java
+++
b/core/src/main/java/org/apache/hop/core/extension/ExtensionPointPluginType.java
@@ -79,11 +79,6 @@ public class ExtensionPointPluginType extends
BasePluginType<ExtensionPoint> {
}
@Override
- protected String extractI18nPackageName( ExtensionPoint annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, ExtensionPoint annotation ) {
}
diff --git
a/core/src/main/java/org/apache/hop/core/gui/plugin/GuiPluginType.java
b/core/src/main/java/org/apache/hop/core/gui/plugin/GuiPluginType.java
index fd9ec3c..84842ae 100644
--- a/core/src/main/java/org/apache/hop/core/gui/plugin/GuiPluginType.java
+++ b/core/src/main/java/org/apache/hop/core/gui/plugin/GuiPluginType.java
@@ -18,7 +18,6 @@
package org.apache.hop.core.gui.plugin;
import org.apache.hop.core.plugins.BasePluginType;
-import org.apache.hop.core.plugins.IPluginType;
import org.apache.hop.core.plugins.PluginAnnotationType;
import java.util.Map;
@@ -78,11 +77,6 @@ public class GuiPluginType extends BasePluginType<GuiPlugin>
{
}
@Override
- protected String extractI18nPackageName( GuiPlugin annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, GuiPlugin annotation ) {
}
diff --git
a/core/src/main/java/org/apache/hop/core/logging/LoggingPluginType.java
b/core/src/main/java/org/apache/hop/core/logging/LoggingPluginType.java
index 191d7dc..e03ce1f 100644
--- a/core/src/main/java/org/apache/hop/core/logging/LoggingPluginType.java
+++ b/core/src/main/java/org/apache/hop/core/logging/LoggingPluginType.java
@@ -79,11 +79,6 @@ public class LoggingPluginType extends
BasePluginType<LoggingPlugin> {
}
@Override
- protected String extractI18nPackageName( LoggingPlugin annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, LoggingPlugin annotation ) {
}
diff --git
a/core/src/main/java/org/apache/hop/core/plugins/BaseFragmentType.java
b/core/src/main/java/org/apache/hop/core/plugins/BaseFragmentType.java
index 66ed1b8..642d7e6 100644
--- a/core/src/main/java/org/apache/hop/core/plugins/BaseFragmentType.java
+++ b/core/src/main/java/org/apache/hop/core/plugins/BaseFragmentType.java
@@ -91,12 +91,6 @@ public abstract class BaseFragmentType<T extends Annotation>
extends BasePluginT
}
@Override
- @Deprecated
- protected String extractI18nPackageName( T annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, T annotation ) {
}
diff --git a/core/src/main/java/org/apache/hop/core/plugins/BasePluginType.java
b/core/src/main/java/org/apache/hop/core/plugins/BasePluginType.java
index 5ada2fc..fad05ab 100644
--- a/core/src/main/java/org/apache/hop/core/plugins/BasePluginType.java
+++ b/core/src/main/java/org/apache/hop/core/plugins/BasePluginType.java
@@ -33,7 +33,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.io.FileUtils;
@@ -225,19 +224,18 @@ public abstract class BasePluginType<T extends
Annotation> implements IPluginTyp
}
}
- protected static String[] getTranslations( String[] strings, String
packageName, String altPackageName, Class<?> resourceClass) {
+ protected static String[] getTranslations( String[] strings, String
packageName, Class<?> resourceClass) {
if (strings==null) {
return null;
}
String[] translations = new String[strings.length];
for (int i=0;i<translations.length;i++) {
- translations[i] = getTranslation( strings[i], packageName,
altPackageName, resourceClass );
+ translations[i] = getTranslation( strings[i], packageName, resourceClass
);
}
return translations;
}
- protected static String getTranslation( String string, String packageName,
String altPackageName,
- Class<?> resourceClass ) {
+ protected static String getTranslation( String string, String packageName,
Class<?> resourceClass ) {
if ( string == null ) {
return null;
}
@@ -249,7 +247,7 @@ public abstract class BasePluginType<T extends Annotation>
implements IPluginTyp
} else {
String i18nPackage = parts[1];
if ( StringUtils.isEmpty( i18nPackage )) {
- i18nPackage = Const.NVL(packageName, altPackageName);
+ i18nPackage = packageName;
}
String i18nKey = parts[2];
@@ -271,22 +269,24 @@ public abstract class BasePluginType<T extends
Annotation> implements IPluginTyp
DefaultLogLevel.setLogLevel( LogLevel.BASIC );
translation = BaseMessages.getString( packageName, string,
resourceClass );
- if ( translation.startsWith( "!" ) && translation.endsWith( "!" ) ) {
- translation = BaseMessages.getString( classFromResourcesPackage,
string, resourceClass );
- }
// restore loglevel, when the last alternative fails, log it when
loglevel is detailed
//
- DefaultLogLevel.setLogLevel( oldLogLevel );
- if ( !Utils.isEmpty( altPackageName ) && translation.startsWith( "!"
) && translation.endsWith( "!" ) ) {
- translation = BaseMessages.getString( altPackageName, string,
resourceClass );
+ DefaultLogLevel.setLogLevel( oldLogLevel );
+
+ if ( translation.startsWith( "!" ) && translation.endsWith( "!" ) ) {
+ translation = BaseMessages.getString( classFromResourcesPackage,
string, resourceClass );
+ }
+
+ if ( translation.startsWith( "!" ) && translation.endsWith( "!" ) ) {
+ translation = string;
}
} else {
- // Translations are not supported, simply keep the original text.
- //
- translation = string;
+ // Translations are not supported, simply keep the original text.
+ //
+ translation = string;
}
-
+
return translation;
}
}
@@ -487,10 +487,6 @@ public abstract class BasePluginType<T extends Annotation>
implements IPluginTyp
return false;
}
- protected String extractI18nPackageName( T annotation ) {
- return null;
- }
-
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, T annotation ) {
}
@@ -566,19 +562,18 @@ public abstract class BasePluginType<T extends
Annotation> implements IPluginTyp
// Only one ID for now
String[] ids = idList.split( "," );
- String packageName = extractI18nPackageName( annotation );
- String altPackageName = clazz.getPackage().getName();
- String pluginName = getTranslation( extractName( annotation ),
packageName, altPackageName, clazz );
- String description = getTranslation( extractDesc( annotation ),
packageName, altPackageName, clazz );
- String category = getTranslation( extractCategory( annotation ),
packageName, altPackageName, clazz );
+ String packageName = clazz.getPackage().getName();
+ String pluginName = getTranslation( extractName( annotation ),
packageName, clazz );
+ String description = getTranslation( extractDesc( annotation ),
packageName, clazz );
+ String category = getTranslation( extractCategory( annotation ),
packageName, clazz );
String imageFile = extractImageFile( annotation );
boolean separateClassLoader = extractSeparateClassLoader( annotation );
String documentationUrl = extractDocumentationUrl( annotation );
String casesUrl = extractCasesUrl( annotation );
String forumUrl = extractForumUrl( annotation );
- String suggestion = getTranslation( extractSuggestion( annotation ),
packageName, altPackageName, clazz );
+ String suggestion = getTranslation( extractSuggestion( annotation ),
packageName, clazz );
String classLoaderGroup = extractClassLoaderGroup( annotation );
- String[] keywords = getTranslations(extractKeywords( annotation ),
packageName, altPackageName, clazz);
+ String[] keywords = getTranslations(extractKeywords( annotation ),
packageName, clazz);
Map<Class<?>, String> classMap = new HashMap<>();
diff --git
a/core/src/main/java/org/apache/hop/core/plugins/BasePluginTypeExposer.java
b/core/src/main/java/org/apache/hop/core/plugins/BasePluginTypeExposer.java
index 968f540..f670f15 100644
--- a/core/src/main/java/org/apache/hop/core/plugins/BasePluginTypeExposer.java
+++ b/core/src/main/java/org/apache/hop/core/plugins/BasePluginTypeExposer.java
@@ -33,14 +33,12 @@ import java.lang.annotation.Annotation;
public class BasePluginTypeExposer {
private BasePluginType pluginType;
private Object target;
- private String packageName;
- private final String altPackageName;
+ private final String packageName;
public BasePluginTypeExposer( BasePluginType pluginType, Object target ) {
this.target = target;
this.pluginType = pluginType;
-
- altPackageName = target.getClass().getPackage().getName();
+ this.packageName = target.getClass().getPackage().getName();
}
public String extractID( Annotation annotation ) {
@@ -49,21 +47,18 @@ public class BasePluginTypeExposer {
public String extractName( Annotation annotation ) {
String name = pluginType.extractName( annotation );
- packageName = extractI18nPackageName( annotation );
- return BasePluginType.getTranslation( name, packageName, altPackageName,
target.getClass() );
+ return BasePluginType.getTranslation( name, packageName, target.getClass()
);
}
public String extractDesc( Annotation annotation ) {
String desc = pluginType.extractDesc( annotation );
- packageName = extractI18nPackageName( annotation );
- return BasePluginType.getTranslation( desc, packageName, altPackageName,
target.getClass() );
+ return BasePluginType.getTranslation( desc, packageName, target.getClass()
);
}
public String extractCategory( Annotation annotation ) {
String category = pluginType.extractCategory( annotation );
- packageName = extractI18nPackageName( annotation );
- return BasePluginType.getTranslation( category, packageName,
altPackageName, target.getClass() );
+ return BasePluginType.getTranslation( category, packageName,
target.getClass() );
}
public String extractImageFile( Annotation annotation ) {
@@ -74,10 +69,6 @@ public class BasePluginTypeExposer {
return pluginType.extractSeparateClassLoader( annotation );
}
- public String extractI18nPackageName( Annotation annotation ) {
- return pluginType.extractI18nPackageName( annotation );
- }
-
public String extractDocumentationUrl( Annotation annotation ) {
return pluginType.extractDocumentationUrl( annotation );
}
diff --git
a/core/src/main/java/org/apache/hop/core/row/value/ValueMetaPluginType.java
b/core/src/main/java/org/apache/hop/core/row/value/ValueMetaPluginType.java
index be12f6d..ce52215 100644
--- a/core/src/main/java/org/apache/hop/core/row/value/ValueMetaPluginType.java
+++ b/core/src/main/java/org/apache/hop/core/row/value/ValueMetaPluginType.java
@@ -18,7 +18,6 @@
package org.apache.hop.core.row.value;
import org.apache.hop.core.plugins.BasePluginType;
-import org.apache.hop.core.plugins.IPluginType;
import org.apache.hop.core.plugins.PluginAnnotationType;
import org.apache.hop.core.plugins.PluginMainClassType;
import org.apache.hop.core.row.IValueMeta;
@@ -79,11 +78,6 @@ public class ValueMetaPluginType extends
BasePluginType<ValueMetaPlugin> {
}
@Override
- protected String extractI18nPackageName( ValueMetaPlugin annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, ValueMetaPlugin annotation ) {
}
diff --git
a/core/src/main/java/org/apache/hop/core/search/SearchableAnalyserPluginType.java
b/core/src/main/java/org/apache/hop/core/search/SearchableAnalyserPluginType.java
index 61fc7dc..b9f6ad6 100644
---
a/core/src/main/java/org/apache/hop/core/search/SearchableAnalyserPluginType.java
+++
b/core/src/main/java/org/apache/hop/core/search/SearchableAnalyserPluginType.java
@@ -75,11 +75,6 @@ public class SearchableAnalyserPluginType extends
BasePluginType<SearchableAnaly
}
@Override
- protected String extractI18nPackageName( SearchableAnalyserPlugin annotation
) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, SearchableAnalyserPlugin annotation ) {
}
diff --git
a/core/src/main/java/org/apache/hop/core/vfs/plugin/VfsPluginType.java
b/core/src/main/java/org/apache/hop/core/vfs/plugin/VfsPluginType.java
index 668e668..716da18 100644
--- a/core/src/main/java/org/apache/hop/core/vfs/plugin/VfsPluginType.java
+++ b/core/src/main/java/org/apache/hop/core/vfs/plugin/VfsPluginType.java
@@ -79,11 +79,6 @@ public class VfsPluginType extends BasePluginType<VfsPlugin>
{
}
@Override
- protected String extractI18nPackageName( VfsPlugin annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, VfsPlugin annotation ) {
}
diff --git
a/core/src/main/java/org/apache/hop/metadata/plugin/MetadataPluginType.java
b/core/src/main/java/org/apache/hop/metadata/plugin/MetadataPluginType.java
index 4fb8980..6d042a0 100644
--- a/core/src/main/java/org/apache/hop/metadata/plugin/MetadataPluginType.java
+++ b/core/src/main/java/org/apache/hop/metadata/plugin/MetadataPluginType.java
@@ -80,11 +80,6 @@ public class MetadataPluginType extends
BasePluginType<HopMetadata> {
}
@Override
- protected String extractI18nPackageName( HopMetadata annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, HopMetadata annotation ) {
}
diff --git a/engine/src/main/java/org/apache/hop/core/annotations/Action.java
b/engine/src/main/java/org/apache/hop/core/annotations/Action.java
index 10d0fc8..20797cc 100644
--- a/engine/src/main/java/org/apache/hop/core/annotations/Action.java
+++ b/engine/src/main/java/org/apache/hop/core/annotations/Action.java
@@ -50,13 +50,6 @@ public @interface Action {
String categoryDescription() default "";
- /**
- * Please use the i18n:package:key format in name, description and
categoryDescription
- * @return
- */
- @Deprecated
- String i18nPackageName() default "";
-
String documentationUrl() default "";
String casesUrl() default "";
diff --git
a/engine/src/main/java/org/apache/hop/core/auth/AuthenticationConsumerPluginType.java
b/engine/src/main/java/org/apache/hop/core/auth/AuthenticationConsumerPluginType.java
index 7bbfe2e..e4bcec0 100644
---
a/engine/src/main/java/org/apache/hop/core/auth/AuthenticationConsumerPluginType.java
+++
b/engine/src/main/java/org/apache/hop/core/auth/AuthenticationConsumerPluginType.java
@@ -65,11 +65,6 @@ public class AuthenticationConsumerPluginType extends
BasePluginType<Authenticat
}
@Override
- protected String extractI18nPackageName( AuthenticationConsumerPlugin
annotation ) {
- return ( (AuthenticationConsumerPlugin) annotation ).i18nPackageName();
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, AuthenticationConsumerPlugin annotation ) {
}
diff --git
a/engine/src/main/java/org/apache/hop/core/auth/AuthenticationProviderPluginType.java
b/engine/src/main/java/org/apache/hop/core/auth/AuthenticationProviderPluginType.java
index 9153895..95252a6 100644
---
a/engine/src/main/java/org/apache/hop/core/auth/AuthenticationProviderPluginType.java
+++
b/engine/src/main/java/org/apache/hop/core/auth/AuthenticationProviderPluginType.java
@@ -69,11 +69,6 @@ public class AuthenticationProviderPluginType extends
BasePluginType<Authenticat
}
@Override
- protected String extractI18nPackageName( AuthenticationProviderPlugin
annotation ) {
- return ( (AuthenticationProviderPlugin) annotation ).i18nPackageName();
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, AuthenticationProviderPlugin annotation ) {
}
diff --git
a/engine/src/main/java/org/apache/hop/core/compress/CompressionPluginType.java
b/engine/src/main/java/org/apache/hop/core/compress/CompressionPluginType.java
index d1eb660..66b3f64 100644
---
a/engine/src/main/java/org/apache/hop/core/compress/CompressionPluginType.java
+++
b/engine/src/main/java/org/apache/hop/core/compress/CompressionPluginType.java
@@ -72,11 +72,6 @@ public class CompressionPluginType extends
BasePluginType<CompressionPlugin> {
}
@Override
- protected String extractI18nPackageName( CompressionPlugin annotation ) {
- return ( (CompressionPlugin) annotation ).i18nPackageName();
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, CompressionPlugin annotation ) {
}
diff --git
a/engine/src/main/java/org/apache/hop/core/plugins/ActionPluginType.java
b/engine/src/main/java/org/apache/hop/core/plugins/ActionPluginType.java
index 6b00d4a..2a23938 100644
--- a/engine/src/main/java/org/apache/hop/core/plugins/ActionPluginType.java
+++ b/engine/src/main/java/org/apache/hop/core/plugins/ActionPluginType.java
@@ -86,11 +86,6 @@ public class ActionPluginType extends BasePluginType<Action>
{
}
@Override
- protected String extractI18nPackageName( Action annotation ) {
- return annotation.i18nPackageName();
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, Action annotation ) {
}
diff --git
a/engine/src/main/java/org/apache/hop/core/plugins/HopServerPluginType.java
b/engine/src/main/java/org/apache/hop/core/plugins/HopServerPluginType.java
index e485017..78c1224 100644
--- a/engine/src/main/java/org/apache/hop/core/plugins/HopServerPluginType.java
+++ b/engine/src/main/java/org/apache/hop/core/plugins/HopServerPluginType.java
@@ -75,11 +75,6 @@ public class HopServerPluginType extends
BasePluginType<HopServerServlet> {
}
@Override
- protected String extractI18nPackageName( HopServerServlet annotation ) {
- return annotation.i18nPackageName();
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, HopServerServlet annotation ) {
}
diff --git
a/engine/src/main/java/org/apache/hop/core/plugins/PartitionerPluginType.java
b/engine/src/main/java/org/apache/hop/core/plugins/PartitionerPluginType.java
index b2d4b2c..87d3820 100644
---
a/engine/src/main/java/org/apache/hop/core/plugins/PartitionerPluginType.java
+++
b/engine/src/main/java/org/apache/hop/core/plugins/PartitionerPluginType.java
@@ -75,11 +75,6 @@ public class PartitionerPluginType extends
BasePluginType<PartitionerPlugin> {
}
@Override
- protected String extractI18nPackageName( PartitionerPlugin annotation ) {
- return annotation.i18nPackageName();
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, PartitionerPlugin annotation ) {
}
diff --git
a/engine/src/main/java/org/apache/hop/core/plugins/TransformPluginType.java
b/engine/src/main/java/org/apache/hop/core/plugins/TransformPluginType.java
index 1390070..1f4f918 100644
--- a/engine/src/main/java/org/apache/hop/core/plugins/TransformPluginType.java
+++ b/engine/src/main/java/org/apache/hop/core/plugins/TransformPluginType.java
@@ -76,11 +76,6 @@ public class TransformPluginType extends
BasePluginType<Transform> {
}
@Override
- protected String extractI18nPackageName( Transform annotation ) {
- return annotation.i18nPackageName();
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, Transform annotation ) {
}
diff --git
a/engine/src/main/java/org/apache/hop/pipeline/engine/PipelineEnginePluginType.java
b/engine/src/main/java/org/apache/hop/pipeline/engine/PipelineEnginePluginType.java
index 0c34a0b..a15a841 100644
---
a/engine/src/main/java/org/apache/hop/pipeline/engine/PipelineEnginePluginType.java
+++
b/engine/src/main/java/org/apache/hop/pipeline/engine/PipelineEnginePluginType.java
@@ -71,11 +71,6 @@ public class PipelineEnginePluginType extends
BasePluginType<PipelineEnginePlugi
}
@Override
- protected String extractI18nPackageName( PipelineEnginePlugin annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, PipelineEnginePlugin annotation ) {
}
diff --git
a/engine/src/main/java/org/apache/hop/pipeline/transform/RowDistributionPluginType.java
b/engine/src/main/java/org/apache/hop/pipeline/transform/RowDistributionPluginType.java
index 7352fe5..ab7c0e1 100644
---
a/engine/src/main/java/org/apache/hop/pipeline/transform/RowDistributionPluginType.java
+++
b/engine/src/main/java/org/apache/hop/pipeline/transform/RowDistributionPluginType.java
@@ -18,7 +18,6 @@
package org.apache.hop.pipeline.transform;
import org.apache.hop.core.plugins.BasePluginType;
-import org.apache.hop.core.plugins.IPluginType;
import org.apache.hop.core.plugins.PluginAnnotationType;
import org.apache.hop.core.plugins.PluginMainClassType;
@@ -76,11 +75,6 @@ public class RowDistributionPluginType extends
BasePluginType<RowDistributionPlu
}
@Override
- protected String extractI18nPackageName( RowDistributionPlugin annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, RowDistributionPlugin annotation ) {
}
diff --git
a/engine/src/main/java/org/apache/hop/workflow/engine/WorkflowEnginePluginType.java
b/engine/src/main/java/org/apache/hop/workflow/engine/WorkflowEnginePluginType.java
index d62616a..eec6b2b 100644
---
a/engine/src/main/java/org/apache/hop/workflow/engine/WorkflowEnginePluginType.java
+++
b/engine/src/main/java/org/apache/hop/workflow/engine/WorkflowEnginePluginType.java
@@ -18,7 +18,6 @@
package org.apache.hop.workflow.engine;
import org.apache.hop.core.plugins.BasePluginType;
-import org.apache.hop.core.plugins.IPluginType;
import org.apache.hop.core.plugins.PluginAnnotationType;
import org.apache.hop.core.plugins.PluginMainClassType;
@@ -72,11 +71,6 @@ public class WorkflowEnginePluginType extends
BasePluginType<WorkflowEnginePlugi
}
@Override
- protected String extractI18nPackageName( WorkflowEnginePlugin annotation ) {
- return null;
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, WorkflowEnginePlugin annotation ) {
}
diff --git
a/engine/src/test/java/org/apache/hop/core/compress/CompressionPluginTypeTest.java
b/engine/src/test/java/org/apache/hop/core/compress/CompressionPluginTypeTest.java
index 6bb2487..359b12a 100644
---
a/engine/src/test/java/org/apache/hop/core/compress/CompressionPluginTypeTest.java
+++
b/engine/src/test/java/org/apache/hop/core/compress/CompressionPluginTypeTest.java
@@ -23,8 +23,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import java.lang.annotation.Annotation;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -72,7 +70,6 @@ public class CompressionPluginTypeTest {
assertEquals( "Compression Plugin", instance.extractDesc( a ) );
assertEquals( "", instance.extractDocumentationUrl( a ) );
assertEquals( "", instance.extractForumUrl( a ) );
- assertEquals( "", instance.extractI18nPackageName( a ) );
assertNull( instance.extractImageFile( a ) );
assertFalse( instance.extractSeparateClassLoader( a ) );
}
diff --git
a/plugins/actions/writetolog/src/test/java/org/apache/hop/workflow/actions/writetolog/WorkflowActionWriteToLogLoadSaveTest.java
b/plugins/actions/writetolog/src/test/java/org/apache/hop/workflow/actions/writetolog/WorkflowActionWriteToLogLoadSaveTest.java
index cc0a5c0..888e518 100644
---
a/plugins/actions/writetolog/src/test/java/org/apache/hop/workflow/actions/writetolog/WorkflowActionWriteToLogLoadSaveTest.java
+++
b/plugins/actions/writetolog/src/test/java/org/apache/hop/workflow/actions/writetolog/WorkflowActionWriteToLogLoadSaveTest.java
@@ -50,7 +50,7 @@ public class WorkflowActionWriteToLogLoadSaveTest extends
WorkflowActionLoadSave
protected Map<String, String> createGettersMap() {
return toMap(
"logmessage", "getLogMessage",
- "loglevel", "getEntryLogLevel",
+ "loglevel", "getActionLogLevel",
"logsubject", "getLogSubject" );
}
@@ -58,7 +58,7 @@ public class WorkflowActionWriteToLogLoadSaveTest extends
WorkflowActionLoadSave
protected Map<String, String> createSettersMap() {
return toMap(
"logmessage", "setLogMessage",
- "loglevel", "setEntryLogLevel",
+ "loglevel", "setActionLogLevel",
"logsubject", "setLogSubject" );
}
diff --git
a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialogPlugin.java
b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialogPlugin.java
index c88c872..4b358b7 100644
---
a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialogPlugin.java
+++
b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialogPlugin.java
@@ -39,12 +39,5 @@ public @interface PipelineDialogPlugin {
String description() default "";
- /**
- * Please use the i18n:package:key format in name, description and
categoryDescription
- * @return
- */
- @Deprecated
- String i18nPackageName() default "";
-
String classLoaderGroup() default "";
}
diff --git
a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialogPluginType.java
b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialogPluginType.java
index 1ebea78..dcb0feb 100644
---
a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialogPluginType.java
+++
b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialogPluginType.java
@@ -76,11 +76,6 @@ public class PipelineDialogPluginType extends
BasePluginType<PipelineDialogPlugi
}
@Override
- protected String extractI18nPackageName( PipelineDialogPlugin annotation ) {
- return annotation.i18nPackageName();
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, PipelineDialogPlugin annotation ) {
}
diff --git
a/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowDialogPlugin.java
b/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowDialogPlugin.java
index 4ce6f5d..cc230e0 100644
---
a/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowDialogPlugin.java
+++
b/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowDialogPlugin.java
@@ -39,12 +39,5 @@ public @interface WorkflowDialogPlugin {
String description() default "";
- /**
- * Please use the i18n:package:key format in name, description and
categoryDescription
- * @return
- */
- @Deprecated
- String i18nPackageName() default "";
-
String classLoaderGroup() default "";
}
diff --git
a/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowDialogPluginType.java
b/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowDialogPluginType.java
index 2f21423..8a87e27 100644
---
a/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowDialogPluginType.java
+++
b/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowDialogPluginType.java
@@ -77,11 +77,6 @@ public class WorkflowDialogPluginType extends
BasePluginType<WorkflowDialogPlugi
}
@Override
- protected String extractI18nPackageName( WorkflowDialogPlugin annotation ) {
- return ( (WorkflowDialogPlugin) annotation ).i18nPackageName();
- }
-
- @Override
protected void addExtraClasses( Map<Class<?>, String> classMap, Class<?>
clazz, WorkflowDialogPlugin annotation ) {
}
