This is an automated email from the ASF dual-hosted git repository. wlieurance pushed a commit to branch TAMAYA-394-sonarcloud-suggestions in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-sandbox.git
commit 85724d15cc33022ce37aebc54067ebbc0c02f86b Author: William Lieurance <[email protected]> AuthorDate: Thu Jun 20 20:04:58 2019 -0500 TAMAYA-394 Sonarcloud suggested changes --- .../apache/tamaya/jsr382/JavaConfigAdapter.java | 15 --------------- .../converter/BooleanAsIntegerConverterFix.java | 3 +++ .../tamaya/jsr382/converter/ProviderConverter.java | 3 +++ .../apache/tamaya/doc/formats/HtmlDocFormat.java | 6 +++++- .../metamodel/internal/ComponentFactory.java | 22 ++++------------------ .../metamodel/internal/resolver/JavaResolver.java | 11 +++++------ .../internal/resolver/JavaResolverTest.java | 12 ++++++++++++ .../apache/tamaya/validation/ValidationResult.java | 4 ++-- 8 files changed, 34 insertions(+), 42 deletions(-) diff --git a/configjsr/src/main/java/org/apache/tamaya/jsr382/JavaConfigAdapter.java b/configjsr/src/main/java/org/apache/tamaya/jsr382/JavaConfigAdapter.java index 411fca0..0607160 100644 --- a/configjsr/src/main/java/org/apache/tamaya/jsr382/JavaConfigAdapter.java +++ b/configjsr/src/main/java/org/apache/tamaya/jsr382/JavaConfigAdapter.java @@ -26,9 +26,6 @@ import javax.config.Config; import javax.config.ConfigAccessor; import javax.config.ConfigSnapshot; import javax.config.spi.ConfigSource; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.*; @@ -99,18 +96,6 @@ public class JavaConfigAdapter implements Config, Serializable { return JavaConfigAdapterFactory.toConfigSources(delegate.getContext().getPropertySources()); } - private void writeObject(ObjectOutputStream out) throws IOException { - if (!(this.delegate instanceof Serializable)) { - out.writeObject(this.delegate.getSnapshot()); - } else { - out.writeObject(this.delegate); - } - } - - private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - this.delegate = (Configuration) in.readObject(); - } - @Override public String toString() { return "Tamaya Config{" + diff --git a/configjsr/src/main/java/org/apache/tamaya/jsr382/converter/BooleanAsIntegerConverterFix.java b/configjsr/src/main/java/org/apache/tamaya/jsr382/converter/BooleanAsIntegerConverterFix.java index ec932aa..a202174 100644 --- a/configjsr/src/main/java/org/apache/tamaya/jsr382/converter/BooleanAsIntegerConverterFix.java +++ b/configjsr/src/main/java/org/apache/tamaya/jsr382/converter/BooleanAsIntegerConverterFix.java @@ -50,6 +50,9 @@ public class BooleanAsIntegerConverterFix implements PropertyConverter<Boolean> @Override public boolean equals(Object o) { + if (o == null){ + return false; + } return getClass().equals(o.getClass()); } diff --git a/configjsr/src/main/java/org/apache/tamaya/jsr382/converter/ProviderConverter.java b/configjsr/src/main/java/org/apache/tamaya/jsr382/converter/ProviderConverter.java index d1e6d52..fbc2350 100644 --- a/configjsr/src/main/java/org/apache/tamaya/jsr382/converter/ProviderConverter.java +++ b/configjsr/src/main/java/org/apache/tamaya/jsr382/converter/ProviderConverter.java @@ -56,6 +56,9 @@ public class ProviderConverter implements PropertyConverter<Provider> { @Override public boolean equals(Object o) { + if (o == null){ + return false; + } return getClass().equals(o.getClass()); } diff --git a/documentation/src/main/java/org/apache/tamaya/doc/formats/HtmlDocFormat.java b/documentation/src/main/java/org/apache/tamaya/doc/formats/HtmlDocFormat.java index 577e360..81f200a 100644 --- a/documentation/src/main/java/org/apache/tamaya/doc/formats/HtmlDocFormat.java +++ b/documentation/src/main/java/org/apache/tamaya/doc/formats/HtmlDocFormat.java @@ -52,11 +52,15 @@ import static j2html.TagCreator.title; import static j2html.TagCreator.thead; import static j2html.TagCreator.tr; import static j2html.TagCreator.ul; +import java.util.logging.Level; +import java.util.logging.Logger; /** * A HTML-based documentation format. */ public class HtmlDocFormat implements DocFormat<String> { + private static final Logger LOG = Logger.getLogger(HtmlDocFormat.class.getName()); + @Override public String apply(DocumentedConfiguration documentedConfiguration) { List<ContainerTag> areaTags = new ArrayList<>(); @@ -84,7 +88,7 @@ public class HtmlDocFormat implements DocFormat<String> { w.append(result); w.flush(); } catch (IOException e) { - e.printStackTrace(); + LOG.log(Level.WARNING, e, () -> "Failed writing file ./doc.html"); } } diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentFactory.java index 59d4b69..2c87e04 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentFactory.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ComponentFactory.java @@ -70,6 +70,10 @@ public final class ComponentFactory<T> { } } } + + if (comp == null){ + return null; + } // Multiple instances: createObject a new instance using the parameterless constructor for all subsequent // resolutions. if(loaded.contains(comp.getClass().getName())){ @@ -80,24 +84,6 @@ public final class ComponentFactory<T> { return comp; } -// public Collection<T> loadInstances(NodeList nodeList) { -// List<T> items = new ArrayList<>(); -// for(int i=0;i<nodeList.getLength();i++){ -// Node node = nodeList.item(i); -// if(node.getNodeName().equals("filter")){ -// String type = node.getNodeValue(); -// try { -// T item = getComponent(type); -// ComponentConfigurator.configure(item, node); -// items.addPropertyValue(item); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// } -// } -// return items; -// } - @Override public String toString() { return "ComponentFactory{" + diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java index 704992a..7c328bc 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolver.java @@ -97,20 +97,19 @@ public final class JavaResolver { ByteArrayOutputStream sw = new ByteArrayOutputStream(); byte[] buff = new byte[512]; result[0] = proc.waitFor(); - int read = out.read(buff); - while(read > 0){ + int read = 0; + while((read = out.read(buff)) > 0){ sw.write(buff, 0, read); - out.read(buff); } result[1] = sw.toString(); - read = err.read(buff); - while(read > 0){ + sw.reset(); + while((read = err.read(buff)) > 0){ sw.write(buff, 0, read); - err.read(buff); } result[2] = sw.toString(); return result; } catch (InterruptedException e) { + Thread.currentThread().interrupt(); return new Object[]{"","Process interrupted.", -1}; } catch (Exception e){ return new Object[]{"","Process failed: " + e, -1}; diff --git a/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolverTest.java b/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolverTest.java index a7acbb6..3ebd55f 100644 --- a/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolverTest.java +++ b/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/JavaResolverTest.java @@ -82,4 +82,16 @@ public class JavaResolverTest { return TEST; } + @Test + public void evalCommand() throws Exception { + Object[] ret = JavaResolver.eval("echo -n " + TEST); + + Integer returnValue = (Integer) ret[0]; + String returnOut = (String) ret[1]; + String returnErr = (String) ret[2]; + assertThat(0).isEqualTo(returnValue); + assertThat(TEST).isEqualTo(returnOut); + assertThat("").isEqualTo(returnErr); + } + } diff --git a/validation/src/main/java/org/apache/tamaya/validation/ValidationResult.java b/validation/src/main/java/org/apache/tamaya/validation/ValidationResult.java index 3c1dad0..be2f2d8 100644 --- a/validation/src/main/java/org/apache/tamaya/validation/ValidationResult.java +++ b/validation/src/main/java/org/apache/tamaya/validation/ValidationResult.java @@ -34,7 +34,7 @@ public final class ValidationResult { /** * Creates a new validation result. - * @param snapshot the snapshpt config, not null. + * @param snapshot the snapshot config, not null. * @param result the result, not null. */ public ValidationResult(ConfigurationSnapshot snapshot, List<ValidationCheck> result) { @@ -82,7 +82,7 @@ public final class ValidationResult { return result; }else{ return result.stream() - .filter(f -> findings.contains(f)) + .filter(f -> findings.contains(f.getResult())) .collect(Collectors.toList()); } }
