remove commons-lang3 from java-commons module (#256)

allure-framework · Oct 31, 2018 · 1af77a2 · 1af77a2
1 parent a785bb0
commit 1af77a2
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 17 deletions.
diff --git a/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java b/allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java
@@ -6,13 +6,13 @@
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import io.qameta.allure.util.ResultsUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 import static io.qameta.allure.util.ResultsUtils.createFeatureLabel;
@@ -52,7 +52,7 @@ class LabelBuilder {
             if (tagString.contains(COMPOSITE_TAG_DELIMITER)) {
 
                 final String[] tagParts = tagString.split(COMPOSITE_TAG_DELIMITER, 2);
-                if (StringUtils.isEmpty(tagParts[1])) {
+                if (tagParts.length < 2 || Objects.isNull(tagParts[1]) || tagParts[1].isEmpty()) {
                     // skip empty tags, e.g. '@tmsLink=', to avoid formatter errors
                     continue;
                 }
@@ -113,6 +113,7 @@ private Label getTagLabel(final Tag tag) {
 
     /**
      * Handle composite named links.
+     *
      * @param tagString Full tag name and value
      */
     private void tryHandleNamedLink(final String tagString) {

diff --git a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java b/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/LabelBuilder.java
@@ -5,24 +5,24 @@
 import gherkin.pickles.PickleTag;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 import static io.qameta.allure.util.ResultsUtils.createFeatureLabel;
-import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
-import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
-import static io.qameta.allure.util.ResultsUtils.createTmsLink;
 import static io.qameta.allure.util.ResultsUtils.createIssueLink;
 import static io.qameta.allure.util.ResultsUtils.createLink;
+import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
+import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
+import static io.qameta.allure.util.ResultsUtils.createTagLabel;
+import static io.qameta.allure.util.ResultsUtils.createTmsLink;
 import static io.qameta.allure.util.ResultsUtils.getHostName;
 import static io.qameta.allure.util.ResultsUtils.getThreadName;
-import static io.qameta.allure.util.ResultsUtils.createTagLabel;
 
 /**
  * Scenario labels and links builder.
@@ -54,7 +54,7 @@ class LabelBuilder {
             if (tagString.contains(COMPOSITE_TAG_DELIMITER)) {
 
                 final String[] tagParts = tagString.split(COMPOSITE_TAG_DELIMITER, 2);
-                if (StringUtils.isEmpty(tagParts[1])) {
+                if (tagParts.length < 2 || Objects.isNull(tagParts[1]) || tagParts[1].isEmpty()) {
                     // skip empty tags, e.g. '@tmsLink=', to avoid formatter errors
                     continue;
                 }
@@ -115,6 +115,7 @@ private Label getTagLabel(final PickleTag tag) {
 
     /**
      * Handle composite named links.
+     *
      * @param tagString Full tag name and value
      */
     private void tryHandleNamedLink(final String tagString) {

diff --git a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java b/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/LabelBuilder.java
@@ -5,24 +5,24 @@
 import gherkin.pickles.PickleTag;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 import static io.qameta.allure.util.ResultsUtils.createFeatureLabel;
-import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
-import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
-import static io.qameta.allure.util.ResultsUtils.createTmsLink;
 import static io.qameta.allure.util.ResultsUtils.createIssueLink;
 import static io.qameta.allure.util.ResultsUtils.createLink;
+import static io.qameta.allure.util.ResultsUtils.createSeverityLabel;
+import static io.qameta.allure.util.ResultsUtils.createStoryLabel;
+import static io.qameta.allure.util.ResultsUtils.createTagLabel;
+import static io.qameta.allure.util.ResultsUtils.createTmsLink;
 import static io.qameta.allure.util.ResultsUtils.getHostName;
 import static io.qameta.allure.util.ResultsUtils.getThreadName;
-import static io.qameta.allure.util.ResultsUtils.createTagLabel;
 
 /**
  * Scenario labels and links builder.
@@ -54,7 +54,7 @@ class LabelBuilder {
             if (tagString.contains(COMPOSITE_TAG_DELIMITER)) {
 
                 final String[] tagParts = tagString.split(COMPOSITE_TAG_DELIMITER, 2);
-                if (StringUtils.isEmpty(tagParts[1])) {
+                if (tagParts.length < 2 || Objects.isNull(tagParts[1]) || tagParts[1].isEmpty()) {
                     // skip empty tags, e.g. '@tmsLink=', to avoid formatter errors
                     continue;
                 }
@@ -115,6 +115,7 @@ private Label getTagLabel(final PickleTag tag) {
 
     /**
      * Handle composite named links.
+     *
      * @param tagString Full tag name and value
      */
     private void tryHandleNamedLink(final String tagString) {

diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts
@@ -4,7 +4,6 @@ val agent by configurations.creating
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
-    compile("org.apache.commons:commons-lang3")
     compile("org.apache.tika:tika-core")
     compile("org.aspectj:aspectjrt")
     compile("org.jooq:joor-java-8")

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java b/allure-java-commons/src/main/java/io/qameta/allure/aspects/StepsAspects.java
@@ -5,7 +5,6 @@
 import io.qameta.allure.Step;
 import io.qameta.allure.model.Status;
 import io.qameta.allure.model.StepResult;
-import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -39,7 +38,7 @@ public Object step(final ProceedingJoinPoint joinPoint) throws Throwable {
 
         final String uuid = UUID.randomUUID().toString();
         final String name = Optional.of(step.value())
-                .filter(StringUtils::isNoneEmpty)
+                .filter(v -> !v.isEmpty())
                 .map(value -> processNameTemplate(value, getParametersMap(methodSignature, joinPoint.getArgs())))
                 .orElse(methodSignature.getName());
 

diff --git a/allure-java-migration/build.gradle.kts b/allure-java-migration/build.gradle.kts
@@ -4,6 +4,7 @@ val agent by configurations.creating
 
 dependencies {
     agent("org.aspectj:aspectjweaver")
+    compile("org.apache.commons:commons-lang3")
     compile("org.aspectj:aspectjrt")
     compile(project(":allure-java-commons"))
     compileOnly("junit:junit")

diff --git a/allure-jsonunit/build.gradle.kts b/allure-jsonunit/build.gradle.kts
@@ -1,6 +1,7 @@
 description = "Allure JsonUnit Integration"
 
 dependencies {
+    compile("org.apache.commons:commons-lang3")
     compile("net.javacrumbs.json-unit:json-unit:2.0.0.RC1")
     compile(project(":allure-attachments"))
     testCompile("junit:junit")