respect SkipPropertiesFallback + better logging for unused properties
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fdf704e4 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fdf704e4 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fdf704e4 Branch: refs/heads/master Commit: fdf704e403209d780aa041fced4eff3ca144beb2 Parents: 57a235d Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Mon Aug 15 16:16:16 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Mon Aug 15 16:16:16 2016 +0200 ---------------------------------------------------------------------- .../org/apache/openejb/assembler/classic/Assembler.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/fdf704e4/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java index 06dab32..76b161a 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java @@ -2857,6 +2857,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } private Object doCreateResource(final Collection<ServiceInfo> infos, final ResourceInfo serviceInfo) throws OpenEJBException { + final String skipPropertiesFallback = (String) serviceInfo.properties.remove("SkipPropertiesFallback"); // do it early otherwise we can loose it final ObjectRecipe serviceRecipe = createRecipe(infos, serviceInfo); final boolean properties = PropertiesFactory.class.getName().equals(serviceInfo.className); if ("false".equalsIgnoreCase(serviceInfo.properties.getProperty("SkipImplicitAttributes", "false")) && !properties) { @@ -2866,7 +2867,6 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A serviceInfo.properties.remove("SkipImplicitAttributes"); // if custom instance allow to skip properties fallback to avoid to set unexpectedly it - connectionProps of DBs - final String skipPropertiesFallback = (String) serviceInfo.properties.remove("SkipPropertiesFallback"); final AtomicReference<Properties> injectedProperties = new AtomicReference<>(); if (!"true".equalsIgnoreCase(skipPropertiesFallback)) { serviceRecipe.setProperty("properties", new UnsetPropertiesRecipe() { @@ -3460,10 +3460,11 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A if (isInternalProperty(property)) { return; } + final String msg = "unused property '" + property + "' for resource '" + id + "'"; if (null != parentLogger) { - parentLogger.getChildLogger("service").warning("unusedProperty {0} - {1}", property, id); - }else{ - System.out.println("unusedProperty: " + property + " - " + id); + parentLogger.getChildLogger("service").warning(msg); + } else { // note: we should throw an exception if this is called, shouldnt be possible in our lifecycle + System.out.println(msg); } }
