diff --git a/logging/declarative-logging/declarative-logging-annotation-processor/src/test/java/ru/tinkoff/kora/logging/aspect/LogAspectTestOld.java b/logging/declarative-logging/declarative-logging-annotation-processor/src/test/java/ru/tinkoff/kora/logging/aspect/LogAspectTestOld.java
index e34b32a3e..64e4616ec 100644
--- a/logging/declarative-logging/declarative-logging-annotation-processor/src/test/java/ru/tinkoff/kora/logging/aspect/LogAspectTestOld.java
+++ b/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);
diff --git a/mkdocs/docs/features/junit5.md b/mkdocs/docs/features/junit5.md
index 569d391b8..2edb00fbc 100644
--- a/mkdocs/docs/features/junit5.md
+++ b/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"
diff --git a/mkdocs/docs/features/validation.md b/mkdocs/docs/features/validation.md
index 436680ea9..b1064f86f 100644
--- a/mkdocs/docs/features/validation.md
+++ b/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()) {
diff --git a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/add/AddComponentTests.java b/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/add/AddComponentTests.java
index 60b4fda92..0b7eb45e0 100644
--- a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/add/AddComponentTests.java
+++ b/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) () -> "?");
     }
diff --git a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/add/AddComponentWithGraphTests.java b/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/add/AddComponentWithGraphTests.java
index 02f49506d..edbe5b6b1 100644
--- a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/add/AddComponentWithGraphTests.java
+++ b/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),
diff --git a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/config/ConfigWithFileTests.java b/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/config/ConfigWithFileTests.java
index 85c511cdd..484fad126 100644
--- a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/config/ConfigWithFileTests.java
+++ b/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/config/ConfigWithFileTests.java
@@ -10,6 +10,8 @@
 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;
 
@@ -17,7 +19,7 @@
 public class ConfigWithFileTests implements KoraAppTestConfigModifier {
 
     @Override
-    public @NotNull KoraConfigModification config() {
+    public @Nonnull KoraConfigModification config() {
         return KoraConfigModification.ofResourceFile("application-raw.conf");
     }
 
diff --git a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/mock/MockGraphModificationTests.java b/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/mock/MockGraphModificationTests.java
index 09a83cc72..a9f22658b 100644
--- a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/mock/MockGraphModificationTests.java
+++ b/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));
diff --git a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/replace/ReplaceTests.java b/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/replace/ReplaceTests.java
index 817762aa3..a1fcbdb8a 100644
--- a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/replace/ReplaceTests.java
+++ b/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) () -> "?");
     }
