From b1e4a90d83242ebbd2419b8127cb6c567e4347f9 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 1 Jul 2022 19:16:15 +0200
Subject: [PATCH] OZG-2566 OZG-2684 improve code
---
.../common/command/CommandBodyMapper.java | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandBodyMapper.java b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandBodyMapper.java
index 2211413346..094c88df95 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandBodyMapper.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandBodyMapper.java
@@ -86,21 +86,10 @@ public interface CommandBodyMapper {
}
default Map<String, Object> fromObjectToMap(Object object) {
- var objectMap = new HashMap<String, Object>();
-
- new BeanMap(object).entrySet().forEach(entry -> {
- var keyString = entry.getKey().toString();
-
- if (shouldMap(keyString)) {
- objectMap.put(keyString, checkEnumValue(entry.getValue()));
- }
- });
-
- return objectMap;
- }
-
- private boolean shouldMap(String key) {
- return !key.equals("class") && !key.equals("version");
+ return new BeanMap(object).entrySet().stream()
+ .filter(IS_NOT_CLASS_VALUE)
+ .filter(IS_NOT_VERSION_VALUE)
+ .collect(HashMap::new, (map, entry) -> map.put(entry.getKey().toString(), checkEnumValue(entry.getValue())), Map::putAll);
}
private Object checkEnumValue(Object entryValue) {
--
GitLab