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

Check for an entire link rather than just a jira key #312

Merged
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -108,25 +108,20 @@ else if ( issueKeys.size() > repositoryConfig.jira.getIssueLinksLimit() ) {

private String constructLinksSection(Set<String> issueKeys, String body) {
final String lowerCaseBody = body.toLowerCase( Locale.ROOT );
final List<String> keys = new ArrayList<>( issueKeys.size() );
final List<String> links = new ArrayList<>( issueKeys.size() );
for ( String key : issueKeys ) {
// Add links for issue keys that are not already found in the original PR body
if ( !lowerCaseBody.contains( key.toLowerCase( Locale.ROOT ) ) ) {
keys.add( key );
String link = String.format( Locale.ROOT, LINK_TEMPLATE, key );
if ( !lowerCaseBody.contains( link.toLowerCase( Locale.ROOT ) ) ) {
links.add( link );
}
}

if ( keys.isEmpty() ) {
if ( links.isEmpty() ) {
return null;
}

// Try to pre-size the StringBuilder with the correct capacity
final int linkSize = LINK_TEMPLATE.length() + keys.get( 0 ).length() + 1;
final StringBuilder sb = new StringBuilder( linkSize * keys.size() );
for ( final String key : keys ) {
sb.append( String.format( LINK_TEMPLATE, key ) ).append( '\n' );
}
return START_MARKER + "\n" + EDITOR_WARNING + sb + END_MARKER;
return String.format( Locale.ROOT, "%s\n%s%s\n%s", START_MARKER, EDITOR_WARNING, String.join( "\n", links ), END_MARKER );
}

private static String removeLinksSection(String originalBody, int startIndex, int endIndex) {
Expand Down