Add diff tool #89

skuzzle · 2023-03-23T08:52:51Z

Extract diff ceration into its own module. Fixes #88

sonatype-lift · 2023-03-23T08:59:11Z

diff-tool/src/main/java/de/skuzzle/difftool/thirdparty/DiffUtilsDiffAlgorithm.java

+            .newTag(inlineMarker())
+            .oldTag(inlineMarker()));
+
+    private static BiFunction<DiffRow.Tag, Boolean, String> inlineMarker() {


UnnecessaryLambda: Returning a lambda from a helper method or saving it in a constant is unnecessary; prefer to implement the functional interface method directly and use a method reference instead.

Suggested change

private static BiFunction<DiffRow.Tag, Boolean, String> inlineMarker() {

.newTag(DiffUtilsDiffAlgorithm::inlineMarker)

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

Help us improve LIFT! (Sonatype LiftBot external survey)

Was this a good recommendation for you? _{Answering this survey will not impact your Lift settings.}

[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

sonatype-lift · 2023-03-23T09:01:43Z

🛠 Lift Auto-fix

Some of the Lift findings in this PR can be automatically fixed. You can download and apply these changes in your local project directory of your branch to review the suggestions before committing.¹

# Download the patch
curl https://lift.sonatype.com/api/patch/github.com/skuzzle/snapshot-tests/89.diff -o lift-autofixes.diff

# Apply the patch with git
git apply lift-autofixes.diff

# Review the changes
git diff

Want it all in a single command? Open a terminal in your project's directory and copy and paste the following command:

curl https://lift.sonatype.com/api/patch/github.com/skuzzle/snapshot-tests/89.diff | git apply

Once you're satisfied, commit and push your changes in your project.

You can preview the patch by opening the patch URL in the browser. ↩

Closes #44 and Closes #90

sonatype-lift · 2023-03-27T11:27:41Z

diff-tool/src/main/java/de/skuzzle/difftool/GitLineSeparator.java

+            try {
+                final Process exec = Runtime.getRuntime().exec(command);
+                exec.getErrorStream().readAllBytes();
+                return new String(exec.getInputStream().readAllBytes());


DefaultCharset: Implicit use of the platform default charset, which can result in differing behaviour between JVM executions or incorrect behavior if the encoding of the data source doesn't match expectations.

Suggested change

return new String(exec.getInputStream().readAllBytes());

return new String(exec.getInputStream().readAllBytes(), Charset.defaultCharset());

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

Help us improve LIFT! (Sonatype LiftBot external survey)

Was this a good recommendation for you? _{Answering this survey will not impact your Lift settings.}

[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

sonatype-lift · 2023-03-27T11:27:43Z

diff-tool/src/main/java/de/skuzzle/difftool/GitLineSeparator.java

+            try {
+                final Process exec = Runtime.getRuntime().exec(command);
+                exec.getErrorStream().readAllBytes();
+                return new String(exec.getInputStream().readAllBytes());


RESOURCE_LEAK: resource of type java.lang.Process acquired by call to exec(...) at line 51 is not released after line 53.

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

Help us improve LIFT! (Sonatype LiftBot external survey)

Was this a good recommendation for you? _{Answering this survey will not impact your Lift settings.}

[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

sonatype-lift · 2023-03-27T11:39:29Z

diff-tool/src/main/java/de/skuzzle/difftool/GitLineSeparator.java

+                    err.readAllBytes();
+                }
+                try (var in = exec.getInputStream()) {
+                    return new String(in.readAllBytes());


DefaultCharset: Implicit use of the platform default charset, which can result in differing behaviour between JVM executions or incorrect behavior if the encoding of the data source doesn't match expectations.

Suggested change

return new String(in.readAllBytes());

return new String(in.readAllBytes(), Charset.defaultCharset());

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

Help us improve LIFT! (Sonatype LiftBot external survey)

Was this a good recommendation for you? _{Answering this survey will not impact your Lift settings.}

[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

sonatype-lift · 2023-03-27T11:39:31Z

diff-tool/src/main/java/de/skuzzle/difftool/GitLineSeparator.java

+                try (var in = exec.getInputStream()) {
+                    return new String(in.readAllBytes());
+                }
+            } catch (Exception e) {


RESOURCE_LEAK: resource of type java.lang.Process acquired to exec by call to exec(...) at line 51 is not released after line 58.
Note: potential exception at line 54

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

Help us improve LIFT! (Sonatype LiftBot external survey)

Was this a good recommendation for you? _{Answering this survey will not impact your Lift settings.}

[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

sonatype-lift · 2023-03-27T11:39:33Z

diff-tool/src/main/java/de/skuzzle/difftool/GitLineSeparator.java

+                try (var err = exec.getErrorStream()) {
+                    err.readAllBytes();
+                }
+                try (var in = exec.getInputStream()) {


RESOURCE_LEAK: resource of type java.lang.Process acquired by call to exec(...) at line 51 is not released after line 55.

ℹ️ Expand to see all @sonatype-lift commands

You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.

Command Usage

@sonatype-lift ignore Leave out the above finding from this PR

@sonatype-lift ignoreall Leave out all the existing findings from this PR

@sonatype-lift exclude <file|issue|path|tool> Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file

Note: When talking to LiftBot, you need to refresh the page to see its response.
_{Click here to add LiftBot to another repo.}

Help us improve LIFT! (Sonatype LiftBot external survey)

Was this a good recommendation for you? _{Answering this survey will not impact your Lift settings.}

[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]

skuzzle added 3 commits March 23, 2023 09:51

Extract diff creation into own module.

3d3e0d2

Apply spotless

7d199a2

Make continuation string configurable

49e8f93

sonatype-lift bot reviewed Mar 23, 2023

View reviewed changes

skuzzle added 2 commits March 24, 2023 09:11

Add package-info

373c875

Add possibility to normalize line endings.

1d85bfe

Closes #44 and Closes #90

sonatype-lift bot reviewed Mar 27, 2023

View reviewed changes

skuzzle added 2 commits March 27, 2023 13:33

Properly close streams

759ac97

Replace lambda with method reference

120679b

sonatype-lift bot reviewed Mar 27, 2023

View reviewed changes

skuzzle added 2 commits March 27, 2023 13:43

Wait for process to exit

d75db08

Apply spotless

354f201

skuzzle merged commit 354f201 into dev Mar 28, 2023

skuzzle deleted the add-diff-tool branch March 28, 2023 06:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add diff tool #89

Add diff tool #89

skuzzle commented Mar 23, 2023 •

edited

Loading

sonatype-lift bot Mar 23, 2023

sonatype-lift bot commented Mar 23, 2023

sonatype-lift bot Mar 27, 2023

sonatype-lift bot Mar 27, 2023

sonatype-lift bot Mar 27, 2023

sonatype-lift bot Mar 27, 2023

sonatype-lift bot Mar 27, 2023

	private static BiFunction<DiffRow.Tag, Boolean, String> inlineMarker() {
	.newTag(DiffUtilsDiffAlgorithm::inlineMarker)

Command	Usage
`@sonatype-lift ignore`	Leave out the above finding from this PR
`@sonatype-lift ignoreall`	Leave out all the existing findings from this PR
`@sonatype-lift exclude <file\|issue\|path\|tool>`	Exclude specified `file\|issue\|path\|tool` from Lift findings by updating your config.toml file

	return new String(exec.getInputStream().readAllBytes());
	return new String(exec.getInputStream().readAllBytes(), Charset.defaultCharset());

	return new String(in.readAllBytes());
	return new String(in.readAllBytes(), Charset.defaultCharset());

Add diff tool #89

Add diff tool #89

Conversation

skuzzle commented Mar 23, 2023 • edited Loading

sonatype-lift bot Mar 23, 2023

Choose a reason for hiding this comment

sonatype-lift bot commented Mar 23, 2023

🛠 Lift Auto-fix

Footnotes

sonatype-lift bot Mar 27, 2023

Choose a reason for hiding this comment

sonatype-lift bot Mar 27, 2023

Choose a reason for hiding this comment

sonatype-lift bot Mar 27, 2023

Choose a reason for hiding this comment

sonatype-lift bot Mar 27, 2023

Choose a reason for hiding this comment

sonatype-lift bot Mar 27, 2023

Choose a reason for hiding this comment

skuzzle commented Mar 23, 2023 •

edited

Loading