This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit 00bdb91f49ba6e8d12986cd14ee9ae8ee86770cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 8 16:53:35 2016 +0200 Use ResourcesHelper where we cans and depreciates some methods --- .../eugene/java/AbstractJavaBeanTransformer.java | 2 +- .../src/main/java/org/nuiton/eugene/Template.java | 7 ++++++ .../eugene/java/ObjectModelTransformerToJava.java | 25 ++++++---------------- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java index fd48793..4f2549f 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/AbstractJavaBeanTransformer.java @@ -80,7 +80,7 @@ public abstract class AbstractJavaBeanTransformer extends ObjectModelTransformer protected boolean notFoundInClassPath(ObjectModelClass input, String className) { String fqn = input.getPackageName() + "." + className; - boolean inClassPath = isInClassPath(fqn); + boolean inClassPath = getResourcesHelper().isJavaFileInClassPath(fqn); return !inClassPath; } diff --git a/eugene/src/main/java/org/nuiton/eugene/Template.java b/eugene/src/main/java/org/nuiton/eugene/Template.java index 950ecbb..aa8980b 100644 --- a/eugene/src/main/java/org/nuiton/eugene/Template.java +++ b/eugene/src/main/java/org/nuiton/eugene/Template.java @@ -57,6 +57,7 @@ public abstract class Template<M extends Model> implements TemplateConfiguration /** Model */ protected M model; + protected ResourcesHelper resourcesHelper; public abstract void applyTemplate(M model, File destDir) throws IOException; @@ -164,4 +165,10 @@ public abstract class Template<M extends Model> implements TemplateConfiguration return model; } + protected ResourcesHelper getResourcesHelper() { + if (resourcesHelper == null) { + resourcesHelper = new ResourcesHelper(getClassLoader(), isVerbose()); + } + return resourcesHelper; + } } diff --git a/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java b/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java index 40b5f17..52072fa 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java @@ -978,7 +978,9 @@ public abstract class ObjectModelTransformerToJava extends ObjectModelTransforme * @return {@code true} if fqn of classifier was found in class-path, * {@code false} otherwise. * @since 2.5 + * @deprecated since 3.0, use the {@link #getResourcesHelper()} object directly. */ + @Deprecated protected boolean isInClassPath(ObjectModelClassifier classifier) { return isInClassPath(classifier.getQualifiedName()); } @@ -991,26 +993,11 @@ public abstract class ObjectModelTransformerToJava extends ObjectModelTransforme * @return {@code true} if fqn was found in class-path, * {@code false} otherwise. * @since 2.5 + * @deprecated since 3.0, use the {@link #getResourcesHelper()} object directly. */ + @Deprecated protected boolean isInClassPath(String fqn) { - - URL fileLocation = getFileInClassPath(fqn); - - if (fileLocation != null) { - - // there is already a existing file in class-path, skip - - if (log.isDebugEnabled()) { - log.debug("Will not generate [" + fqn + "], already found in class-path at location : " + fileLocation); - } else if (isVerbose()) { - log.info("Will not generate [" + fqn + "], already found in class-path."); - } - - return true; - } - - // is not found - return false; + return getResourcesHelper().isJavaFileInClassPath(fqn); } /** @@ -1022,7 +1009,9 @@ public abstract class ObjectModelTransformerToJava extends ObjectModelTransforme * @return {@code true} if fqn was found in class-path, * {@code false} otherwise. * @since 2.7.1 + * @deprecated since 3.0, use the {@link #getResourcesHelper()} object directly. */ + @Deprecated protected boolean isInClassPath(String packageName, String className) { return isInClassPath(packageName + "." + className); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.