@@ -552,12 +552,9 @@ public void write(JsonWriter out, Part<?> value) throws java.io.IOException {
552552 out .name ("file" );
553553 delegateGson .toJson (filePart .file (), FileContent .class , out );
554554 } else if (value instanceof DataPart dataPart ) {
555- // DataPart: { "data": { "data": {...} } }
556- out .name ("data" );
557- out .beginObject ();
555+ // DataPart: { "data": {...} }
558556 out .name ("data" );
559557 delegateGson .toJson (dataPart .data (), Map .class , out );
560- out .endObject ();
561558 } else {
562559 throw new JsonSyntaxException ("Unknown Part subclass: " + value .getClass ().getName ());
563560 }
@@ -589,14 +586,10 @@ Part<?> read(JsonReader in) throws java.io.IOException {
589586 // FilePart: { "file": {...} }
590587 return new FilePart (delegateGson .fromJson (jsonObject .get ("file" ), FileContent .class ));
591588 } else if (jsonObject .has ("data" )) {
592- // DataPart: { "data": { "data": {...} } }
593- com .google .gson .JsonObject dataWrapper = jsonObject .getAsJsonObject ("data" );
594- if (dataWrapper == null || !dataWrapper .has ("data" )) {
595- throw new JsonSyntaxException ("DataPart wrapper must contain 'data' field" );
596- }
589+ // DataPart: { "data": {...} }
597590 @ SuppressWarnings ("unchecked" )
598591 Map <String , Object > dataMap = delegateGson .fromJson (
599- dataWrapper .get ("data" ),
592+ jsonObject .get ("data" ),
600593 new TypeToken <Map <String , Object >>(){}.getType ()
601594 );
602595 return new DataPart (dataMap );
0 commit comments