From 0ca726b71d94e278260f737df7b8f78484f12e66 Mon Sep 17 00:00:00 2001 From: Forb Yuan Date: Fri, 8 Dec 2023 10:37:55 +0800 Subject: [PATCH] fix code smell --- .../java/win/doyto/i18n/module/i18n/I18nOpenController.java | 4 +--- src/main/java/win/doyto/i18n/module/i18n/I18nService.java | 1 + .../java/win/doyto/i18n/module/user/AuthUserIdProvider.java | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/win/doyto/i18n/module/i18n/I18nOpenController.java b/src/main/java/win/doyto/i18n/module/i18n/I18nOpenController.java index ac56618..b6390d1 100644 --- a/src/main/java/win/doyto/i18n/module/i18n/I18nOpenController.java +++ b/src/main/java/win/doyto/i18n/module/i18n/I18nOpenController.java @@ -65,9 +65,7 @@ private static void nestedJson(JSONObject parent, String[] params, int deep, Obj parent.put(params[deep], arg); return; } - if (!parent.containsKey(param)) { - parent.put(param, new JSONObject()); - } + parent.computeIfAbsent(param, k -> new JSONObject()); nestedJson(parent.getJSONObject(param), params, deep + 1, arg); } diff --git a/src/main/java/win/doyto/i18n/module/i18n/I18nService.java b/src/main/java/win/doyto/i18n/module/i18n/I18nService.java index a4bd643..95958e7 100644 --- a/src/main/java/win/doyto/i18n/module/i18n/I18nService.java +++ b/src/main/java/win/doyto/i18n/module/i18n/I18nService.java @@ -108,6 +108,7 @@ public void saveTranslation(List i18nViewList) { log.info("保存翻译完毕: {} / {}", ret, i18nViewList.size()); } + @SuppressWarnings("java:S6809") @Transactional public void saveTranslation(String user, String group, String locale, Map translationMap) { List i18nViewList = new ArrayList<>(translationMap.size()); diff --git a/src/main/java/win/doyto/i18n/module/user/AuthUserIdProvider.java b/src/main/java/win/doyto/i18n/module/user/AuthUserIdProvider.java index a1dfab1..c42757b 100644 --- a/src/main/java/win/doyto/i18n/module/user/AuthUserIdProvider.java +++ b/src/main/java/win/doyto/i18n/module/user/AuthUserIdProvider.java @@ -19,8 +19,8 @@ public String getUserId() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (authentication != null) { Object principal = authentication.getPrincipal(); - if (principal instanceof User) { - return ((User) principal).getUsername(); + if (principal instanceof User user) { + return user.getUsername(); } } return null;