Skip to content

Commit e1b53f9

Browse files
alzimmermsftalzimmermsft
authored
Updates to azure-json APIs (Azure#30328)
Updates to azure-json APIs
1 parent 7089b8f commit e1b53f9

File tree

10 files changed

+376
-1124
lines changed

10 files changed

+376
-1124
lines changed

‎eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@
151151
</And>
152152
<And>
153153
<Class name="com.azure.json.DefaultJsonReader"/>
154-
<Method name="getBinaryValue"/>
154+
<Method name="getBinary"/>
155155
</And>
156156
<And>
157157
<Class name="com.azure.json.gson.GsonJsonReader"/>
158-
<Method name="getBinaryValue"/>
158+
<Method name="getBinary"/>
159159
</And>
160160
</Or>
161161
<Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/>

‎sdk/core/azure-json-gson/src/main/java/com/azure/json/gson/GsonJsonReader.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public JsonToken nextToken() {
9999
}
100100

101101
@Override
102-
public byte[] getBinaryValue() {
102+
public byte[] getBinary() {
103103
try {
104104
if (currentToken == JsonToken.NULL) {
105105
reader.nextNull();
@@ -113,7 +113,7 @@ public byte[] getBinaryValue() {
113113
}
114114

115115
@Override
116-
public boolean getBooleanValue() {
116+
public boolean getBoolean() {
117117
try {
118118
return reader.nextBoolean();
119119
} catch (IOException e) {
@@ -122,7 +122,7 @@ public boolean getBooleanValue() {
122122
}
123123

124124
@Override
125-
public double getDoubleValue() {
125+
public double getDouble() {
126126
try {
127127
return reader.nextDouble();
128128
} catch (IOException e) {
@@ -131,7 +131,7 @@ public double getDoubleValue() {
131131
}
132132

133133
@Override
134-
public float getFloatValue() {
134+
public float getFloat() {
135135
try {
136136
return (float) reader.nextDouble();
137137
} catch (IOException e) {
@@ -140,7 +140,7 @@ public float getFloatValue() {
140140
}
141141

142142
@Override
143-
public int getIntValue() {
143+
public int getInt() {
144144
try {
145145
return reader.nextInt();
146146
} catch (IOException e) {
@@ -149,7 +149,7 @@ public int getIntValue() {
149149
}
150150

151151
@Override
152-
public long getLongValue() {
152+
public long getLong() {
153153
try {
154154
return reader.nextLong();
155155
} catch (IOException e) {
@@ -158,7 +158,7 @@ public long getLongValue() {
158158
}
159159

160160
@Override
161-
public String getStringValue() {
161+
public String getString() {
162162
try {
163163
if (currentToken == JsonToken.NULL) {
164164
return null;
@@ -218,13 +218,13 @@ public JsonReader bufferObject() {
218218
} else {
219219
if (token == JsonToken.STRING) {
220220
// String fields need to have quotes added.
221-
bufferedObject.append("\"").append(getStringValue()).append("\"");
221+
bufferedObject.append("\"").append(getString()).append("\"");
222222
} else if (isStartArrayOrObject()) {
223223
// Structures use readChildren.
224224
readChildren(bufferedObject);
225225
} else {
226226
// All other value types use text value.
227-
bufferedObject.append(getTextValue());
227+
bufferedObject.append(getText());
228228
}
229229

230230
// Comas should happen after a field value.

‎sdk/core/azure-json-gson/src/main/java/com/azure/json/gson/GsonJsonWriter.java

Lines changed: 5 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import java.io.UncheckedIOException;
1414
import java.nio.charset.StandardCharsets;
1515
import java.util.Base64;
16+
import java.util.Objects;
1617

1718
/**
1819
* GSON-based implementation of {@link JsonWriter}.
@@ -125,6 +126,8 @@ public JsonWriter writeEndArray() {
125126

126127
@Override
127128
public JsonWriter writeFieldName(String fieldName) {
129+
Objects.requireNonNull(fieldName, "'fieldName' cannot be null.");
130+
128131
context.validateToken(JsonToken.FIELD_NAME);
129132

130133
try {
@@ -251,6 +254,8 @@ public JsonWriter writeString(String value) {
251254

252255
@Override
253256
public JsonWriter writeRawValue(String value) {
257+
Objects.requireNonNull(value, "'value' cannot be null.");
258+
254259
context.validateToken(JsonToken.STRING);
255260

256261
try {
@@ -263,124 +268,6 @@ public JsonWriter writeRawValue(String value) {
263268
return this;
264269
}
265270

266-
@Override
267-
public JsonWriter writeBinaryField(String fieldName, byte[] value) {
268-
context.validateToken(JsonToken.FIELD_NAME);
269-
270-
try {
271-
writer.name(fieldName);
272-
writeBinaryInternal(value);
273-
} catch (IOException e) {
274-
throw new UncheckedIOException(e);
275-
}
276-
277-
return this;
278-
}
279-
280-
@Override
281-
public JsonWriter writeBooleanField(String fieldName, boolean value) {
282-
context.validateToken(JsonToken.FIELD_NAME);
283-
284-
try {
285-
writer.name(fieldName).value(value);
286-
} catch (IOException e) {
287-
throw new UncheckedIOException(e);
288-
}
289-
290-
return this;
291-
}
292-
293-
@Override
294-
public JsonWriter writeDoubleField(String fieldName, double value) {
295-
context.validateToken(JsonToken.FIELD_NAME);
296-
297-
try {
298-
writer.name(fieldName).value(value);
299-
} catch (IOException e) {
300-
throw new UncheckedIOException(e);
301-
}
302-
303-
return this;
304-
}
305-
306-
@Override
307-
public JsonWriter writeFloatField(String fieldName, float value) {
308-
context.validateToken(JsonToken.FIELD_NAME);
309-
310-
try {
311-
writer.name(fieldName).value(value);
312-
} catch (IOException e) {
313-
throw new UncheckedIOException(e);
314-
}
315-
316-
return this;
317-
}
318-
319-
@Override
320-
public JsonWriter writeIntField(String fieldName, int value) {
321-
context.validateToken(JsonToken.FIELD_NAME);
322-
323-
try {
324-
writer.name(fieldName).value(value);
325-
} catch (IOException e) {
326-
throw new UncheckedIOException(e);
327-
}
328-
329-
return this;
330-
}
331-
332-
@Override
333-
public JsonWriter writeLongField(String fieldName, long value) {
334-
context.validateToken(JsonToken.FIELD_NAME);
335-
336-
try {
337-
writer.name(fieldName).value(value);
338-
} catch (IOException e) {
339-
throw new UncheckedIOException(e);
340-
}
341-
342-
return this;
343-
}
344-
345-
@Override
346-
public JsonWriter writeNullField(String fieldName) {
347-
context.validateToken(JsonToken.FIELD_NAME);
348-
349-
try {
350-
writer.name(fieldName).nullValue();
351-
} catch (IOException e) {
352-
throw new UncheckedIOException(e);
353-
}
354-
355-
return this;
356-
}
357-
358-
@Override
359-
public JsonWriter writeStringField(String fieldName, String value) {
360-
context.validateToken(JsonToken.FIELD_NAME);
361-
362-
try {
363-
writer.name(fieldName).value(value);
364-
} catch (IOException e) {
365-
throw new UncheckedIOException(e);
366-
}
367-
368-
return this;
369-
}
370-
371-
@Override
372-
public JsonWriter writeRawField(String fieldName, String value) {
373-
context.validateToken(JsonToken.FIELD_NAME);
374-
375-
try {
376-
writer.name(fieldName).jsonValue(value);
377-
} catch (IOException e) {
378-
throw new UncheckedIOException(e);
379-
}
380-
381-
return this;
382-
}
383-
384271
private void writeBinaryInternal(byte[] value) throws IOException {
385272
if (value == null) {
386273
writer.nullValue();

‎sdk/core/azure-json/src/main/java/com/azure/json/DefaultJsonReader.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public JsonToken nextToken() {
9090
}
9191

9292
@Override
93-
public byte[] getBinaryValue() {
93+
public byte[] getBinary() {
9494
if (currentToken() == JsonToken.NULL) {
9595
return null;
9696
} else {
@@ -103,7 +103,7 @@ public byte[] getBinaryValue() {
103103
}
104104

105105
@Override
106-
public boolean getBooleanValue() {
106+
public boolean getBoolean() {
107107
try {
108108
return parser.getBooleanValue();
109109
} catch (IOException e) {
@@ -112,7 +112,7 @@ public boolean getBooleanValue() {
112112
}
113113

114114
@Override
115-
public double getDoubleValue() {
115+
public double getDouble() {
116116
try {
117117
return parser.getDoubleValue();
118118
} catch (IOException e) {
@@ -121,7 +121,7 @@ public double getDoubleValue() {
121121
}
122122

123123
@Override
124-
public float getFloatValue() {
124+
public float getFloat() {
125125
try {
126126
return parser.getFloatValue();
127127
} catch (IOException e) {
@@ -130,7 +130,7 @@ public float getFloatValue() {
130130
}
131131

132132
@Override
133-
public int getIntValue() {
133+
public int getInt() {
134134
try {
135135
return parser.getIntValue();
136136
} catch (IOException e) {
@@ -139,7 +139,7 @@ public int getIntValue() {
139139
}
140140

141141
@Override
142-
public long getLongValue() {
142+
public long getLong() {
143143
try {
144144
return parser.getLongValue();
145145
} catch (IOException e) {
@@ -148,7 +148,7 @@ public long getLongValue() {
148148
}
149149

150150
@Override
151-
public String getStringValue() {
151+
public String getString() {
152152
try {
153153
return parser.getValueAsString();
154154
} catch (IOException e) {
@@ -204,13 +204,13 @@ public JsonReader bufferObject() {
204204
} else {
205205
if (token == JsonToken.STRING) {
206206
// String fields need to have quotes added.
207-
bufferedObject.append("\"").append(getStringValue()).append("\"");
207+
bufferedObject.append("\"").append(getString()).append("\"");
208208
} else if (isStartArrayOrObject()) {
209209
// Structures use readChildren.
210210
readChildren(bufferedObject);
211211
} else {
212212
// All other value types use text value.
213-
bufferedObject.append(getTextValue());
213+
bufferedObject.append(getText());
214214
}
215215

216216
// Comas should happen after a field value.

0 commit comments

Comments
 (0)