From 883741e9c1f809e256b622d838abf066f9e648dc Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Sat, 22 Oct 2022 16:07:03 +0200 Subject: [PATCH] Remove javax nullability annotations. Original Pull Request #2342 Closes #2340 --- .../data/elasticsearch/ElasticsearchErrorCause.java | 7 ++++--- .../core/SearchAsYouTypeIntegrationTests.java | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/ElasticsearchErrorCause.java b/src/main/java/org/springframework/data/elasticsearch/ElasticsearchErrorCause.java index 8860aae66..bcae908a8 100644 --- a/src/main/java/org/springframework/data/elasticsearch/ElasticsearchErrorCause.java +++ b/src/main/java/org/springframework/data/elasticsearch/ElasticsearchErrorCause.java @@ -15,9 +15,9 @@ */ package org.springframework.data.elasticsearch; -import java.util.List; +import org.springframework.lang.Nullable; -import javax.annotation.Nullable; +import java.util.List; /** * Object describing an Elasticsearch error @@ -26,7 +26,8 @@ import javax.annotation.Nullable; * @since 4.4 */ public class ElasticsearchErrorCause { - @Nullable private final String type; + @Nullable + private final String type; private final String reason; diff --git a/src/test/java/org/springframework/data/elasticsearch/core/SearchAsYouTypeIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/SearchAsYouTypeIntegrationTests.java index 7dc42cebe..b06ad156c 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/SearchAsYouTypeIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/SearchAsYouTypeIntegrationTests.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import javax.annotation.Nonnull; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -140,7 +138,7 @@ public abstract class SearchAsYouTypeIntegrationTests { @Document(indexName = "#{@indexNameProvider.indexName()}") static class SearchAsYouTypeEntity { - public SearchAsYouTypeEntity(@Nonnull String id) { + public SearchAsYouTypeEntity(String id) { this.id = id; }