diff --git a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/replace/ReplaceWithGraphTests.java b/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/replace/ReplaceWithGraphTests.java
index 6110cbe2a..60b4afad7 100644
--- a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/replace/ReplaceWithGraphTests.java
+++ b/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);
diff --git a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/replace/ReplaceWithTagTests.java b/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/replace/ReplaceWithTagTests.java
index 50ecbe84c..ce728e4de 100644
--- a/test/test-junit5/src/test/java/ru/tinkoff/kora/test/extension/junit5/replace/ReplaceWithTagTests.java
+++ b/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
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/ValidationContext.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/ValidationContext.java
index e915abe1c..725ac4052 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/ValidationContext.java
+++ b/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;
 
 /**
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/Validator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/Validator.java
index fece2ef5c..7ba34f535 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/Validator.java
+++ b/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;
 
 /**
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/Violation.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/Violation.java
index 7d7abb94a..c9346e518 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/Violation.java
+++ b/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
  */
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/ViolationException.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/ViolationException.java
index e1c73e5b1..0d177772c 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/ViolationException.java
+++ b/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 {
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/IterableValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/IterableValidator.java
index 725631d63..da5789052 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/IterableValidator.java
+++ b/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();
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotBlankStringValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotBlankStringValidator.java
index 0e572ddcb..d6bd78cbc 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotBlankStringValidator.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotBlankStringValidator.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;
 
@@ -14,7 +12,7 @@ final class NotBlankStringValidator<T extends CharSequence> implements Validator
 
     @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()) {
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyIterableValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyIterableValidator.java
index a4adf2bfc..4ef7ad7bf 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyIterableValidator.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyIterableValidator.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;
 
@@ -14,7 +12,7 @@ final class NotEmptyIterableValidator<V, T extends Iterable<V>> implements Valid
 
     @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()) {
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyMapValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyMapValidator.java
index 34a7bb02e..f580c5164 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyMapValidator.java
+++ b/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()) {
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyStringValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyStringValidator.java
index f5290371d..0b424eda0 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyStringValidator.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/NotEmptyStringValidator.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;
 
@@ -14,7 +12,7 @@ final class NotEmptyStringValidator<T extends CharSequence> implements Validator
 
     @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()) {
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/PatternValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/PatternValidator.java
index f1ad5a8fd..adf65153c 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/PatternValidator.java
+++ b/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()) {
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeBigDecimalValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeBigDecimalValidator.java
index 82306c553..71933c875 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeBigDecimalValidator.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeBigDecimalValidator.java
@@ -1,15 +1,12 @@
 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 ru.tinkoff.kora.validation.common.annotation.Range;
 
+import javax.annotation.Nonnull;
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Predicate;
@@ -24,7 +21,7 @@ final class RangeBigDecimalValidator implements Validator<BigDecimal> {
     private final Predicate<BigDecimal> toPredicate;
 
     RangeBigDecimalValidator(double fromDouble, double toDouble, Range.Boundary boundary) {
-        if(toDouble < fromDouble)
+        if (toDouble < fromDouble)
             throw new IllegalArgumentException("From can't be less than To, but From was " + fromDouble + " and To was " + toDouble);
 
         this.from = BigDecimal.valueOf(fromDouble);
@@ -43,7 +40,7 @@ final class RangeBigDecimalValidator implements Validator<BigDecimal> {
 
     @Nonnull
     @Override
-    public @NotNull List<Violation> validate(BigDecimal value, @Nonnull ValidationContext context) {
+    public List<Violation> validate(BigDecimal value, @Nonnull ValidationContext context) {
         if (value == null) {
             return List.of(context.violates("Should be in range from '" + from + "' to '" + to + "', but was null"));
         }
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeBigIntegerValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeBigIntegerValidator.java
index 01a8f3085..a4ef394de 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeBigIntegerValidator.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeBigIntegerValidator.java
@@ -1,13 +1,11 @@
 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 ru.tinkoff.kora.validation.common.annotation.Range;
 
+import javax.annotation.Nonnull;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Collections;
@@ -24,7 +22,7 @@ final class RangeBigIntegerValidator implements Validator<BigInteger> {
     private final Predicate<BigInteger> toPredicate;
 
     RangeBigIntegerValidator(double fromDouble, double toDouble, Range.Boundary boundary) {
-        if(toDouble < fromDouble)
+        if (toDouble < fromDouble)
             throw new IllegalArgumentException("From can't be less than To, but From was " + fromDouble + " and To was " + toDouble);
 
         this.from = BigDecimal.valueOf(fromDouble).toBigInteger();
@@ -43,7 +41,7 @@ final class RangeBigIntegerValidator implements Validator<BigInteger> {
 
     @Nonnull
     @Override
-    public @NotNull List<Violation> validate(BigInteger value, @Nonnull ValidationContext context) {
+    public List<Violation> validate(BigInteger value, @Nonnull ValidationContext context) {
         if (value == null) {
             return List.of(context.violates("Should be in range from '" + from + "' to '" + to + "', but was null"));
         }
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeDoubleNumberValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeDoubleNumberValidator.java
index 987b91982..38b3aa431 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeDoubleNumberValidator.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeDoubleNumberValidator.java
@@ -1,13 +1,11 @@
 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 ru.tinkoff.kora.validation.common.annotation.Range;
 
+import javax.annotation.Nonnull;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Predicate;
@@ -22,7 +20,7 @@ final class RangeDoubleNumberValidator<T extends Number> implements Validator<T>
     private final Predicate<T> toPredicate;
 
     RangeDoubleNumberValidator(double from, double to, Range.Boundary boundary) {
-        if(to < from)
+        if (to < from)
             throw new IllegalArgumentException("From can't be less than To, but From was " + from + " and To was " + to);
 
         this.from = from;
@@ -41,7 +39,7 @@ final class RangeDoubleNumberValidator<T extends Number> 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 in range from '" + from + "' to '" + to + "', but was null"));
         }
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeLongNumberValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeLongNumberValidator.java
index 179ac3762..e9074b1f8 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeLongNumberValidator.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/RangeLongNumberValidator.java
@@ -1,6 +1,5 @@
 package ru.tinkoff.kora.validation.common.constraint;
 
-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;
@@ -40,7 +39,7 @@ final class RangeLongNumberValidator<T extends Number> 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 in range from '" + from + "' to '" + to + "', but was null"));
         }
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/SizeCollectionValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/SizeCollectionValidator.java
index f0065834d..84941ea1e 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/SizeCollectionValidator.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/SizeCollectionValidator.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.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -19,7 +17,7 @@ final class SizeCollectionValidator<V, T extends Collection<V>> implements Valid
     public SizeCollectionValidator(int from, int to) {
         if (from < 0)
             throw new IllegalArgumentException("From can't be less 0, but was: " + from);
-        if(to < from)
+        if (to < from)
             throw new IllegalArgumentException("From can't be less than To, but From was " + from + " and To was " + to);
 
         this.from = from;
@@ -28,7 +26,7 @@ public SizeCollectionValidator(int from, int to) {
 
     @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("Size should be in range from '" + from + "' to '" + to + "', but value was null"));
         } else if (value.size() < from) {
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/SizeMapValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/SizeMapValidator.java
index 8b176eef2..862646a03 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/SizeMapValidator.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/SizeMapValidator.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;
@@ -19,7 +17,7 @@ final class SizeMapValidator<K, V> implements Validator<Map<K, V>> {
     public SizeMapValidator(int from, int to) {
         if (from < 0)
             throw new IllegalArgumentException("From can't be less 0, but was: " + from);
-        if(to < from)
+        if (to < from)
             throw new IllegalArgumentException("From can't be less than To, but From was " + from + " and To was " + to);
 
         this.from = from;
@@ -28,7 +26,7 @@ public SizeMapValidator(int from, int to) {
 
     @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("Size should be in range from '" + from + "' to '" + to + "', but value was null"));
         } else if (value.size() < from) {
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/SizeStringValidator.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/SizeStringValidator.java
index c6ad3b226..cb90b6053 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/SizeStringValidator.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/SizeStringValidator.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;
 
@@ -18,7 +16,7 @@ final class SizeStringValidator<T extends CharSequence> implements Validator<T>
     public SizeStringValidator(int from, int to) {
         if (from < 0)
             throw new IllegalArgumentException("From can't be less 0, but was: " + from);
-        if(to < from)
+        if (to < from)
             throw new IllegalArgumentException("From can't be less than To, but From was " + from + " and To was " + to);
 
         this.from = from;
@@ -27,7 +25,7 @@ public SizeStringValidator(int from, int to) {
 
     @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("Length should be in range from '" + from + "' to '" + to + "', but was null"));
         } else if (value.length() < from) {
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/factory/PatternValidatorFactory.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/factory/PatternValidatorFactory.java
index 4a5abe57e..b1e3b434c 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/factory/PatternValidatorFactory.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/factory/PatternValidatorFactory.java
@@ -1,9 +1,10 @@
 package ru.tinkoff.kora.validation.common.constraint.factory;
 
-import javax.annotation.Nonnull;
 import ru.tinkoff.kora.validation.common.Validator;
 import ru.tinkoff.kora.validation.common.ValidatorFactory;
 
+import javax.annotation.Nonnull;
+
 public interface PatternValidatorFactory<T> extends ValidatorFactory<T> {
 
     @Nonnull
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/factory/RangeValidatorFactory.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/factory/RangeValidatorFactory.java
index c275c0913..0e5f68e1c 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/factory/RangeValidatorFactory.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/factory/RangeValidatorFactory.java
@@ -1,10 +1,11 @@
 package ru.tinkoff.kora.validation.common.constraint.factory;
 
-import javax.annotation.Nonnull;
 import ru.tinkoff.kora.validation.common.Validator;
 import ru.tinkoff.kora.validation.common.ValidatorFactory;
 import ru.tinkoff.kora.validation.common.annotation.Range;
 
+import javax.annotation.Nonnull;
+
 public interface RangeValidatorFactory<T> extends ValidatorFactory<T> {
 
     @Nonnull
diff --git a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/factory/SizeValidatorFactory.java b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/factory/SizeValidatorFactory.java
index 087385c4a..d416b4aa8 100644
--- a/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/factory/SizeValidatorFactory.java
+++ b/validation/validation-common/src/main/java/ru/tinkoff/kora/validation/common/constraint/factory/SizeValidatorFactory.java
@@ -1,9 +1,10 @@
 package ru.tinkoff.kora.validation.common.constraint.factory;
 
-import javax.annotation.Nonnull;
 import ru.tinkoff.kora.validation.common.Validator;
 import ru.tinkoff.kora.validation.common.ValidatorFactory;
 
+import javax.annotation.Nonnull;
+
 public interface SizeValidatorFactory<T> extends ValidatorFactory<T> {
 
     @Nonnull