Nullability refinements

Author: jhoeller

spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java

@@ -26,6 +26,7 @@
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -346,8 +347,9 @@ private String getCookieHeader(Cookie cookie) {
 		if (maxAge >= 0) {
 			buf.append("; Max-Age=").append(maxAge);
 			buf.append("; Expires=");
-			if (cookie instanceof MockCookie && ((MockCookie) cookie).getExpires() != null) {
-				buf.append(((MockCookie) cookie).getExpires().format(DateTimeFormatter.RFC_1123_DATE_TIME));
+			ZonedDateTime expires = (cookie instanceof MockCookie ? ((MockCookie) cookie).getExpires() : null);
+			if (expires != null) {
+				buf.append(expires.format(DateTimeFormatter.RFC_1123_DATE_TIME));
 			}
 			else {
 				HttpHeaders headers = new HttpHeaders();

spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java

@@ -163,7 +163,6 @@ public boolean canRead(ResolvableType elementType, @Nullable MediaType mediaType
 				(mediaType == null || MediaType.MULTIPART_FORM_DATA.isCompatibleWith(mediaType));
 	}
 
-
 	@Override
 	public Flux<Part> read(ResolvableType elementType, ReactiveHttpInputMessage message, Map<String, Object> hints) {
 		return Flux.create(new SynchronossPartGenerator(message))
@@ -177,13 +176,9 @@ public Flux<Part> read(ResolvableType elementType, ReactiveHttpInputMessage mess
 				});
 	}
 
-
 	@Override
-	public Mono<Part> readMono(
-			ResolvableType elementType, ReactiveHttpInputMessage message, Map<String, Object> hints) {
-
-		return Mono.error(new UnsupportedOperationException(
-				"Cannot read multipart request body into single Part"));
+	public Mono<Part> readMono(ResolvableType elementType, ReactiveHttpInputMessage message, Map<String, Object> hints) {
+		return Mono.error(new UnsupportedOperationException("Cannot read multipart request body into single Part"));
 	}
 
 
@@ -197,16 +192,16 @@ private class SynchronossPartGenerator extends BaseSubscriber<DataBuffer> implem
 
 		private final LimitedPartBodyStreamStorageFactory storageFactory = new LimitedPartBodyStreamStorageFactory();
 
+		@Nullable
 		private NioMultipartParserListener listener;
 
+		@Nullable
 		private NioMultipartParser parser;
 
-
 		public SynchronossPartGenerator(ReactiveHttpInputMessage inputMessage) {
 			this.inputMessage = inputMessage;
 		}
 
-
 		@Override
 		public void accept(FluxSink<Part> sink) {
 			HttpHeaders headers = this.inputMessage.getHeaders();
@@ -229,10 +224,13 @@ public void accept(FluxSink<Part> sink) {
 
 		@Override
 		protected void hookOnNext(DataBuffer buffer) {
+			Assert.state(this.parser != null && this.listener != null, "Not initialized yet");
+
 			int size = buffer.readableByteCount();
 			this.storageFactory.increaseByteCount(size);
 			byte[] resultBytes = new byte[size];
 			buffer.read(resultBytes);
+
 			try {
 				this.parser.write(resultBytes);
 			}
@@ -249,24 +247,32 @@ protected void hookOnNext(DataBuffer buffer) {
 		@Override
 		protected void hookOnError(Throwable ex) {
 			try {
-				this.parser.close();
+				if (this.parser != null) {
+					this.parser.close();
+				}
 			}
 			catch (IOException ex2) {
 				// ignore
 			}
 			finally {
-				int index = this.storageFactory.getCurrentPartIndex();
-				this.listener.onError("Failure while parsing part[" + index + "]", ex);
+				if (this.listener != null) {
+					int index = this.storageFactory.getCurrentPartIndex();
+					this.listener.onError("Failure while parsing part[" + index + "]", ex);
+				}
 			}
 		}
 
 		@Override
 		protected void hookFinally(SignalType type) {
 			try {
-				this.parser.close();
+				if (this.parser != null) {
+					this.parser.close();
+				}
 			}
 			catch (IOException ex) {
-				this.listener.onError("Error while closing parser", ex);
+				if (this.listener != null) {
+					this.listener.onError("Error while closing parser", ex);
+				}
 			}
 		}
 
@@ -280,17 +286,16 @@ private int getContentLength(HttpHeaders headers) {
 
 	private class LimitedPartBodyStreamStorageFactory implements PartBodyStreamStorageFactory {
 
-		private final PartBodyStreamStorageFactory storageFactory = maxInMemorySize > 0 ?
+		private final PartBodyStreamStorageFactory storageFactory = (maxInMemorySize > 0 ?
 				new DefaultPartBodyStreamStorageFactory(maxInMemorySize) :
-				new DefaultPartBodyStreamStorageFactory();
+				new DefaultPartBodyStreamStorageFactory());
 
 		private int index = 1;
 
 		private boolean isFilePart;
 
 		private long partSize;
 
-
 		public int getCurrentPartIndex() {
 			return this.index;
 		}
@@ -339,7 +344,6 @@ private static class FluxSinkAdapterListener implements NioMultipartParserListen
 
 		private final AtomicInteger terminated = new AtomicInteger(0);
 
-
 		FluxSinkAdapterListener(
 				FluxSink<Part> sink, MultipartContext context, LimitedPartBodyStreamStorageFactory factory) {
 
@@ -348,7 +352,6 @@ private static class FluxSinkAdapterListener implements NioMultipartParserListen
 			this.storageFactory = factory;
 		}
 
-
 		@Override
 		public void onPartFinished(StreamStorage storage, Map<String, List<String>> headers) {
 			HttpHeaders httpHeaders = new HttpHeaders();

spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java

@@ -26,6 +26,7 @@
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -346,8 +347,9 @@ private String getCookieHeader(Cookie cookie) {
 		if (maxAge >= 0) {
 			buf.append("; Max-Age=").append(maxAge);
 			buf.append("; Expires=");
-			if (cookie instanceof MockCookie && ((MockCookie) cookie).getExpires() != null) {
-				buf.append(((MockCookie) cookie).getExpires().format(DateTimeFormatter.RFC_1123_DATE_TIME));
+			ZonedDateTime expires = (cookie instanceof MockCookie ? ((MockCookie) cookie).getExpires() : null);
+			if (expires != null) {
+				buf.append(expires.format(DateTimeFormatter.RFC_1123_DATE_TIME));
 			}
 			else {
 				HttpHeaders headers = new HttpHeaders();