Skip to content

Commit db86097

Browse files
junghoon-vanschristophstrobl
authored andcommitted
Polish MongoDbErrorCodes.
Add missing nullable annotation and fix typo. Simplify return statement expressions. Closes: #4537
1 parent e2d0734 commit db86097

File tree

1 file changed

+41
-40
lines changed

1 file changed

+41
-40
lines changed

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoDbErrorCodes.java

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public final class MongoDbErrorCodes {
3131
static HashMap<Integer, String> dataAccessResourceFailureCodes;
3232
static HashMap<Integer, String> dataIntegrityViolationCodes;
3333
static HashMap<Integer, String> duplicateKeyCodes;
34-
static HashMap<Integer, String> invalidDataAccessApiUsageExeption;
34+
static HashMap<Integer, String> invalidDataAccessApiUsageException;
3535
static HashMap<Integer, String> permissionDeniedCodes;
3636
static HashMap<Integer, String> clientSessionCodes;
3737
static HashMap<Integer, String> transactionCodes;
@@ -68,37 +68,37 @@ public final class MongoDbErrorCodes {
6868
duplicateKeyCodes.put(11000, "DuplicateKey");
6969
duplicateKeyCodes.put(11001, "DuplicateKey");
7070

71-
invalidDataAccessApiUsageExeption = new HashMap<>(31, 1f);
72-
invalidDataAccessApiUsageExeption.put(5, "GraphContainsCycle");
73-
invalidDataAccessApiUsageExeption.put(9, "FailedToParse");
74-
invalidDataAccessApiUsageExeption.put(14, "TypeMismatch");
75-
invalidDataAccessApiUsageExeption.put(15, "Overflow");
76-
invalidDataAccessApiUsageExeption.put(16, "InvalidLength");
77-
invalidDataAccessApiUsageExeption.put(20, "IllegalOperation");
78-
invalidDataAccessApiUsageExeption.put(21, "EmptyArrayOperation");
79-
invalidDataAccessApiUsageExeption.put(22, "InvalidBSON");
80-
invalidDataAccessApiUsageExeption.put(23, "AlreadyInitialized");
81-
invalidDataAccessApiUsageExeption.put(29, "NonExistentPath");
82-
invalidDataAccessApiUsageExeption.put(30, "InvalidPath");
83-
invalidDataAccessApiUsageExeption.put(40, "ConflictingUpdateOperators");
84-
invalidDataAccessApiUsageExeption.put(45, "UserDataInconsistent");
85-
invalidDataAccessApiUsageExeption.put(52, "DollarPrefixedFieldName");
86-
invalidDataAccessApiUsageExeption.put(53, "InvalidIdField");
87-
invalidDataAccessApiUsageExeption.put(54, "NotSingleValueField");
88-
invalidDataAccessApiUsageExeption.put(55, "InvalidDBRef");
89-
invalidDataAccessApiUsageExeption.put(56, "EmptyFieldName");
90-
invalidDataAccessApiUsageExeption.put(57, "DottedFieldName");
91-
invalidDataAccessApiUsageExeption.put(59, "CommandNotFound");
92-
invalidDataAccessApiUsageExeption.put(60, "DatabaseNotFound");
93-
invalidDataAccessApiUsageExeption.put(61, "ShardKeyNotFound");
94-
invalidDataAccessApiUsageExeption.put(62, "OplogOperationUnsupported");
95-
invalidDataAccessApiUsageExeption.put(66, "ImmutableField");
96-
invalidDataAccessApiUsageExeption.put(72, "InvalidOptions");
97-
invalidDataAccessApiUsageExeption.put(115, "CommandNotSupported");
98-
invalidDataAccessApiUsageExeption.put(116, "DocTooLargeForCapped");
99-
invalidDataAccessApiUsageExeption.put(130, "SymbolNotFound");
100-
invalidDataAccessApiUsageExeption.put(17280, "KeyTooLong");
101-
invalidDataAccessApiUsageExeption.put(13334, "ShardKeyTooBig");
71+
invalidDataAccessApiUsageException = new HashMap<>(31, 1f);
72+
invalidDataAccessApiUsageException.put(5, "GraphContainsCycle");
73+
invalidDataAccessApiUsageException.put(9, "FailedToParse");
74+
invalidDataAccessApiUsageException.put(14, "TypeMismatch");
75+
invalidDataAccessApiUsageException.put(15, "Overflow");
76+
invalidDataAccessApiUsageException.put(16, "InvalidLength");
77+
invalidDataAccessApiUsageException.put(20, "IllegalOperation");
78+
invalidDataAccessApiUsageException.put(21, "EmptyArrayOperation");
79+
invalidDataAccessApiUsageException.put(22, "InvalidBSON");
80+
invalidDataAccessApiUsageException.put(23, "AlreadyInitialized");
81+
invalidDataAccessApiUsageException.put(29, "NonExistentPath");
82+
invalidDataAccessApiUsageException.put(30, "InvalidPath");
83+
invalidDataAccessApiUsageException.put(40, "ConflictingUpdateOperators");
84+
invalidDataAccessApiUsageException.put(45, "UserDataInconsistent");
85+
invalidDataAccessApiUsageException.put(52, "DollarPrefixedFieldName");
86+
invalidDataAccessApiUsageException.put(53, "InvalidIdField");
87+
invalidDataAccessApiUsageException.put(54, "NotSingleValueField");
88+
invalidDataAccessApiUsageException.put(55, "InvalidDBRef");
89+
invalidDataAccessApiUsageException.put(56, "EmptyFieldName");
90+
invalidDataAccessApiUsageException.put(57, "DottedFieldName");
91+
invalidDataAccessApiUsageException.put(59, "CommandNotFound");
92+
invalidDataAccessApiUsageException.put(60, "DatabaseNotFound");
93+
invalidDataAccessApiUsageException.put(61, "ShardKeyNotFound");
94+
invalidDataAccessApiUsageException.put(62, "OplogOperationUnsupported");
95+
invalidDataAccessApiUsageException.put(66, "ImmutableField");
96+
invalidDataAccessApiUsageException.put(72, "InvalidOptions");
97+
invalidDataAccessApiUsageException.put(115, "CommandNotSupported");
98+
invalidDataAccessApiUsageException.put(116, "DocTooLargeForCapped");
99+
invalidDataAccessApiUsageException.put(130, "SymbolNotFound");
100+
invalidDataAccessApiUsageException.put(17280, "KeyTooLong");
101+
invalidDataAccessApiUsageException.put(13334, "ShardKeyTooBig");
102102

103103
permissionDeniedCodes = new HashMap<>(8, 1f);
104104
permissionDeniedCodes.put(11, "UserNotFound");
@@ -130,31 +130,32 @@ public final class MongoDbErrorCodes {
130130
errorCodes.putAll(dataAccessResourceFailureCodes);
131131
errorCodes.putAll(dataIntegrityViolationCodes);
132132
errorCodes.putAll(duplicateKeyCodes);
133-
errorCodes.putAll(invalidDataAccessApiUsageExeption);
133+
errorCodes.putAll(invalidDataAccessApiUsageException);
134134
errorCodes.putAll(permissionDeniedCodes);
135135
errorCodes.putAll(clientSessionCodes);
136136
}
137137

138138
public static boolean isDataIntegrityViolationCode(@Nullable Integer errorCode) {
139-
return errorCode == null ? false : dataIntegrityViolationCodes.containsKey(errorCode);
139+
return errorCode != null && dataIntegrityViolationCodes.containsKey(errorCode);
140140
}
141141

142142
public static boolean isDataAccessResourceFailureCode(@Nullable Integer errorCode) {
143-
return errorCode == null ? false : dataAccessResourceFailureCodes.containsKey(errorCode);
143+
return errorCode != null && dataAccessResourceFailureCodes.containsKey(errorCode);
144144
}
145145

146146
public static boolean isDuplicateKeyCode(@Nullable Integer errorCode) {
147-
return errorCode == null ? false : duplicateKeyCodes.containsKey(errorCode);
147+
return errorCode != null && duplicateKeyCodes.containsKey(errorCode);
148148
}
149149

150150
public static boolean isPermissionDeniedCode(@Nullable Integer errorCode) {
151-
return errorCode == null ? false : permissionDeniedCodes.containsKey(errorCode);
151+
return errorCode != null && permissionDeniedCodes.containsKey(errorCode);
152152
}
153153

154154
public static boolean isInvalidDataAccessApiUsageCode(@Nullable Integer errorCode) {
155-
return errorCode == null ? false : invalidDataAccessApiUsageExeption.containsKey(errorCode);
155+
return errorCode != null && invalidDataAccessApiUsageException.containsKey(errorCode);
156156
}
157157

158+
@Nullable
158159
public static String getErrorDescription(@Nullable Integer errorCode) {
159160
return errorCode == null ? null : errorCodes.get(errorCode);
160161
}
@@ -167,7 +168,7 @@ public static String getErrorDescription(@Nullable Integer errorCode) {
167168
* @since 2.1
168169
*/
169170
public static boolean isClientSessionFailureCode(@Nullable Integer errorCode) {
170-
return errorCode == null ? false : clientSessionCodes.containsKey(errorCode);
171+
return errorCode != null && clientSessionCodes.containsKey(errorCode);
171172
}
172173

173174
/**
@@ -178,6 +179,6 @@ public static boolean isClientSessionFailureCode(@Nullable Integer errorCode) {
178179
* @since 2.1
179180
*/
180181
public static boolean isTransactionFailureCode(@Nullable Integer errorCode) {
181-
return errorCode == null ? false : transactionCodes.containsKey(errorCode);
182+
return errorCode != null && transactionCodes.containsKey(errorCode);
182183
}
183184
}

0 commit comments

Comments
 (0)