Skip to content

Commit 33037e1

Browse files
committed
Fix checkstyle
1 parent 121be88 commit 33037e1

File tree

2 files changed

+49
-16
lines changed

2 files changed

+49
-16
lines changed

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/DefaultEnhancedDocument.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
import static java.util.Collections.unmodifiableList;
1919
import static java.util.Collections.unmodifiableMap;
20-
import static software.amazon.awssdk.enhanced.dynamodb.internal.document.JsonStringFormatHelper.addEscapeCharacters;
21-
import static software.amazon.awssdk.enhanced.dynamodb.internal.document.JsonStringFormatHelper.stringValue;
2220

2321
import java.util.ArrayList;
2422
import java.util.Arrays;

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/StrategyJsonSerializer.java

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
116
package software.amazon.awssdk.enhanced.dynamodb.internal.document;
217

318
import java.nio.charset.StandardCharsets;
419
import java.util.Map;
520
import software.amazon.awssdk.annotations.SdkInternalApi;
621
import software.amazon.awssdk.core.SdkBytes;
722
import software.amazon.awssdk.protocols.json.SdkJsonGenerator;
8-
import software.amazon.awssdk.thirdparty.jackson.core.JsonFactory;
923
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
24+
import software.amazon.awssdk.thirdparty.jackson.core.JsonFactory;
1025

1126
@SdkInternalApi
1227
public final class StrategyJsonSerializer {
13-
private static final JsonFactory jsonFactory = new JsonFactory();
28+
private static final JsonFactory JSON_FACTORY = new JsonFactory();
1429

1530
private StrategyJsonSerializer() {
1631
}
@@ -29,7 +44,7 @@ private enum JsonSerializationStrategy {
2944
}
3045

3146
public static String serializeAttributeValueMap(Map<String, AttributeValue> map) {
32-
SdkJsonGenerator jsonGen = new SdkJsonGenerator(jsonFactory, "application/json"); // re-use factory
47+
SdkJsonGenerator jsonGen = new SdkJsonGenerator(JSON_FACTORY, "application/json");
3348

3449
jsonGen.writeStartObject();
3550
map.forEach((key, value) -> {
@@ -42,7 +57,7 @@ public static String serializeAttributeValueMap(Map<String, AttributeValue> map)
4257
}
4358

4459
public static String serializeSingleAttributeValue(AttributeValue av) {
45-
SdkJsonGenerator jsonGen = new SdkJsonGenerator(jsonFactory, "application/json"); // re-use factory
60+
SdkJsonGenerator jsonGen = new SdkJsonGenerator(JSON_FACTORY, "application/json");
4661
serializeAttributeValue(jsonGen, av);
4762
return new String(jsonGen.getBytes(), StandardCharsets.UTF_8);
4863
}
@@ -108,16 +123,36 @@ public static void serializeAttributeValue(SdkJsonGenerator generator, Attribute
108123
}
109124

110125
private static JsonSerializationStrategy getStrategy(AttributeValue av) {
111-
if (av.nul() != null && av.nul()) return JsonSerializationStrategy.NULL;
112-
if (av.s() != null) return JsonSerializationStrategy.STRING;
113-
if (av.n() != null) return JsonSerializationStrategy.NUMBER;
114-
if (av.bool() != null) return JsonSerializationStrategy.BOOLEAN;
115-
if (av.b() != null) return JsonSerializationStrategy.BYTES;
116-
if (av.hasL()) return JsonSerializationStrategy.LIST;
117-
if (av.hasM()) return JsonSerializationStrategy.MAP;
118-
if (av.hasSs()) return JsonSerializationStrategy.STRING_SET;
119-
if (av.hasNs()) return JsonSerializationStrategy.NUMBER_SET;
120-
if (av.hasBs()) return JsonSerializationStrategy.BYTES_SET;
126+
if (av.nul() != null && av.nul()) {
127+
return JsonSerializationStrategy.NULL;
128+
}
129+
if (av.s() != null) {
130+
return JsonSerializationStrategy.STRING;
131+
}
132+
if (av.n() != null) {
133+
return JsonSerializationStrategy.NUMBER;
134+
}
135+
if (av.bool() != null) {
136+
return JsonSerializationStrategy.BOOLEAN;
137+
}
138+
if (av.b() != null) {
139+
return JsonSerializationStrategy.BYTES;
140+
}
141+
if (av.hasL()) {
142+
return JsonSerializationStrategy.LIST;
143+
}
144+
if (av.hasM()) {
145+
return JsonSerializationStrategy.MAP;
146+
}
147+
if (av.hasSs()) {
148+
return JsonSerializationStrategy.STRING_SET;
149+
}
150+
if (av.hasNs()) {
151+
return JsonSerializationStrategy.NUMBER_SET;
152+
}
153+
if (av.hasBs()) {
154+
return JsonSerializationStrategy.BYTES_SET;
155+
}
121156
throw new IllegalStateException("Unknown AttributeValue type: " + av);
122157
}
123158
}

0 commit comments

Comments
 (0)