Avoid String allocations with Assert.isTrue()

mdeinum · Jun 29, 2023 · 1348b2a · 1348b2a
1 parent bdf8965
commit 1348b2a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/.../java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java b/.../java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java
@@ -507,10 +507,9 @@ else if (!escaped && ch == '"') {
 	 * @return the encoded header field param
 	 * @see <a href="https://tools.ietf.org/html/rfc5987">RFC 5987</a>
 	 */
-	private static String decodeRfc5987Filename(String filename, Charset charset) {
-		Assert.notNull(filename, "'filename' must not be null");
-		Assert.notNull(charset, "'charset' must not be null");
-
+	private static String decodeFilename(String filename, Charset charset) {
+		Assert.notNull(filename, "'input' String should not be null");
+		Assert.notNull(charset, "'charset' should not be null");
 		byte[] value = filename.getBytes(charset);
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		int index = 0;
@@ -666,12 +665,11 @@ private static String decodeQuotedPairs(String filename) {
 	 * @return the encoded header field param
 	 * @see <a href="https://tools.ietf.org/html/rfc5987">RFC 5987</a>
 	 */
-	private static String encodeRfc5987Filename(String input, Charset charset) {
-		Assert.notNull(input, "'input' must not be null");
-		Assert.notNull(charset, "'charset' must not be null");
+	private static String encodeFilename(String input, Charset charset) {
+		Assert.notNull(input, "'input' is required");
+		Assert.notNull(charset, "'charset' is required");
 		Assert.isTrue(!StandardCharsets.US_ASCII.equals(charset), "ASCII does not require encoding");
 		Assert.isTrue(UTF_8.equals(charset) || ISO_8859_1.equals(charset), "Only UTF-8 and ISO-8859-1 are supported");
-
 		byte[] source = input.getBytes(charset);
 		StringBuilder sb = new StringBuilder(source.length << 1);
 		sb.append(charset.name());

diff --git a/...c/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java b/...c/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ain/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java b/...ain/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.