From db86097c0d623ee26d95a751186bd8c6baf47872 Mon Sep 17 00:00:00 2001 From: Junghoon Ban Date: Thu, 26 Oct 2023 18:45:40 +0900 Subject: [PATCH] Polish MongoDbErrorCodes. Add missing nullable annotation and fix typo. Simplify return statement expressions. Closes: #4537 --- .../data/mongodb/util/MongoDbErrorCodes.java | 81 ++++++++++--------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoDbErrorCodes.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoDbErrorCodes.java index 9abe21b04..4e64e370c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoDbErrorCodes.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoDbErrorCodes.java @@ -31,7 +31,7 @@ public final class MongoDbErrorCodes { static HashMap dataAccessResourceFailureCodes; static HashMap dataIntegrityViolationCodes; static HashMap duplicateKeyCodes; - static HashMap invalidDataAccessApiUsageExeption; + static HashMap invalidDataAccessApiUsageException; static HashMap permissionDeniedCodes; static HashMap clientSessionCodes; static HashMap transactionCodes; @@ -68,37 +68,37 @@ public final class MongoDbErrorCodes { duplicateKeyCodes.put(11000, "DuplicateKey"); duplicateKeyCodes.put(11001, "DuplicateKey"); - invalidDataAccessApiUsageExeption = new HashMap<>(31, 1f); - invalidDataAccessApiUsageExeption.put(5, "GraphContainsCycle"); - invalidDataAccessApiUsageExeption.put(9, "FailedToParse"); - invalidDataAccessApiUsageExeption.put(14, "TypeMismatch"); - invalidDataAccessApiUsageExeption.put(15, "Overflow"); - invalidDataAccessApiUsageExeption.put(16, "InvalidLength"); - invalidDataAccessApiUsageExeption.put(20, "IllegalOperation"); - invalidDataAccessApiUsageExeption.put(21, "EmptyArrayOperation"); - invalidDataAccessApiUsageExeption.put(22, "InvalidBSON"); - invalidDataAccessApiUsageExeption.put(23, "AlreadyInitialized"); - invalidDataAccessApiUsageExeption.put(29, "NonExistentPath"); - invalidDataAccessApiUsageExeption.put(30, "InvalidPath"); - invalidDataAccessApiUsageExeption.put(40, "ConflictingUpdateOperators"); - invalidDataAccessApiUsageExeption.put(45, "UserDataInconsistent"); - invalidDataAccessApiUsageExeption.put(52, "DollarPrefixedFieldName"); - invalidDataAccessApiUsageExeption.put(53, "InvalidIdField"); - invalidDataAccessApiUsageExeption.put(54, "NotSingleValueField"); - invalidDataAccessApiUsageExeption.put(55, "InvalidDBRef"); - invalidDataAccessApiUsageExeption.put(56, "EmptyFieldName"); - invalidDataAccessApiUsageExeption.put(57, "DottedFieldName"); - invalidDataAccessApiUsageExeption.put(59, "CommandNotFound"); - invalidDataAccessApiUsageExeption.put(60, "DatabaseNotFound"); - invalidDataAccessApiUsageExeption.put(61, "ShardKeyNotFound"); - invalidDataAccessApiUsageExeption.put(62, "OplogOperationUnsupported"); - invalidDataAccessApiUsageExeption.put(66, "ImmutableField"); - invalidDataAccessApiUsageExeption.put(72, "InvalidOptions"); - invalidDataAccessApiUsageExeption.put(115, "CommandNotSupported"); - invalidDataAccessApiUsageExeption.put(116, "DocTooLargeForCapped"); - invalidDataAccessApiUsageExeption.put(130, "SymbolNotFound"); - invalidDataAccessApiUsageExeption.put(17280, "KeyTooLong"); - invalidDataAccessApiUsageExeption.put(13334, "ShardKeyTooBig"); + invalidDataAccessApiUsageException = new HashMap<>(31, 1f); + invalidDataAccessApiUsageException.put(5, "GraphContainsCycle"); + invalidDataAccessApiUsageException.put(9, "FailedToParse"); + invalidDataAccessApiUsageException.put(14, "TypeMismatch"); + invalidDataAccessApiUsageException.put(15, "Overflow"); + invalidDataAccessApiUsageException.put(16, "InvalidLength"); + invalidDataAccessApiUsageException.put(20, "IllegalOperation"); + invalidDataAccessApiUsageException.put(21, "EmptyArrayOperation"); + invalidDataAccessApiUsageException.put(22, "InvalidBSON"); + invalidDataAccessApiUsageException.put(23, "AlreadyInitialized"); + invalidDataAccessApiUsageException.put(29, "NonExistentPath"); + invalidDataAccessApiUsageException.put(30, "InvalidPath"); + invalidDataAccessApiUsageException.put(40, "ConflictingUpdateOperators"); + invalidDataAccessApiUsageException.put(45, "UserDataInconsistent"); + invalidDataAccessApiUsageException.put(52, "DollarPrefixedFieldName"); + invalidDataAccessApiUsageException.put(53, "InvalidIdField"); + invalidDataAccessApiUsageException.put(54, "NotSingleValueField"); + invalidDataAccessApiUsageException.put(55, "InvalidDBRef"); + invalidDataAccessApiUsageException.put(56, "EmptyFieldName"); + invalidDataAccessApiUsageException.put(57, "DottedFieldName"); + invalidDataAccessApiUsageException.put(59, "CommandNotFound"); + invalidDataAccessApiUsageException.put(60, "DatabaseNotFound"); + invalidDataAccessApiUsageException.put(61, "ShardKeyNotFound"); + invalidDataAccessApiUsageException.put(62, "OplogOperationUnsupported"); + invalidDataAccessApiUsageException.put(66, "ImmutableField"); + invalidDataAccessApiUsageException.put(72, "InvalidOptions"); + invalidDataAccessApiUsageException.put(115, "CommandNotSupported"); + invalidDataAccessApiUsageException.put(116, "DocTooLargeForCapped"); + invalidDataAccessApiUsageException.put(130, "SymbolNotFound"); + invalidDataAccessApiUsageException.put(17280, "KeyTooLong"); + invalidDataAccessApiUsageException.put(13334, "ShardKeyTooBig"); permissionDeniedCodes = new HashMap<>(8, 1f); permissionDeniedCodes.put(11, "UserNotFound"); @@ -130,31 +130,32 @@ public final class MongoDbErrorCodes { errorCodes.putAll(dataAccessResourceFailureCodes); errorCodes.putAll(dataIntegrityViolationCodes); errorCodes.putAll(duplicateKeyCodes); - errorCodes.putAll(invalidDataAccessApiUsageExeption); + errorCodes.putAll(invalidDataAccessApiUsageException); errorCodes.putAll(permissionDeniedCodes); errorCodes.putAll(clientSessionCodes); } public static boolean isDataIntegrityViolationCode(@Nullable Integer errorCode) { - return errorCode == null ? false : dataIntegrityViolationCodes.containsKey(errorCode); + return errorCode != null && dataIntegrityViolationCodes.containsKey(errorCode); } public static boolean isDataAccessResourceFailureCode(@Nullable Integer errorCode) { - return errorCode == null ? false : dataAccessResourceFailureCodes.containsKey(errorCode); + return errorCode != null && dataAccessResourceFailureCodes.containsKey(errorCode); } public static boolean isDuplicateKeyCode(@Nullable Integer errorCode) { - return errorCode == null ? false : duplicateKeyCodes.containsKey(errorCode); + return errorCode != null && duplicateKeyCodes.containsKey(errorCode); } public static boolean isPermissionDeniedCode(@Nullable Integer errorCode) { - return errorCode == null ? false : permissionDeniedCodes.containsKey(errorCode); + return errorCode != null && permissionDeniedCodes.containsKey(errorCode); } public static boolean isInvalidDataAccessApiUsageCode(@Nullable Integer errorCode) { - return errorCode == null ? false : invalidDataAccessApiUsageExeption.containsKey(errorCode); + return errorCode != null && invalidDataAccessApiUsageException.containsKey(errorCode); } + @Nullable public static String getErrorDescription(@Nullable Integer errorCode) { return errorCode == null ? null : errorCodes.get(errorCode); } @@ -167,7 +168,7 @@ public final class MongoDbErrorCodes { * @since 2.1 */ public static boolean isClientSessionFailureCode(@Nullable Integer errorCode) { - return errorCode == null ? false : clientSessionCodes.containsKey(errorCode); + return errorCode != null && clientSessionCodes.containsKey(errorCode); } /** @@ -178,6 +179,6 @@ public final class MongoDbErrorCodes { * @since 2.1 */ public static boolean isTransactionFailureCode(@Nullable Integer errorCode) { - return errorCode == null ? false : transactionCodes.containsKey(errorCode); + return errorCode != null && transactionCodes.containsKey(errorCode); } }