|
7 | 7 |
|
8 | 8 | import com.amazonaws.util.awsclientgenerator.domainmodels.codegeneration.Error; |
9 | 9 | import com.google.common.base.CaseFormat; |
| 10 | +import com.google.common.collect.ImmutableSet; |
10 | 11 |
|
11 | | -import java.util.ArrayList; |
12 | 12 | import java.util.Collection; |
13 | | -import java.util.Collections; |
14 | 13 | import java.util.List; |
| 14 | +import java.util.Set; |
| 15 | +import java.util.stream.Collectors; |
15 | 16 |
|
16 | 17 | public class ErrorFormatter { |
17 | 18 |
|
| 19 | + static private final Set<String> CORE_ERROR_CONSTANTS = ImmutableSet.of( |
| 20 | + "INCOMPLETE_SIGNATURE", |
| 21 | + "INTERNAL_FAILURE", |
| 22 | + "INVALID_ACTION", |
| 23 | + "INVALID_CLIENT_TOKEN_ID", |
| 24 | + "INVALID_PARAMETER_COMBINATION", |
| 25 | + "INVALID_QUERY_PARAMETER", |
| 26 | + "INVALID_PARAMETER_VALUE", |
| 27 | + "MISSING_ACTION", |
| 28 | + "MISSING_AUTHENTICATION_TOKEN", |
| 29 | + "MISSING_PARAMETER", |
| 30 | + "OPT_IN_REQUIRED", |
| 31 | + "REQUEST_EXPIRED", |
| 32 | + "SERVICE_UNAVAILABLE", |
| 33 | + "THROTTLING", |
| 34 | + "VALIDATION", |
| 35 | + "ACCESS_DENIED", |
| 36 | + "RESOURCE_NOT_FOUND", |
| 37 | + "UNRECOGNIZED_CLIENT", |
| 38 | + "MALFORMED_QUERY_STRING", |
| 39 | + "SLOW_DOWN", |
| 40 | + "REQUEST_TIME_TOO_SKEWED", |
| 41 | + "INVALID_SIGNATURE", |
| 42 | + "SIGNATURE_DOES_NOT_MATCH", |
| 43 | + "INVALID_ACCESS_KEY_ID", |
| 44 | + "REQUEST_TIMEOUT", |
| 45 | + "NETWORK_CONNECTION" |
| 46 | + ); |
| 47 | + |
18 | 48 | public List<String> formatErrorConstNames(Collection<Error> errors) { |
19 | | - List<String> formattedErrors = new ArrayList<>(); |
20 | | - for (Error error : errors) { |
21 | | - formattedErrors.add(formatErrorConstName(error.getName())); |
22 | | - } |
23 | | - Collections.sort(formattedErrors); |
24 | | - return formattedErrors; |
| 49 | + return errors.stream().map(error -> formatErrorConstName(error.getName())) |
| 50 | + .filter(name -> !CORE_ERROR_CONSTANTS.contains(name)) |
| 51 | + .sorted() |
| 52 | + .collect(Collectors.toList()); |
25 | 53 | } |
26 | 54 |
|
27 | 55 | public static String formatErrorConstName(String errorName) { |
|
0 commit comments