Skip to content

Commit 1af77a2

Browse files
baevbaev
authored
remove commons-lang3 from java-commons module (allure-framework#256)
1 parent a785bb0 commit 1af77a2

7 files changed

Lines changed: 20 additions & 17 deletions

File tree

‎allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import io.qameta.allure.model.Label;
77
import io.qameta.allure.model.Link;
88
import io.qameta.allure.util.ResultsUtils;
9-
import org.apache.commons.lang3.StringUtils;
109
import org.slf4j.Logger;
1110
import org.slf4j.LoggerFactory;
1211

1312
import java.util.ArrayList;
1413
import java.util.Deque;
1514
import java.util.List;
15+
import java.util.Objects;
1616
import java.util.regex.Pattern;
1717

1818
import static io.qameta.allure.util.ResultsUtils.createFeatureLabel;
@@ -52,7 +52,7 @@ class LabelBuilder {
5252
if (tagString.contains(COMPOSITE_TAG_DELIMITER)) {
5353

5454
final String[] tagParts = tagString.split(COMPOSITE_TAG_DELIMITER, 2);
55-
if (StringUtils.isEmpty(tagParts[1])) {
55+
if (tagParts.length < 2 || Objects.isNull(tagParts[1]) || tagParts[1].isEmpty()) {
5656
// skip empty tags, e.g. '@tmsLink=', to avoid formatter errors
5757
continue;
5858
}
@@ -113,6 +113,7 @@ private Label getTagLabel(final Tag tag) {
113113

114114
/**
115115
* Handle composite named links.
116+
*
116117
* @param tagString Full tag name and value
117118
*/
118119
private void tryHandleNamedLink(final String tagString) {

‎allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
import gherkin.pickles.PickleTag;
66
import io.qameta.allure.model.Label;
77
import io.qameta.allure.model.Link;
8-
import org.apache.commons.lang3.StringUtils;
98
import org.slf4j.Logger;
109
import org.slf4j.LoggerFactory;
1110

1211
import java.util.ArrayList;
1312
import java.util.Deque;
1413
import java.util.List;
14+
import java.util.Objects;
1515
import java.util.regex.Pattern;
1616

1717
import static io.qameta.allure.util.ResultsUtils.createFeatureLabel;
18-
import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
19-
import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
20-
import static io.qameta.allure.util.ResultsUtils.createTmsLink;
2118
import static io.qameta.allure.util.ResultsUtils.createIssueLink;
2219
import static io.qameta.allure.util.ResultsUtils.createLink;
20+
import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
21+
import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
22+
import static io.qameta.allure.util.ResultsUtils.createTagLabel;
23+
import static io.qameta.allure.util.ResultsUtils.createTmsLink;
2324
import static io.qameta.allure.util.ResultsUtils.getHostName;
2425
import static io.qameta.allure.util.ResultsUtils.getThreadName;
25-
import static io.qameta.allure.util.ResultsUtils.createTagLabel;
2626

2727
/**
2828
* Scenario labels and links builder.
@@ -54,7 +54,7 @@ class LabelBuilder {
5454
if (tagString.contains(COMPOSITE_TAG_DELIMITER)) {
5555

5656
final String[] tagParts = tagString.split(COMPOSITE_TAG_DELIMITER, 2);
57-
if (StringUtils.isEmpty(tagParts[1])) {
57+
if (tagParts.length < 2 || Objects.isNull(tagParts[1]) || tagParts[1].isEmpty()) {
5858
// skip empty tags, e.g. '@tmsLink=', to avoid formatter errors
5959
continue;
6060
}
@@ -115,6 +115,7 @@ private Label getTagLabel(final PickleTag tag) {
115115

116116
/**
117117
* Handle composite named links.
118+
*
118119
* @param tagString Full tag name and value
119120
*/
120121
private void tryHandleNamedLink(final String tagString) {

‎allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
import gherkin.pickles.PickleTag;
66
import io.qameta.allure.model.Label;
77
import io.qameta.allure.model.Link;
8-
import org.apache.commons.lang3.StringUtils;
98
import org.slf4j.Logger;
109
import org.slf4j.LoggerFactory;
1110

1211
import java.util.ArrayList;
1312
import java.util.Deque;
1413
import java.util.List;
14+
import java.util.Objects;
1515
import java.util.regex.Pattern;
1616

1717
import static io.qameta.allure.util.ResultsUtils.createFeatureLabel;
18-
import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
19-
import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
20-
import static io.qameta.allure.util.ResultsUtils.createTmsLink;
2118
import static io.qameta.allure.util.ResultsUtils.createIssueLink;
2219
import static io.qameta.allure.util.ResultsUtils.createLink;
20+
import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
21+
import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
22+
import static io.qameta.allure.util.ResultsUtils.createTagLabel;
23+
import static io.qameta.allure.util.ResultsUtils.createTmsLink;
2324
import static io.qameta.allure.util.ResultsUtils.getHostName;
2425
import static io.qameta.allure.util.ResultsUtils.getThreadName;
25-
import static io.qameta.allure.util.ResultsUtils.createTagLabel;
2626

2727
/**
2828
* Scenario labels and links builder.
@@ -54,7 +54,7 @@ class LabelBuilder {
5454
if (tagString.contains(COMPOSITE_TAG_DELIMITER)) {
5555

5656
final String[] tagParts = tagString.split(COMPOSITE_TAG_DELIMITER, 2);
57-
if (StringUtils.isEmpty(tagParts[1])) {
57+
if (tagParts.length < 2 || Objects.isNull(tagParts[1]) || tagParts[1].isEmpty()) {
5858
// skip empty tags, e.g. '@tmsLink=', to avoid formatter errors
5959
continue;
6060
}
@@ -115,6 +115,7 @@ private Label getTagLabel(final PickleTag tag) {
115115

116116
/**
117117
* Handle composite named links.
118+
*
118119
* @param tagString Full tag name and value
119120
*/
120121
private void tryHandleNamedLink(final String tagString) {

‎allure-java-commons/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ val agent by configurations.creating
44

55
dependencies {
66
agent("org.aspectj:aspectjweaver")
7-
compile("org.apache.commons:commons-lang3")
87
compile("org.apache.tika:tika-core")
98
compile("org.aspectj:aspectjrt")
109
compile("org.jooq:joor-java-8")

‎allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import io.qameta.allure.Step;
66
import io.qameta.allure.model.Status;
77
import io.qameta.allure.model.StepResult;
8-
import org.apache.commons.lang3.StringUtils;
98
import org.aspectj.lang.ProceedingJoinPoint;
109
import org.aspectj.lang.annotation.Around;
1110
import org.aspectj.lang.annotation.Aspect;
@@ -39,7 +38,7 @@ public Object step(final ProceedingJoinPoint joinPoint) throws Throwable {
3938

4039
final String uuid = UUID.randomUUID().toString();
4140
final String name = Optional.of(step.value())
42-
.filter(StringUtils::isNoneEmpty)
41+
.filter(v -> !v.isEmpty())
4342
.map(value -> processNameTemplate(value, getParametersMap(methodSignature, joinPoint.getArgs())))
4443
.orElse(methodSignature.getName());
4544

‎allure-java-migration/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ val agent by configurations.creating
44

55
dependencies {
66
agent("org.aspectj:aspectjweaver")
7+
compile("org.apache.commons:commons-lang3")
78
compile("org.aspectj:aspectjrt")
89
compile(project(":allure-java-commons"))
910
compileOnly("junit:junit")

‎allure-jsonunit/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
description = "Allure JsonUnit Integration"
22

33
dependencies {
4+
compile("org.apache.commons:commons-lang3")
45
compile("net.javacrumbs.json-unit:json-unit:2.0.0.RC1")
56
compile(project(":allure-attachments"))
67
testCompile("junit:junit")

0 commit comments

Comments
 (0)