From dd92da6ebf224b7082726f215f248254227a7a6b Mon Sep 17 00:00:00 2001 From: kaklakariada Date: Sun, 18 Nov 2018 12:53:46 +0100 Subject: [PATCH 1/3] Fix sonarcloud badges --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index cdc7abc76..ce4e3b8c3 100644 --- a/README.md +++ b/README.md @@ -17,17 +17,17 @@ You can learn more about requirement tracing and how to use OpenFastTrace in the Sonarcloud status: -[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace%3Adevelop&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace%3Adevelop) -[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace%3Adevelop&metric=bugs)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace%3Adevelop) -[![Code smells](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace%3Adevelop&metric=code_smells)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace%3Adevelop) -[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace%3Adevelop&metric=coverage)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace%3Adevelop) -[![Duplicated Lines](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace%3Adevelop&metric=duplicated_lines_density)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace%3Adevelop) -[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace%3Adevelop&metric=ncloc)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace%3Adevelop) -[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace%3Adevelop&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace%3Adevelop) -[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace%3Adevelop&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace%3Adevelop) -[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace%3Adevelop&metric=security_rating)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace%3Adevelop) -[![Technical Dept](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace%3Adevelop&metric=sqale_index)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace%3Adevelop) -[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace%3Adevelop&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace%3Adevelop) +[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace) +[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace&metric=bugs)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace) +[![Code smells](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace&metric=code_smells)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace) +[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace&metric=coverage)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace) +[![Duplicated Lines](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace&metric=duplicated_lines_density)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace) +[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace&metric=ncloc)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace) +[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace) +[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace) +[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace&metric=security_rating)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace) +[![Technical Dept](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace&metric=sqale_index)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace) +[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=org.itsallcode%3Aopenfasttrace&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace) * [Blog](https://blog.itsallcode.org/) * [Contributing guide](CONTRIBUTING.md) From 76accb19d5dc2eecb9f0e3f6803c4546ade7eca0 Mon Sep 17 00:00:00 2001 From: kaklakariada Date: Sun, 18 Nov 2018 13:04:51 +0100 Subject: [PATCH 2/3] Fix sonar warnings --- .../org/itsallcode/openfasttrace/ReportSettings.java | 8 ++++---- .../core/xml/tree/CallbackContentHandler.java | 3 ++- .../importer/tag/TagImporterFactory.java | 5 +---- .../report/view/html/MarkdownLineStateMachine.java | 12 ++++++------ .../report/view/html/MarkdownLineTransition.java | 3 ++- .../testutil/AbstractFileBasedTest.java | 2 ++ 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/itsallcode/openfasttrace/ReportSettings.java b/src/main/java/org/itsallcode/openfasttrace/ReportSettings.java index d226729fd..b0cf94b23 100644 --- a/src/main/java/org/itsallcode/openfasttrace/ReportSettings.java +++ b/src/main/java/org/itsallcode/openfasttrace/ReportSettings.java @@ -110,10 +110,10 @@ public static Builder builder() */ public static class Builder { - public Newline newline = Newline.UNIX; - public String outputFormat = ReportConstants.DEFAULT_REPORT_FORMAT; - public boolean showOrigin = false; - ReportVerbosity verbosity = ReportVerbosity.FAILURE_DETAILS; + private Newline newline = Newline.UNIX; + private String outputFormat = ReportConstants.DEFAULT_REPORT_FORMAT; + private boolean showOrigin = false; + private ReportVerbosity verbosity = ReportVerbosity.FAILURE_DETAILS; private Builder() { diff --git a/src/main/java/org/itsallcode/openfasttrace/core/xml/tree/CallbackContentHandler.java b/src/main/java/org/itsallcode/openfasttrace/core/xml/tree/CallbackContentHandler.java index e907cb4d3..4d7c99b23 100644 --- a/src/main/java/org/itsallcode/openfasttrace/core/xml/tree/CallbackContentHandler.java +++ b/src/main/java/org/itsallcode/openfasttrace/core/xml/tree/CallbackContentHandler.java @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Consumer; +import java.util.function.IntConsumer; import java.util.function.Supplier; import java.util.logging.Logger; @@ -126,7 +127,7 @@ public void pushDelegate(final TreeContentHandler delegate) } public CallbackContentHandler addIntDataListener(final String elementName, - final Consumer listener) + final IntConsumer listener) { addCharacterDataListener(elementName, data -> { if (data == null || data.isEmpty()) diff --git a/src/main/java/org/itsallcode/openfasttrace/importer/tag/TagImporterFactory.java b/src/main/java/org/itsallcode/openfasttrace/importer/tag/TagImporterFactory.java index e008f2ed9..19bd8e2a8 100644 --- a/src/main/java/org/itsallcode/openfasttrace/importer/tag/TagImporterFactory.java +++ b/src/main/java/org/itsallcode/openfasttrace/importer/tag/TagImporterFactory.java @@ -62,11 +62,8 @@ public boolean supportsDefaultFile(final InputFile file) private Optional findConfig(final InputFile file) { - return getPathConfigs()// - .peek(config -> LOG - .finest(() -> "Checking config " + config + " with file " + file)) + return getPathConfigs() // .filter(config -> config.matches(file)) // - .peek(config -> LOG.finest(() -> "Config " + config + " matches file " + file)) // .findFirst(); } diff --git a/src/main/java/org/itsallcode/openfasttrace/report/view/html/MarkdownLineStateMachine.java b/src/main/java/org/itsallcode/openfasttrace/report/view/html/MarkdownLineStateMachine.java index 0f118de13..710886830 100644 --- a/src/main/java/org/itsallcode/openfasttrace/report/view/html/MarkdownLineStateMachine.java +++ b/src/main/java/org/itsallcode/openfasttrace/report/view/html/MarkdownLineStateMachine.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; -import java.util.function.Function; +import java.util.function.UnaryOperator; public class MarkdownLineStateMachine { @@ -85,7 +85,7 @@ protected void initializeTransitions() } private void t(final MarkdownLineState from, final MarkdownLineState to, final String pattern, - final String postfix, final String prefix, final Function conversion) + final String postfix, final String prefix, final UnaryOperator conversion) { this.transitions .add(new MarkdownLineTransition(from, to, pattern, prefix, postfix, conversion)); @@ -139,22 +139,22 @@ protected void closeLastLineState(final StringBuilder builder, final MarkdownLin } } - protected Function empty() + protected UnaryOperator empty() { return s -> ""; } - protected Function trimEnum() + protected UnaryOperator trimEnum() { return s -> s.substring(s.indexOf('.') + 1).trim(); } - protected Function trimPre() + protected UnaryOperator trimPre() { return s -> s.substring(4); } - protected Function trimBullet() + protected UnaryOperator trimBullet() { return s -> s.replaceFirst("^ {0,3}[-+*]", "").trim(); } diff --git a/src/main/java/org/itsallcode/openfasttrace/report/view/html/MarkdownLineTransition.java b/src/main/java/org/itsallcode/openfasttrace/report/view/html/MarkdownLineTransition.java index 98905f5b5..d7651d284 100644 --- a/src/main/java/org/itsallcode/openfasttrace/report/view/html/MarkdownLineTransition.java +++ b/src/main/java/org/itsallcode/openfasttrace/report/view/html/MarkdownLineTransition.java @@ -23,6 +23,7 @@ */ import java.util.function.Function; +import java.util.function.UnaryOperator; import java.util.regex.Pattern; /** @@ -56,7 +57,7 @@ class MarkdownLineTransition */ public MarkdownLineTransition(final MarkdownLineState from, final MarkdownLineState to, final String pattern, final String prefix, final String postfix, - final Function conversion) + final UnaryOperator conversion) { super(); this.from = from; diff --git a/src/test/java/org/itsallcode/openfasttrace/testutil/AbstractFileBasedTest.java b/src/test/java/org/itsallcode/openfasttrace/testutil/AbstractFileBasedTest.java index 7ff7a0558..528e6d338 100644 --- a/src/test/java/org/itsallcode/openfasttrace/testutil/AbstractFileBasedTest.java +++ b/src/test/java/org/itsallcode/openfasttrace/testutil/AbstractFileBasedTest.java @@ -32,6 +32,8 @@ /** * This class is the base class for integration tests that require input files. */ +// This is a base class for tests and has no tests by intention. +@SuppressWarnings("squid:S2187") public class AbstractFileBasedTest { protected void writeTextFile(final File file, final String content) throws IOException From 3fa9b63e68821fd41e607f4791bd6ca4ffa1e6b5 Mon Sep 17 00:00:00 2001 From: kaklakariada Date: Sun, 18 Nov 2018 13:09:07 +0100 Subject: [PATCH 3/3] Fix sonar warnings --- .../openfasttrace/importer/tag/TagImporterFactory.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/org/itsallcode/openfasttrace/importer/tag/TagImporterFactory.java b/src/main/java/org/itsallcode/openfasttrace/importer/tag/TagImporterFactory.java index 19bd8e2a8..1505fd16b 100644 --- a/src/main/java/org/itsallcode/openfasttrace/importer/tag/TagImporterFactory.java +++ b/src/main/java/org/itsallcode/openfasttrace/importer/tag/TagImporterFactory.java @@ -3,7 +3,6 @@ import static java.util.stream.Collectors.toList; import java.util.Optional; -import java.util.logging.Logger; import java.util.regex.Pattern; import java.util.stream.Stream; @@ -39,8 +38,6 @@ // [impl->dsn~import.full-coverage-tag~1] public class TagImporterFactory extends ImporterFactory { - private static final Logger LOG = Logger.getLogger(TagImporterFactory.class.getName()); - private static final String DEFAULT_FILE_REGEX = "(?i).*\\.java"; private static final Pattern DEFAULT_FILE_PATTERN = Pattern.compile(DEFAULT_FILE_REGEX);