Jetbrains annotation cleanup (#247)

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

@@ -19,6 +19,7 @@
 import ru.tinkoff.kora.logging.aspect.target.LogAspectTarget;
 import ru.tinkoff.kora.logging.common.arg.StructuredArgument;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -415,7 +416,7 @@ void testMethodWithReturningMonoWithDtoLogInfo() {
         assertNull(logsList.get(0).getMarker());
     }
 
-    @NotNull
+    @Nonnull
     private Map<String, String> getMarkerDataAsMap(StructuredArgument markerData) throws IOException {
 //        ObjectMapper mapper = new ObjectMapper();
         var markerBytes = markerString(markerData);

mkdocs/docs/features/junit5.md

@@ -203,7 +203,7 @@ class ComponentJUnitExtensionTests {
 class ComponentJUnitExtensionTests implements KoraAppTestConfigModifier {
 
     @Override
-    public @NotNull KoraConfigModification config() {
+    public @Nonnull KoraConfigModification config() {
         return KoraConfigModification.ofString("""
                                     myconfig {
                                       myproperty = 1
@@ -226,7 +226,7 @@ class ComponentJUnitExtensionTests implements KoraAppTestConfigModifier {
 class ComponentJUnitExtensionTests implements KoraAppTestGraphModifier {
 
     @Override
-    public @NotNull KoraGraphModification graph() {
+    public @Nonnull KoraGraphModification graph() {
         return KoraGraphModification.create()
             .addComponent(TypeRef.of(Supplier.class, Integer.class), () -> (Supplier<Integer>) () -> 1);
     }
@@ -246,7 +246,7 @@ class ComponentJUnitExtensionTests implements KoraAppTestGraphModifier {
 class ComponentJUnitExtensionTests implements KoraAppTestGraphModifier {
 
     @Override
-    public @NotNull KoraGraphModification graph() {
+    public @Nonnull KoraGraphModification graph() {
         return KoraGraphModification.create()
             .addComponent(TypeRef.of(Supplier.class, String.class), List.of(Supplier.class), () -> (Supplier<String>) () -> "?");
     }
@@ -266,7 +266,7 @@ class ComponentJUnitExtensionTests implements KoraAppTestGraphModifier {
 class ComponentJUnitExtensionTests implements KoraAppTestGraphModifier {
 
     @Override
-    public @NotNull KoraGraphModification graph() {
+    public @Nonnull KoraGraphModification graph() {
         return KoraGraphModification.create()
             .mockComponent(Component1.class);
     }
@@ -329,7 +329,7 @@ class ComponentJUnitExtensionTests implements KoraAppTestConfigModifier {
         .waitingFor(Wait.forListeningPort());
 
     @Override
-    public @NotNull KoraConfigModification config() {
+    public @Nonnull KoraConfigModification config() {
         return KoraConfigModification.ofString("""
                                     db {
                                       jdbcUrl = "%s"

mkdocs/docs/features/validation.md

@@ -297,9 +297,9 @@ public class Component {
 ```java
 final class MyValidStringValidator implements Validator<String> {
 
-    @NotNull
+    @Nonnull
     @Override
-    public List<Violation> validate(String value, @NotNull ValidationContext context) {
+    public List<Violation> validate(String value, @Nonnull ValidationContext context) {
         if (value == null) {
             return List.of(context.violates("Should be not empty, but was null"));
         } else if (value.isEmpty()) {

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

@@ -12,6 +12,7 @@
 import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent2;
 import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent23;
 
+import javax.annotation.Nonnull;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -26,7 +27,7 @@ public class AddComponentTests implements KoraAppTestGraphModifier {
     private LifecycleComponent added;
 
     @Override
-    public @NotNull KoraGraphModification graph() {
+    public @Nonnull KoraGraphModification graph() {
         return KoraGraphModification.create()
             .addComponent(LifecycleComponent.class, List.of(TestComponent23.class), () -> (LifecycleComponent) () -> "?");
     }

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

@@ -12,6 +12,7 @@
 import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent2;
 import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent23;
 
+import javax.annotation.Nonnull;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -24,7 +25,7 @@ public class AddComponentWithGraphTests implements KoraAppTestGraphModifier {
     private TestComponent2 component2;
 
     @Override
-    public @NotNull KoraGraphModification graph() {
+    public @Nonnull KoraGraphModification graph() {
         return KoraGraphModification.create()
             .addComponent(
                 LifecycleComponent.class, List.of(TestComponent23.class),

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

@@ -10,14 +10,16 @@
 import ru.tinkoff.kora.test.extension.junit5.TestComponent;
 import ru.tinkoff.kora.test.extension.junit5.testdata.TestConfigApplication;
 
+import javax.annotation.Nonnull;
+
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @KoraAppTest(TestConfigApplication.class)
 public class ConfigWithFileTests implements KoraAppTestConfigModifier {
 
     @Override
-    public @NotNull KoraConfigModification config() {
+    public @Nonnull KoraConfigModification config() {
         return KoraConfigModification.ofResourceFile("application-raw.conf");
     }
 

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

@@ -10,6 +10,7 @@
 import ru.tinkoff.kora.test.extension.junit5.TestComponent;
 import ru.tinkoff.kora.test.extension.junit5.testdata.*;
 
+import javax.annotation.Nonnull;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -26,7 +27,7 @@ public class MockGraphModificationTests implements KoraAppTestGraphModifier {
     TestComponent23 component23;
 
     @Override
-    public @NotNull KoraGraphModification graph() {
+    public @Nonnull KoraGraphModification graph() {
         return KoraGraphModification.create()
             .mockComponent(TestComponent1.class)
             .mockComponent(TestComponent2.class, List.of(LifecycleComponent.class));

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

@@ -9,6 +9,8 @@
 import ru.tinkoff.kora.test.extension.junit5.testdata.LifecycleComponent;
 import ru.tinkoff.kora.test.extension.junit5.testdata.TestApplication;
 
+import javax.annotation.Nonnull;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @KoraAppTest(TestApplication.class)
@@ -18,7 +20,7 @@ public class ReplaceTests implements KoraAppTestGraphModifier {
     private LifecycleComponent replaced;
 
     @Override
-    public @NotNull KoraGraphModification graph() {
+    public @Nonnull KoraGraphModification graph() {
         return KoraGraphModification.create()
             .replaceComponent(LifecycleComponent.class, () -> (LifecycleComponent) () -> "?");
     }

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

@@ -10,13 +10,15 @@
 import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent1;
 import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent12;
 
+import javax.annotation.Nonnull;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @KoraAppTest(TestApplication.class)
 public class ReplaceWithGraphTests implements KoraAppTestGraphModifier {
 
     @Override
-    public @NotNull KoraGraphModification graph() {
+    public @Nonnull KoraGraphModification graph() {
         return KoraGraphModification.create()
             .replaceComponent(TestComponent12.class, graph -> {
                 var component1 = graph.getFirst(TestComponent1.class);

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

@@ -11,6 +11,7 @@
 import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent2;
 import ru.tinkoff.kora.test.extension.junit5.testdata.TestComponent23;
 
+import javax.annotation.Nonnull;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -22,7 +23,7 @@ public class ReplaceWithTagTests implements KoraAppTestGraphModifier {
     private TestComponent23 lifecycleComponent23;
 
     @Override
-    public @NotNull KoraGraphModification graph() {
+    public @Nonnull KoraGraphModification graph() {
         return KoraGraphModification.create()
             .replaceComponent(TestComponent2.class, List.of(LifecycleComponent.class), () -> new TestComponent2() {
                 @Override

validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/ValidationContext.java

@@ -1,7 +1,6 @@
 package ru.tinkoff.kora.validation.common;
 
 import javax.annotation.Nonnull;
-
 import javax.annotation.concurrent.Immutable;
 
 /**

validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/Validator.java

@@ -2,7 +2,6 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.util.List;
 
 /**

validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/Violation.java

@@ -1,8 +1,9 @@
 package ru.tinkoff.kora.validation.common;
 
-import javax.annotation.Nonnull;
 import ru.tinkoff.kora.validation.common.ValidationContext.Path;
 
+import javax.annotation.Nonnull;
+
 /**
  * Indicates validation failure
  */

validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/ViolationException.java

@@ -1,7 +1,6 @@
 package ru.tinkoff.kora.validation.common;
 
 import javax.annotation.Nonnull;
-
 import java.util.List;
 
 public final class ViolationException extends RuntimeException {

validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/IterableValidator.java

@@ -1,12 +1,10 @@
 package ru.tinkoff.kora.validation.common.constraint;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NotNull;
 import ru.tinkoff.kora.validation.common.ValidationContext;
 import ru.tinkoff.kora.validation.common.Validator;
 import ru.tinkoff.kora.validation.common.Violation;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
@@ -21,7 +19,7 @@ final class IterableValidator<T, I extends Iterable<T>> implements Validator<I>
     }
 
     @Nonnull
-    public @NotNull List<Violation> validate(I iterable, @Nonnull ValidationContext context) {
+    public List<Violation> validate(I iterable, @Nonnull ValidationContext context) {
         if (iterable != null) {
             final List<Violation> violations = new ArrayList<>();
             final Iterator<T> iterator = iterable.iterator();

validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotBlankStringValidator.java

@@ -1,20 +1,18 @@
 package ru.tinkoff.kora.validation.common.constraint;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NotNull;
 import ru.tinkoff.kora.validation.common.ValidationContext;
 import ru.tinkoff.kora.validation.common.Validator;
 import ru.tinkoff.kora.validation.common.Violation;
 
+import javax.annotation.Nonnull;
 import java.util.Collections;
 import java.util.List;
 
 final class NotBlankStringValidator<T extends CharSequence> implements Validator<T> {
 
     @Nonnull
     @Override
-    public @NotNull List<Violation> validate(T value, @Nonnull ValidationContext context) {
+    public List<Violation> validate(T value, @Nonnull ValidationContext context) {
         if (value == null) {
             return List.of(context.violates("Should be not blank, but was null"));
         } else if (value.isEmpty()) {

validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyIterableValidator.java

@@ -1,20 +1,18 @@
 package ru.tinkoff.kora.validation.common.constraint;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NotNull;
 import ru.tinkoff.kora.validation.common.ValidationContext;
 import ru.tinkoff.kora.validation.common.Validator;
 import ru.tinkoff.kora.validation.common.Violation;
 
+import javax.annotation.Nonnull;
 import java.util.Collections;
 import java.util.List;
 
 final class NotEmptyIterableValidator<V, T extends Iterable<V>> implements Validator<T> {
 
     @Nonnull
     @Override
-    public @NotNull List<Violation> validate(T value, @Nonnull ValidationContext context) {
+    public List<Violation> validate(T value, @Nonnull ValidationContext context) {
         if (value == null) {
             return List.of(context.violates("Should be not empty, but was null"));
         } else if (!value.iterator().hasNext()) {

validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyMapValidator.java

@@ -1,12 +1,10 @@
 package ru.tinkoff.kora.validation.common.constraint;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NotNull;
 import ru.tinkoff.kora.validation.common.ValidationContext;
 import ru.tinkoff.kora.validation.common.Validator;
 import ru.tinkoff.kora.validation.common.Violation;
 
+import javax.annotation.Nonnull;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -15,7 +13,7 @@ final class NotEmptyMapValidator<K, V> implements Validator<Map<K, V>> {
 
     @Nonnull
     @Override
-    public @NotNull List<Violation> validate(Map<K, V> value, @Nonnull ValidationContext context) {
+    public List<Violation> validate(Map<K, V> value, @Nonnull ValidationContext context) {
         if (value == null) {
             return List.of(context.violates("Should be not empty, but was null"));
         } else if (value.isEmpty()) {

validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyStringValidator.java

@@ -1,20 +1,18 @@
 package ru.tinkoff.kora.validation.common.constraint;
 
-import javax.annotation.Nonnull;
-
-import org.jetbrains.annotations.NotNull;
 import ru.tinkoff.kora.validation.common.ValidationContext;
 import ru.tinkoff.kora.validation.common.Validator;
 import ru.tinkoff.kora.validation.common.Violation;
 
+import javax.annotation.Nonnull;
 import java.util.Collections;
 import java.util.List;
 
 final class NotEmptyStringValidator<T extends CharSequence> implements Validator<T> {
 
     @Nonnull
     @Override
-    public @NotNull List<Violation> validate(T value, @Nonnull ValidationContext context) {
+    public List<Violation> validate(T value, @Nonnull ValidationContext context) {
         if (value == null) {
             return List.of(context.violates("Should be not empty, but was null"));
         } else if (value.isEmpty()) {

validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/PatternValidator.java

@@ -1,13 +1,11 @@
 package ru.tinkoff.kora.validation.common.constraint;
 
-import javax.annotation.Nonnull;
-
 import org.intellij.lang.annotations.Language;
-import org.jetbrains.annotations.NotNull;
 import ru.tinkoff.kora.validation.common.ValidationContext;
 import ru.tinkoff.kora.validation.common.Validator;
 import ru.tinkoff.kora.validation.common.Violation;
 
+import javax.annotation.Nonnull;
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -22,7 +20,7 @@ final class PatternValidator<T extends CharSequence> implements Validator<T> {
 
     @Nonnull
     @Override
-    public @NotNull List<Violation> validate(T value, @Nonnull ValidationContext context) {
+    public List<Violation> validate(T value, @Nonnull ValidationContext context) {
         if (value == null) {
             return List.of(context.violates("Should match RegEx " + pattern + " but was null"));
         } else if (!pattern.matcher(value).matches()) {