Remove Jetbrains annotations

spring-projects · Nov 13, 2019 · f2b9264 · f2b9264
1 parent e6a6580
commit f2b9264
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/LeakAwareDataBufferFactory.java b/spring-core/src/test/java/org/springframework/core/io/buffer/LeakAwareDataBufferFactory.java
@@ -27,7 +27,6 @@
 import io.netty.buffer.PooledByteBufAllocator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jetbrains.annotations.NotNull;
 
 import org.springframework.util.Assert;
 
@@ -113,7 +112,6 @@ public DataBuffer allocateBuffer(int initialCapacity) {
 		return createLeakAwareDataBuffer(this.delegate.allocateBuffer(initialCapacity));
 	}
 
-	@NotNull
 	private DataBuffer createLeakAwareDataBuffer(DataBuffer delegateBuffer) {
 		LeakAwareDataBuffer dataBuffer = new LeakAwareDataBuffer(delegateBuffer, this);
 		if (this.trackCreated.get()) {

diff --git a/...g-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java b/...g-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
@@ -40,8 +40,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import org.jetbrains.annotations.NotNull;
-
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRange;
@@ -322,7 +320,6 @@ private ServletParametersMap(HttpServletRequest servletRequest) {
 			this.servletRequest = servletRequest;
 		}
 
-		@NotNull
 		@Override
 		public Set<Entry<String, List<String>>> entrySet() {
 			return this.servletRequest.getParameterMap().entrySet().stream()
@@ -388,7 +385,6 @@ public void clear() {
 			attributeNames.forEach(this.servletRequest::removeAttribute);
 		}
 
-		@NotNull
 		@Override
 		public Set<Entry<String, Object>> entrySet() {
 			return Collections.list(this.servletRequest.getAttributeNames()).stream()

diff --git a/...c/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java b/...c/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java
@@ -38,8 +38,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import org.jetbrains.annotations.NotNull;
-
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpInputMessage;
@@ -349,12 +347,12 @@ public int read() throws IOException {
 		}
 
 		@Override
-		public int read(@NotNull byte[] b, int off, int len) throws IOException {
+		public int read(byte[] b, int off, int len) throws IOException {
 			return this.delegate.read(b, off, len);
 		}
 
 		@Override
-		public int read(@NotNull byte[] b) throws IOException {
+		public int read(byte[] b) throws IOException {
 			return this.delegate.read(b);
 		}
 

diff --git a/...src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java b/...src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java
@@ -23,8 +23,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.jetbrains.annotations.NotNull;
-
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
@@ -167,7 +165,7 @@ private void initMessageConverters() {
 
 	@Nullable
 	@Override
-	protected Object getHandlerInternal(@NotNull HttpServletRequest servletRequest) throws Exception {
+	protected Object getHandlerInternal(HttpServletRequest servletRequest) throws Exception {
 		String lookupPath = getUrlPathHelper().getLookupPathForRequest(servletRequest);
 		servletRequest.setAttribute(LOOKUP_PATH, lookupPath);
 		if (this.routerFunction != null) {