Skip to content

Commit c3ff72e

Browse files
GoodforGodGoodforGod
authored
Jetbrains annotation cleanup (#247)
1 parent 3ec053e commit c3ff72e

30 files changed

+65
-79
lines changed

‎logging/declarative-logging/declarative-logging-annotation-processor/src/test/java/ru/tinkoff/kora/logging/aspect/LogAspectTestOld.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import ru.tinkoff.kora.logging.aspect.target.LogAspectTarget;
2020
import ru.tinkoff.kora.logging.common.arg.StructuredArgument;
2121

22+
import javax.annotation.Nonnull;
2223
import java.io.IOException;
2324
import java.util.HashMap;
2425
import java.util.List;
@@ -415,7 +416,7 @@ void testMethodWithReturningMonoWithDtoLogInfo() {
415416
assertNull(logsList.get(0).getMarker());
416417
}
417418

418-
@NotNull
419+
@Nonnull
419420
private Map<String, String> getMarkerDataAsMap(StructuredArgument markerData) throws IOException {
420421
// ObjectMapper mapper = new ObjectMapper();
421422
var markerBytes = markerString(markerData);

‎mkdocs/docs/features/junit5.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class ComponentJUnitExtensionTests {
203203
class ComponentJUnitExtensionTests implements KoraAppTestConfigModifier {
204204

205205
@Override
206-
public @NotNull KoraConfigModification config() {
206+
public @Nonnull KoraConfigModification config() {
207207
return KoraConfigModification.ofString("""
208208
myconfig {
209209
myproperty = 1
@@ -226,7 +226,7 @@ class ComponentJUnitExtensionTests implements KoraAppTestConfigModifier {
226226
class ComponentJUnitExtensionTests implements KoraAppTestGraphModifier {
227227

228228
@Override
229-
public @NotNull KoraGraphModification graph() {
229+
public @Nonnull KoraGraphModification graph() {
230230
return KoraGraphModification.create()
231231
.addComponent(TypeRef.of(Supplier.class, Integer.class), () -> (Supplier<Integer>) () -> 1);
232232
}
@@ -246,7 +246,7 @@ class ComponentJUnitExtensionTests implements KoraAppTestGraphModifier {
246246
class ComponentJUnitExtensionTests implements KoraAppTestGraphModifier {
247247

248248
@Override
249-
public @NotNull KoraGraphModification graph() {
249+
public @Nonnull KoraGraphModification graph() {
250250
return KoraGraphModification.create()
251251
.addComponent(TypeRef.of(Supplier.class, String.class), List.of(Supplier.class), () -> (Supplier<String>) () -> "?");
252252
}
@@ -266,7 +266,7 @@ class ComponentJUnitExtensionTests implements KoraAppTestGraphModifier {
266266
class ComponentJUnitExtensionTests implements KoraAppTestGraphModifier {
267267

268268
@Override
269-
public @NotNull KoraGraphModification graph() {
269+
public @Nonnull KoraGraphModification graph() {
270270
return KoraGraphModification.create()
271271
.mockComponent(Component1.class);
272272
}
@@ -329,7 +329,7 @@ class ComponentJUnitExtensionTests implements KoraAppTestConfigModifier {
329329
.waitingFor(Wait.forListeningPort());
330330

331331
@Override
332-
public @NotNull KoraConfigModification config() {
332+
public @Nonnull KoraConfigModification config() {
333333
return KoraConfigModification.ofString("""
334334
db {
335335
jdbcUrl = "%s"

‎mkdocs/docs/features/validation.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,9 @@ public class Component {
297297
```java
298298
final class MyValidStringValidator implements Validator<String> {
299299

300-
@NotNull
300+
@Nonnull
301301
@Override
302-
public List<Violation> validate(String value, @NotNull ValidationContext context) {
302+
public List<Violation> validate(String value, @Nonnull ValidationContext context) {
303303
if (value == null) {
304304
return List.of(context.violates("Should be not empty, but was null"));
305305
} else if (value.isEmpty()) {

‎test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/add/AddComponentTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent2;
1313
import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent23;
1414

15+
import javax.annotation.Nonnull;
1516
import java.util.List;
1617

1718
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -26,7 +27,7 @@ public class AddComponentTests implements KoraAppTestGraphModifier {
2627
private LifecycleComponent added;
2728

2829
@Override
29-
public @NotNull KoraGraphModification graph() {
30+
public @Nonnull KoraGraphModification graph() {
3031
return KoraGraphModification.create()
3132
.addComponent(LifecycleComponent.class, List.of(TestComponent23.class), () -> (LifecycleComponent) () -> "?");
3233
}

‎test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/add/AddComponentWithGraphTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent2;
1313
import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent23;
1414

15+
import javax.annotation.Nonnull;
1516
import java.util.List;
1617

1718
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -24,7 +25,7 @@ public class AddComponentWithGraphTests implements KoraAppTestGraphModifier {
2425
private TestComponent2 component2;
2526

2627
@Override
27-
public @NotNull KoraGraphModification graph() {
28+
public @Nonnull KoraGraphModification graph() {
2829
return KoraGraphModification.create()
2930
.addComponent(
3031
LifecycleComponent.class, List.of(TestComponent23.class),

‎test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/config/ConfigWithFileTests.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@
1010
import ru.tinkoff.kora.test.extension.junit5.TestComponent;
1111
import ru.tinkoff.kora.test.extension.junit5.testdata.TestConfigApplication;
1212

13+
import javax.annotation.Nonnull;
14+
1315
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
1416
import static org.junit.jupiter.api.Assertions.assertEquals;
1517

1618
@KoraAppTest(TestConfigApplication.class)
1719
public class ConfigWithFileTests implements KoraAppTestConfigModifier {
1820

1921
@Override
20-
public @NotNull KoraConfigModification config() {
22+
public @Nonnull KoraConfigModification config() {
2123
return KoraConfigModification.ofResourceFile("application-raw.conf");
2224
}
2325

‎test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/mock/MockGraphModificationTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import ru.tinkoff.kora.test.extension.junit5.TestComponent;
1111
import ru.tinkoff.kora.test.extension.junit5.testdata.*;
1212

13+
import javax.annotation.Nonnull;
1314
import java.util.List;
1415

1516
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -26,7 +27,7 @@ public class MockGraphModificationTests implements KoraAppTestGraphModifier {
2627
TestComponent23 component23;
2728

2829
@Override
29-
public @NotNull KoraGraphModification graph() {
30+
public @Nonnull KoraGraphModification graph() {
3031
return KoraGraphModification.create()
3132
.mockComponent(TestComponent1.class)
3233
.mockComponent(TestComponent2.class, List.of(LifecycleComponent.class));

‎test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/replace/ReplaceTests.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import ru.tinkoff.kora.test.extension.junit5.testdata.LifecycleComponent;
1010
import ru.tinkoff.kora.test.extension.junit5.testdata.TestApplication;
1111

12+
import javax.annotation.Nonnull;
13+
1214
import static org.junit.jupiter.api.Assertions.assertEquals;
1315

1416
@KoraAppTest(TestApplication.class)
@@ -18,7 +20,7 @@ public class ReplaceTests implements KoraAppTestGraphModifier {
1820
private LifecycleComponent replaced;
1921

2022
@Override
21-
public @NotNull KoraGraphModification graph() {
23+
public @Nonnull KoraGraphModification graph() {
2224
return KoraGraphModification.create()
2325
.replaceComponent(LifecycleComponent.class, () -> (LifecycleComponent) () -> "?");
2426
}

‎test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/replace/ReplaceWithGraphTests.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent1;
1111
import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent12;
1212

13+
import javax.annotation.Nonnull;
14+
1315
import static org.junit.jupiter.api.Assertions.assertEquals;
1416

1517
@KoraAppTest(TestApplication.class)
1618
public class ReplaceWithGraphTests implements KoraAppTestGraphModifier {
1719

1820
@Override
19-
public @NotNull KoraGraphModification graph() {
21+
public @Nonnull KoraGraphModification graph() {
2022
return KoraGraphModification.create()
2123
.replaceComponent(TestComponent12.class, graph -> {
2224
var component1 = graph.getFirst(TestComponent1.class);

‎test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/replace/ReplaceWithTagTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent2;
1212
import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent23;
1313

14+
import javax.annotation.Nonnull;
1415
import java.util.List;
1516

1617
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -22,7 +23,7 @@ public class ReplaceWithTagTests implements KoraAppTestGraphModifier {
2223
private TestComponent23 lifecycleComponent23;
2324

2425
@Override
25-
public @NotNull KoraGraphModification graph() {
26+
public @Nonnull KoraGraphModification graph() {
2627
return KoraGraphModification.create()
2728
.replaceComponent(TestComponent2.class, List.of(LifecycleComponent.class), () -> new TestComponent2() {
2829
@Override

0 commit comments

Comments
 (0)