Skip to content

Commit

Permalink
📺 Release 2.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jesperancinha committed May 14, 2021
1 parent 81352a2 commit 9296095
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 24 deletions.
3 changes: 0 additions & 3 deletions markdowner-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,6 @@
</goals>
</execution>
</executions>
<configuration>
<sourcepath>target/generated-sources/delombok</sourcepath>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package org.jesperancinha.parser.markdowner.badges.model;

import com.fasterxml.jackson.annotation.JsonCreator;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Value;

@Value
@Builder
@AllArgsConstructor(onConstructor_ = @JsonCreator)
@AllArgsConstructor
public class Badge {
String title;
String badgeText;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
package org.jesperancinha.parser.markdowner.badges.model;

import com.fasterxml.jackson.annotation.JsonCreator;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Value;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;

@Value
@Builder
@AllArgsConstructor(onConstructor_ = @JsonCreator)
@AllArgsConstructor
public class BadgeGroup {
BadgeType badgeType;
Map<Pattern, Badge> badgeHashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.jesperancinha.parser.markdowner.badges.model;

import com.fasterxml.jackson.annotation.JsonCreator;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Value;
Expand All @@ -9,7 +8,7 @@

@Value
@Builder
@AllArgsConstructor(onConstructor_ = @JsonCreator)
@AllArgsConstructor
public class BadgePattern {
String title;
Pattern pattern;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package org.jesperancinha.parser.markdowner.badges.model;

import com.fasterxml.jackson.annotation.JsonCreator;
import lombok.AllArgsConstructor;
import lombok.Value;

@Value
@AllArgsConstructor(onConstructor_ = @JsonCreator)
@AllArgsConstructor
public class BadgeSetting {
String title;
String badge;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package org.jesperancinha.parser.markdowner.badges.model;

import com.fasterxml.jackson.annotation.JsonCreator;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Value;

import java.util.List;
import java.util.regex.Pattern;

@Value
@Builder
@AllArgsConstructor(onConstructor_ = @JsonCreator)
@AllArgsConstructor
public class BadgeSettingGroup {
BadgeType badgeType;
List<BadgePattern> badgeSettingList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.jesperancinha.parser.markdowner.badges.model;

public enum BadgeType {
INFO("jeorg.badges.info.json","Info.md"),
BUILD("jeorg.badges.build.json","Build.md"),
QUALITY("jeorg.badges.quality.json","Quality.md"),
COVERAGE("jeorg.badges.coverage.json","Coverage.md"),
CONTENT("jeorg.badges.content.json","Content.md");
INFO("jeorg.badges.info.json", "Info.md"),
BUILD("jeorg.badges.build.json", "Build.md"),
QUALITY("jeorg.badges.quality.json", "Quality.md"),
COVERAGE("jeorg.badges.coverage.json", "Coverage.md"),
CONTENT("jeorg.badges.content.json", "Content.md");

private final String badgeFile;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class BadgeParser {
private static final String BADGE_REGEX =
"(\\[!\\[%s]\\(http[s]*:\\/\\/%s[sa-zA-Z0-9\\/\\.\\]\\?\\=\\-\\&\\%%\\;\\_\\#\\:]*\\)]\\((http[s]*:\\/\\/)*[a-zA-Z0-9\\/\\.\\]\\=\\?\\-\\&\\%%\\;\\_\\#\\:]*\\))";
private static final Pattern NOT_ACCEPTED_REGEX =
Pattern.compile("color=(?!(informational)).");
Pattern.compile("color=(?!(informational)).");
public static final Map<BadgeType, BadgeSettingGroup> badgeSettingGroups = parseSettings();

public static Map<BadgeType, BadgeGroup> parse(final String readmeText) {
Expand All @@ -43,9 +43,9 @@ public static Map<BadgeType, BadgeGroup> parse(final String readmeText) {
if (matcher.find()) {
final String badgeText = matcher.group(0);
final Matcher matcher1 = NOT_ACCEPTED_REGEX.matcher(badgeText);
if(matcher1.find()){
if (matcher1.find()) {
map.put(badgeSetting.getPattern(), null);
}else {
} else {
map.put(badgeSetting.getPattern(), Badge.builder()
.badgeText(badgeText)
.title(badgeSetting.getTitle())
Expand Down

0 comments on commit 9296095

Please sign in to comment.