Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow for moving truncation into the implementing API #68

Merged
merged 6 commits into from
Jan 12, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<properties>
<java.level>8</java.level>
<revision>1.2.1</revision>
<revision>1.3.0</revision>
<changelist>-SNAPSHOT</changelist>

<!-- Jenkins Plug-in Dependencies Versions -->
Expand Down
72 changes: 63 additions & 9 deletions src/main/java/io/jenkins/plugins/checks/api/ChecksOutput.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
import java.util.List;
import java.util.Optional;

import static java.util.Objects.*;
import static java.util.Objects.requireNonNull;

/**
* An output of a check. The output usually contains the most useful information like summary, description,
* annotations, etc.
*/
public class ChecksOutput {
private final String title;
private final String summary;
private final String text;
private final TruncatedString summary;
private final TruncatedString text;
private final List<ChecksAnnotation> annotations;
private final List<ChecksImage> images;

private ChecksOutput(final String title, final String summary, final String text,
private ChecksOutput(final String title, final TruncatedString summary, final TruncatedString text,
final List<ChecksAnnotation> annotations, final List<ChecksImage> images) {
this.title = title;
this.summary = summary;
Expand All @@ -34,7 +34,9 @@ private ChecksOutput(final String title, final String summary, final String text
* the source to copy from
*/
public ChecksOutput(final ChecksOutput that) {
this(that.getTitle().orElse(null), that.getSummary().orElse(null), that.getText().orElse(null),
this(that.getTitle().orElse(null),
that.getSummary().map(TruncatedString::fromString).orElse(null),
that.getText().map(TruncatedString::fromString).orElse(null),
that.getChecksAnnotations(), that.getChecksImages());
}

Expand All @@ -43,11 +45,31 @@ public Optional<String> getTitle() {
}

public Optional<String> getSummary() {
return Optional.ofNullable(summary);
return Optional.ofNullable(summary).map(TruncatedString::toString);
}

/**
* Get the output summary, truncated by {@link TruncatedString} to maxSize.
*
* @param maxSize maximum size to truncate summary to.
* @return Summary, truncated to maxSize with truncation message if appropriate.
*/
public Optional<String> getSummary(final int maxSize) {
return Optional.ofNullable(summary).flatMap(s -> Optional.ofNullable(s.build(maxSize)));
XiongKezhi marked this conversation as resolved.
Show resolved Hide resolved
}

public Optional<String> getText() {
return Optional.ofNullable(text);
return Optional.ofNullable(text).map(TruncatedString::toString);
}

/**
* Get the output text, truncated by {@link TruncatedString} to maxSize.
*
* @param maxSize maximum size to truncate text to.
* @return Text, truncated to maxSize with truncation message if appropriate.
*/
public Optional<String> getText(final int maxSize) {
return Optional.ofNullable(text).flatMap(s -> Optional.ofNullable(s.build(maxSize)));
XiongKezhi marked this conversation as resolved.
Show resolved Hide resolved
}

public List<ChecksAnnotation> getChecksAnnotations() {
Expand All @@ -74,8 +96,8 @@ public String toString() {
*/
public static class ChecksOutputBuilder {
private String title;
private String summary;
private String text;
private TruncatedString summary;
private TruncatedString text;
private List<ChecksAnnotation> annotations;
private List<ChecksImage> images;

Expand Down Expand Up @@ -114,6 +136,22 @@ public ChecksOutputBuilder withTitle(final String title) {
*/
@SuppressWarnings("HiddenField") // builder pattern
public ChecksOutputBuilder withSummary(final String summary) {
return withSummary(TruncatedString.fromString(summary));
}

/**
* Sets the summary of the check run, using a {@link TruncatedString}.
*
* <p>
* Note that for the GitHub check runs, the {@code summary} supports Markdown.
* <p>
*
* @param summary
* the summary of the check run as a {@link TruncatedString}
* @return this builder
*/
@SuppressWarnings("HiddenField")
public ChecksOutputBuilder withSummary(final TruncatedString summary) {
this.summary = requireNonNull(summary);
return this;
}
Expand All @@ -131,6 +169,22 @@ public ChecksOutputBuilder withSummary(final String summary) {
*/
@SuppressWarnings("HiddenField") // builder pattern
public ChecksOutputBuilder withText(final String text) {
return withText(TruncatedString.fromString(text));
}

/**
* Adds the details description for a check run, using a {@link TruncatedString}. This parameter supports Markdown.
*
* <p>
* Note that for a GitHub check run, the {@code text} supports Markdown.
* <p>
*
* @param text
* the details description in Markdown as a {@link TruncatedString}
* @return this builder
*/
@SuppressWarnings("HiddenField")
public ChecksOutputBuilder withText(final TruncatedString text) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adding the truncated string builder in line 66 make sense since it makes things convenient for implementations, but since we already have details URL, I'm not sure the see more link would be necessary for consumers, if not, the truncated string build is unnecessary as well IMO.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#68 (comment)

the see more link was just a helpful extra added in junit it could probably be skipped but truncating is needed afaict

this.text = requireNonNull(text);
return this;
}
Expand Down
218 changes: 218 additions & 0 deletions src/main/java/io/jenkins/plugins/checks/api/TruncatedString.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
package io.jenkins.plugins.checks.api;

import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;

import java.util.*;
import java.util.function.BiConsumer;
import java.util.function.BinaryOperator;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collector;

/**
* Utility wrapper that silently truncates output with a message at a certain size.
* <p>
* The GitHub Checks API has a size limit on text fields. Because it also accepts markdown, it is not trivial to
* truncate to the required length as this could lead to unterminated syntax. The use of this class allows for adding
* chunks of complete markdown until an overflow is detected, at which point a message will be added and all future
* additions will be silently discarded.
*/
public class TruncatedString {

@NonNull
private final List<String> chunks;
@NonNull
private final String truncationText;
private final boolean truncateStart;
private final boolean chunkOnNewlines;


private TruncatedString(@NonNull final List<String> chunks, @NonNull final String truncationText, final boolean truncateStart, final boolean chunkOnNewlines) {
this.chunks = Collections.unmodifiableList(Objects.requireNonNull(chunks));
this.truncationText = Objects.requireNonNull(truncationText);
this.truncateStart = truncateStart;
this.chunkOnNewlines = chunkOnNewlines;
}

/**
* Wrap the provided string as a {@link TruncatedString}.
*
* @param string String to wrap as a {@link TruncatedString}
* @return a {@link TruncatedString} wrapping the provided input
*/
static TruncatedString fromString(final String string) {
return new Builder().setChunkOnNewlines().addText(string).build();
}

/**
* Builds the string without truncation.
*
* @return A string comprising the joined chunks.
*/
@Override
public String toString() {
return String.join("", chunks);
}

private List<String> getChunks() {
if (chunkOnNewlines) {
return Arrays.asList(String.join("", chunks).split("(?<=\r?\n)"));
}
return new ArrayList<>(chunks);
}

/**
* Builds the string such that it does not exceed maxSize, including the truncation string.
*
* @param maxSize the maximum size of the resultant string.
* @return A string comprising as many of the joined chunks that will fit in the given size, plus the truncation
* string if truncation was necessary.
*/
@CheckForNull
public String build(final int maxSize) {
List<String> parts = getChunks();
if (truncateStart) {
Collections.reverse(parts);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The logic here is a little bit hard to understand at a start (I even left a comment first asking why we want a reversed output), since it requires you to understand the implementation of the joiner first and the join method in reverse acknowledges this special case. So, although the joiner is just an embedded class, adding another field (e.g. reverse) and set it identical to truncateStart makes it easier to understand IMO.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I agree that it's a bit manky. I think part of the problem is that we reverse it in two different places. I think I should be able to refactor it so that the Joiner just retuns a plain list of strings and we do the reversal at the end - so the joiner doesn't need to know about reverse; although I'm not sure if that can be done without also moving the truncation text to the start. Would that make more sense? I think it might... so should

1. Some
2. Very 
3. Long
4. Output
5. Here

Truncated to three lines would come out in reverse come out as

4. Output
5. Here
Output truncated!

or

Output truncated!
4. Output
5. Here

I'm thinking possibly the latter.

}
return parts.stream().collect(new Joiner(maxSize));
}


/**
* Builder for {@link TruncatedString}.
*/
public static class Builder {
private String truncationText = "Output truncated.";
private boolean truncateStart = false;
private boolean chunkOnNewlines = false;
private final List<String> chunks = new ArrayList<>();

/**
* Builds the {@link TruncatedString}.
*
* @return the build {@link TruncatedString}.
*/
public TruncatedString build() {
return new TruncatedString(chunks, truncationText, truncateStart, chunkOnNewlines);
}

/**
* Adds a chunk of text to the buidler.
XiongKezhi marked this conversation as resolved.
Show resolved Hide resolved
*
* @param text the chunk of text to append to this builder
* @return this builder
*/
public Builder addText(@NonNull final String text) {
this.chunks.add(Objects.requireNonNull(text));
return this;
}

/**
* Sets the truncation text.
*
* @param truncationText the text to append on overflow
* @return this builder
*/
@SuppressWarnings("HiddenField")
public Builder withTruncationText(@NonNull final String truncationText) {
this.truncationText = Objects.requireNonNull(truncationText);
return this;
}

/**
* Sets truncator to remove excess text from the start, rather than the end.
*
* @return this builder
*/
public Builder setTruncateStart() {
this.truncateStart = true;
return this;
}

/**
* Sets truncator to chunk on newlines rather than the chunks.
*
* @return this builder
*/
public Builder setChunkOnNewlines() {
this.chunkOnNewlines = true;
return this;
}

}

private class Joiner implements Collector<String, Joiner.Accumulator, String> {

private final int maxLength;

Joiner(final int maxLength) {
if (maxLength < truncationText.length()) {
throw new IllegalArgumentException("Maximum length is less than truncation text.");
}
this.maxLength = maxLength;
}

@Override
public Supplier<Joiner.Accumulator> supplier() {
return Accumulator::new;
}

@Override
public BiConsumer<Joiner.Accumulator, String> accumulator() {
return Accumulator::add;
}

@Override
public BinaryOperator<Accumulator> combiner() {
return Accumulator::combine;
}

@Override
public Function<Accumulator, String> finisher() {
return Accumulator::join;
}

@Override
public Set<Characteristics> characteristics() {
return Collections.emptySet();
}

private class Accumulator {
private final List<String> chunks = new ArrayList<>();
private int length = 0;
private boolean truncated = false;

Accumulator combine(final Accumulator other) {
other.chunks.forEach(this::add);
return this;
}

void add(final String chunk) {
if (truncated) {
return;
}
if (length + chunk.length() > maxLength) {
truncated = true;
return;
}
chunks.add(chunk);
length += chunk.length();
}

String join() {
if (truncateStart) {
Collections.reverse(chunks);
}
if (truncated) {
if (length + truncationText.length() > maxLength) {
chunks.remove(truncateStart ? 0 : chunks.size() - 1);
}
chunks.add(truncationText);
}
return String.join("", chunks);
}
}
}

}
6 changes: 3 additions & 3 deletions src/test/java/io/jenkins/plugins/checks/ArchitectureTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
class ArchitectureTest {
@ArchTest
static final ArchRule NO_JENKINS_INSTANCE_CALL = PluginArchitectureRules.NO_JENKINS_INSTANCE_CALL;

@ArchTest
static final ArchRule NO_PUBLIC_TEST_CLASSES = PluginArchitectureRules.NO_PUBLIC_TEST_CLASSES;
// Todo: this seems to prevent paramteized non-integration tests.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I know that I'm using a Junit4 style test here, but that's because the parametrized options for Junit5 seem to require a huge amount of repetitive boilerplate for this kind of use-case.

It seems easy enough to fix this rule upstream to permit Junit4 style tests:

    /** Junit 5 test classes should not be public. */
    public static final ArchRule NO_PUBLIC_TEST_CLASSES =
            noClasses().that().haveSimpleNameEndingWith("Test")
                    .and().haveSimpleNameNotContaining("_jmh")
                    .and().doNotHaveModifier(JavaModifier.ABSTRACT)
+                   .and().areNotAnnotatedWith(RunWith.class)
                    .and().haveSimpleNameNotEndingWith("ITest")
                    .should().bePublic();

if that's deemed acceptable?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@uhafner I'd appreciate your input on this, as you're down as the author of these rules.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with using JUnit 4 in this module. It would be simpler if you would just inline the rule here and adapt it accordingly (or remove it completely).

// @ArchTest
// static final ArchRule NO_PUBLIC_TEST_CLASSES = PluginArchitectureRules.NO_PUBLIC_TEST_CLASSES;

@ArchTest
static final ArchRule NO_TEST_API_CALLED = ArchitectureRules.NO_TEST_API_CALLED;
Expand Down
Loading