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

Use only commons lang 3 within code #1129

Merged
merged 2 commits into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.13.0</version>
<version>3.14.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import net.masterthought.cucumber.presentation.PresentationMode;
import net.masterthought.cucumber.reducers.ReducingMethod;
import net.masterthought.cucumber.sorting.SortingMethod;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.nullness.qual.NonNull;

public class Configuration {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/masterthought/cucumber/ReportParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import net.masterthought.cucumber.reducers.ReducingMethod;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.ArrayUtils;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/masterthought/cucumber/ReportResult.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import net.masterthought.cucumber.json.support.TagObject;
import net.masterthought.cucumber.reducers.ReportFeatureMergerFactory;
import net.masterthought.cucumber.sorting.SortingFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.ArrayUtils;

public class ReportResult {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/masterthought/cucumber/Trends.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.Arrays;

import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang3.ArrayUtils;

/**
* Contains historical information about all and failed features, scenarios and steps.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.masterthought.cucumber.generators;

import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.lang3.NotImplementedException;

import net.masterthought.cucumber.Reportable;
import net.masterthought.cucumber.json.support.Status;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/masterthought/cucumber/json/Element.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import net.masterthought.cucumber.json.support.Status;
import net.masterthought.cucumber.json.support.StatusCounter;
import net.masterthought.cucumber.util.Util;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

public class Element implements Durationable {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/masterthought/cucumber/json/Feature.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import net.masterthought.cucumber.json.support.Status;
import net.masterthought.cucumber.json.support.StatusCounter;
import net.masterthought.cucumber.util.Util;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

public class Feature implements Reportable, Durationable {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/masterthought/cucumber/json/Hook.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import net.masterthought.cucumber.json.deserializers.OutputsDeserializer;
import net.masterthought.cucumber.json.support.Resultsable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.masterthought.cucumber.json.support;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import net.masterthought.cucumber.ValidationException;
import net.masterthought.cucumber.util.Util;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import java.util.ArrayList;
import java.util.List;

import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.commons.lang3.StringUtils;

import net.masterthought.cucumber.Reportable;
import net.masterthought.cucumber.ValidationException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.masterthought.cucumber.reducers;

import net.masterthought.cucumber.json.Element;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import java.util.Comparator;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import net.masterthought.cucumber.json.support.Status;
import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.lang3.NotImplementedException;
import org.junit.Test;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import net.masterthought.cucumber.json.Row;
import net.masterthought.cucumber.json.Step;
import net.masterthought.cucumber.presentation.PresentationMode;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import net.masterthought.cucumber.generators.AbstractPage;
import net.masterthought.cucumber.generators.integrations.helpers.DocumentAssertion;
import net.masterthought.cucumber.json.Output;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.jsoup.Jsoup;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.masterthought.cucumber.generators.integrations.helpers;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.assertj.core.api.filter.NotInFilter;

import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import static org.assertj.core.api.Assertions.assertThat;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

/**
* @author Damian Szczepanik (damianszczepanik@github)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import net.masterthought.cucumber.ValidationException;
import net.masterthought.cucumber.generators.integrations.PageTest;
import net.masterthought.cucumber.json.Element;
import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.lang3.NotImplementedException;
import org.junit.Before;
import org.junit.Test;

Expand Down