Commit f356947

facewisemp911de

authored and

committed

Remove unnecessary usages of Optional.

Signed-off-by: facewise <dydguskim@gripcorp.co> Closes #3203

1 parent 1eab4d3 commit f356947Copy full SHA for f356947

File tree

+20

-16

lines changed

src/main/java/org/springframework/data/redis
- cache
  - BatchStrategies.java
- connection
  - RedisPassword.java

+20

-16

lines changed

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,10 @@`
`16`	`16`	`package org.springframework.data.redis.cache;`
`17`	`17`
`18`	`18`	`import java.util.ArrayList;`
`19`		`-import java.util.Collections;`
`20`	`19`	`import java.util.Iterator;`
`21`	`20`	`import java.util.List;`
`22`	`21`	`import java.util.NoSuchElementException;`
`23`		`-import java.util.Optional;`
	`22`	`+import java.util.Set;`
`24`	`23`
`25`	`24`	`import org.springframework.data.redis.connection.RedisConnection;`
`26`	`25`	`import org.springframework.data.redis.connection.RedisKeyCommands;`
`@@ -34,6 +33,7 @@`
`34`	`33`	`* @author Mark Paluch`
`35`	`34`	`* @author Christoph Strobl`
`36`	`35`	`* @author John Blum`
	`36`	`+ * @author Yong-Hyun Kim`
`37`	`37`	`* @since 2.6`
`38`	`38`	`*/`
`39`	`39`	`public abstract class BatchStrategies {`
`@@ -82,14 +82,15 @@ public long cleanCache(RedisConnection connection, String name, byte[] pattern)`
`82`	`82`
`83`	`83`	`RedisKeyCommands commands = connection.keyCommands();`
`84`	`84`
`85`		`- byte[][] keys = Optional.ofNullable(commands.keys(pattern)).orElse(Collections.emptySet())`
`86`		`- .toArray(new byte[0][]);`
	`85`	`+ Set<byte[]> keys = commands.keys(pattern);`
`87`	`86`
`88`		`- if (keys.length > 0) {`
`89`		`- commands.del(keys);`
`90`		`- }`
	`87`	`+ if (keys == null \|\| keys.isEmpty()) {`
	`88`	`+ return 0;`
	`89`	`+ }`
	`90`	`+`
	`91`	`+ commands.del(keys.toArray(new byte[0][]));`
`91`	`92`
`92`		`- return keys.length;`
	`93`	`+ return keys.size();`
`93`	`94`	`}`
`94`	`95`	`}`
`95`	`96`

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`*`
`36`	`36`	`* @author Mark Paluch`
`37`	`37`	`* @author Christoph Strobl`
	`38`	`+ * @author Yong-Hyun Kim`
`38`	`39`	`* @since 2.0`
`39`	`40`	`*/`
`40`	`41`	`public class RedisPassword {`
`@@ -55,10 +56,11 @@ private RedisPassword(char[] thePassword) {`
`55`	`56`	`*/`
`56`	`57`	`public static RedisPassword of(@Nullable String passwordAsString) {`
`57`	`58`
`58`		`- return Optional.ofNullable(passwordAsString) //`
`59`		`- .filter(StringUtils::hasText) //`
`60`		`- .map(it -> new RedisPassword(it.toCharArray())) //`
`61`		`- .orElseGet(RedisPassword::none);`
	`59`	`+ if (!StringUtils.hasText(passwordAsString)) {`
	`60`	`+ return none();`
	`61`	`+ }`
	`62`	`+`
	`63`	`+ return new RedisPassword(passwordAsString.toCharArray());`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`/**`
`@@ -69,10 +71,11 @@ public static RedisPassword of(@Nullable String passwordAsString) {`
`69`	`71`	`*/`
`70`	`72`	`public static RedisPassword of(char @Nullable[] passwordAsChars) {`
`71`	`73`
`72`		`- return Optional.ofNullable(passwordAsChars) //`
`73`		`- .filter(it -> !ObjectUtils.isEmpty(passwordAsChars)) //`
`74`		`- .map(it -> new RedisPassword(Arrays.copyOf(it, it.length))) //`
`75`		`- .orElseGet(RedisPassword::none);`
	`74`	`+ if (ObjectUtils.isEmpty(passwordAsChars)) {`
	`75`	`+ return none();`
	`76`	`+ }`
	`77`	`+`
	`78`	`+ return new RedisPassword(Arrays.copyOf(passwordAsChars, passwordAsChars.length));`
`76`	`79`	`}`
`77`	`80`
`78`	`81`	`/**`

Comments

(0)