Skip to content

Commit cde856e

Browse files
jreznotbaev
authored andcommitted
fix common code problems (via #410)
1 parent 2331200 commit cde856e

File tree

8 files changed

+17
-20
lines changed

8 files changed

+17
-20
lines changed

allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ public Builder setUrl(final String url) {
108108
}
109109

110110
public Builder setResponseCode(final int responseCode) {
111-
Objects.requireNonNull(responseCode, "Response code must not be null value");
112111
this.responseCode = responseCode;
113112
return this;
114113
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,14 @@
3838
import io.qameta.allure.util.ResultsUtils;
3939

4040
import java.io.ByteArrayInputStream;
41-
import java.nio.charset.Charset;
4241
import java.nio.charset.StandardCharsets;
43-
import java.util.Objects;
4442
import java.util.ArrayList;
4543
import java.util.Collections;
4644
import java.util.Deque;
4745
import java.util.LinkedList;
4846
import java.util.List;
4947
import java.util.Map;
48+
import java.util.Objects;
5049
import java.util.UUID;
5150
import java.util.concurrent.ConcurrentHashMap;
5251

@@ -249,7 +248,7 @@ private void createDataTableAttachment(final List<DataTableRow> dataTableRows) {
249248
final String attachmentSource = lifecycle
250249
.prepareAttachment("Data table", "text/tab-separated-values", "csv");
251250
lifecycle.writeAttachment(attachmentSource,
252-
new ByteArrayInputStream(dataTableCsv.toString().getBytes(Charset.forName("UTF-8"))));
251+
new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
253252
}
254253
}
255254

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import io.qameta.allure.model.TestResultContainer;
5252

5353
import java.io.ByteArrayInputStream;
54-
import java.nio.charset.Charset;
5554
import java.nio.charset.StandardCharsets;
5655
import java.util.Collections;
5756
import java.util.Deque;
@@ -328,7 +327,7 @@ private void createDataTableAttachment(final PickleTable pickleTable) {
328327
final String attachmentSource = lifecycle
329328
.prepareAttachment("Data table", "text/tab-separated-values", "csv");
330329
lifecycle.writeAttachment(attachmentSource,
331-
new ByteArrayInputStream(dataTableCsv.toString().getBytes(Charset.forName("UTF-8"))));
330+
new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
332331
}
333332
}
334333

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import io.qameta.allure.model.TestResultContainer;
5252

5353
import java.io.ByteArrayInputStream;
54-
import java.nio.charset.Charset;
5554
import java.nio.charset.StandardCharsets;
5655
import java.util.Collections;
5756
import java.util.Deque;
@@ -330,7 +329,7 @@ private void createDataTableAttachment(final PickleTable pickleTable) {
330329
final String attachmentSource = lifecycle
331330
.prepareAttachment("Data table", "text/tab-separated-values", "csv");
332331
lifecycle.writeAttachment(attachmentSource,
333-
new ByteArrayInputStream(dataTableCsv.toString().getBytes(Charset.forName("UTF-8"))));
332+
new ByteArrayInputStream(dataTableCsv.toString().getBytes(StandardCharsets.UTF_8)));
334333
}
335334
}
336335

allure-java-commons/src/main/java/io/qameta/allure/aspects/AttachmentsAspects.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
@Aspect
4040
public class AttachmentsAspects {
4141

42-
private static InheritableThreadLocal<AllureLifecycle> lifecycle = new InheritableThreadLocal<AllureLifecycle>() {
42+
private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE =
43+
new InheritableThreadLocal<AllureLifecycle>() {
4344
@Override
4445
protected AllureLifecycle initialValue() {
4546
return Allure.getLifecycle();
@@ -89,10 +90,10 @@ public void attachment(final JoinPoint joinPoint, final Object result) {
8990
* @param allure allure lifecycle to set.
9091
*/
9192
public static void setLifecycle(final AllureLifecycle allure) {
92-
lifecycle.set(allure);
93+
LIFECYCLE.set(allure);
9394
}
9495

9596
public static AllureLifecycle getLifecycle() {
96-
return lifecycle.get();
97+
return LIFECYCLE.get();
9798
}
9899
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
@Aspect
4646
public class StepsAspects {
4747

48-
private static InheritableThreadLocal<AllureLifecycle> lifecycle = new InheritableThreadLocal<AllureLifecycle>() {
48+
private static final InheritableThreadLocal<AllureLifecycle> LIFECYCLE
49+
= new InheritableThreadLocal<AllureLifecycle>() {
4950
@Override
5051
protected AllureLifecycle initialValue() {
5152
return Allure.getLifecycle();
@@ -98,10 +99,10 @@ public void stepStop() {
9899
* @param allure allure lifecycle to set.
99100
*/
100101
public static void setLifecycle(final AllureLifecycle allure) {
101-
lifecycle.set(allure);
102+
LIFECYCLE.set(allure);
102103
}
103104

104105
public static AllureLifecycle getLifecycle() {
105-
return lifecycle.get();
106+
return LIFECYCLE.get();
106107
}
107108
}

allure-java-commons/src/main/java/io/qameta/allure/util/PropertiesUtils.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,12 @@ public static Properties loadAllureProperties() {
4343
}
4444

4545
private static void loadPropertiesFrom(final ClassLoader classLoader, final Properties properties) {
46-
if (classLoader.getResource(ALLURE_PROPERTIES_FILE) != null) {
47-
try (InputStream stream = classLoader.getResourceAsStream(ALLURE_PROPERTIES_FILE)) {
46+
try (InputStream stream = classLoader.getResourceAsStream(ALLURE_PROPERTIES_FILE)) {
47+
if (stream != null) {
4848
properties.load(stream);
49-
} catch (IOException e) {
50-
LOGGER.error("Error while reading allure.properties file from classpath: %s", e.getMessage());
5149
}
50+
} catch (IOException e) {
51+
LOGGER.error("Error while reading allure.properties file from classpath: {}", e.getMessage());
5252
}
5353
}
54-
5554
}

allure-spock/src/main/java/io/qameta/allure/spock/AllureSpock.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public class AllureSpock extends AbstractRunListener implements IGlobalExtension
9191
private final ThreadLocal<String> testResults
9292
= InheritableThreadLocal.withInitial(() -> UUID.randomUUID().toString());
9393

94-
private AllureLifecycle lifecycle;
94+
private final AllureLifecycle lifecycle;
9595

9696
@SuppressWarnings("unused")
9797
public AllureSpock() {

0 commit comments

Comments
 (0)