2929
3030/**
3131 * This class helps to deserialize JSON to a sub-class of {@link CommandResponse}. Hereby this class extracts the
32- * values which are common for all command responses. All remaining required values have to be extracted in
33- * {@link CommandResponseJsonDeserializer.FactoryMethodFunction#create(org.eclipse.ditto.base.model.common.HttpStatus)}.
34- * There the actual command response object is created, too.
32+ * values which are common for all command responses.
3533 */
3634public final class CommandResponseJsonDeserializer <T extends CommandResponse <?>> {
3735
38- @ Nullable private final JsonObject jsonObject ;
3936 private final String expectedCommandResponseType ;
4037 private final DeserializationFunction <T > deserializationFunction ;
4138
4239 private CommandResponseJsonDeserializer (final CharSequence type ,
43- @ Nullable final JsonObject jsonObject ,
4440 final DeserializationFunction <T > deserializationFunction ) {
4541
46- this .jsonObject = jsonObject ;
4742 expectedCommandResponseType = ConditionChecker .checkArgument (checkNotNull (type , "type" ).toString (),
4843 arg -> !arg .trim ().isEmpty (),
4944 () -> "The type must not be empty or blank." );
5045 this .deserializationFunction = deserializationFunction ;
5146 }
5247
53- /**
54- * Constructs a new {@code CommandResponseJsonDeserializer} object.
55- *
56- * @param type the type of the command response.
57- * @param jsonObject the JSON object to deserialize.
58- * @throws NullPointerException if any argument is {@code null}.
59- * @throws IllegalArgumentException if {@code type} is empty or blank.
60- * @deprecated as of 2.3.0 please use {@link #newInstance(CharSequence, DeserializationFunction)} instead.
61- */
62- @ Deprecated
63- public CommandResponseJsonDeserializer (final String type , final JsonObject jsonObject ) {
64- this (type , checkJsonObjectNotNull (jsonObject ), null );
65- }
66-
6748 private static JsonObject checkJsonObjectNotNull (@ Nullable final JsonObject jsonObject ) {
6849 return checkNotNull (jsonObject , "jsonObject" );
6950 }
7051
71- /**
72- * Constructs a new {@code CommandResponseJsonDeserializer} object.
73- *
74- * @param type the type of the target command response of deserialization.
75- * @param jsonString the JSON string to be deserialized.
76- * @throws NullPointerException if any argument is {@code null}.
77- * @throws IllegalArgumentException if {@code type} is empty or blank or if {@code jsonString} is empty.
78- * @throws org.eclipse.ditto.json.JsonParseException if {@code jsonString} does not contain a valid JSON object.
79- * @deprecated as of 2.3.0 please use {@link #newInstance(CharSequence, DeserializationFunction)} instead.
80- */
81- @ Deprecated
82- public CommandResponseJsonDeserializer (final String type , final String jsonString ) {
83- this (type , JsonObject .of (jsonString ));
84- }
85-
8652 /**
8753 * Returns a new instance of {@code CommandResponseJsonDeserializer}.
8854 *
@@ -99,33 +65,10 @@ public CommandResponseJsonDeserializer(final String type, final String jsonStrin
9965 public static <T extends CommandResponse <?>> CommandResponseJsonDeserializer <T > newInstance (final CharSequence type ,
10066 final DeserializationFunction <T > deserializationFunction ) {
10167
102- return new CommandResponseJsonDeserializer (type ,
103- null ,
68+ return new CommandResponseJsonDeserializer <>(type ,
10469 checkNotNull (deserializationFunction , "deserializationFunction" ));
10570 }
10671
107- /**
108- * Partly deserializes the JSON which was given to this object's constructor. The factory method function which is
109- * given to this method is responsible for creating the actual {@code CommandResponseType}. This method receives
110- * the partly deserialized values which can be completed by implementors if further values are required.
111- *
112- * @param factoryMethodFunction creates the actual {@code CommandResponseType} object.
113- * @return the command response.
114- * @throws NullPointerException if {@code factoryMethodFunction} is {@code null}.
115- * @throws org.eclipse.ditto.json.JsonParseException if the JSON is invalid or if the command response type
116- * differs from the expected one.
117- * @deprecated as of 2.3.0 please use {@link #deserialize(JsonObject, DittoHeaders)} instead.
118- */
119- @ Deprecated
120- public T deserialize (final FactoryMethodFunction <T > factoryMethodFunction ) {
121- final CommandResponseJsonDeserializer <T > deserializer =
122- new CommandResponseJsonDeserializer <>(expectedCommandResponseType ,
123- checkJsonObjectNotNull (jsonObject ),
124- context -> factoryMethodFunction .create (context .getDeserializedHttpStatus ()));
125-
126- return deserializer .deserialize (jsonObject , DittoHeaders .empty ());
127- }
128-
12972 /**
13073 * Deserializes the specified {@code JsonObject} argument to an instance of {@code CommandResponse}.
13174 * Any exception that is thrown during deserialization will be subsumed as cause of a {@code JsonParseException}.
@@ -177,28 +120,6 @@ private JsonParseException newJsonParseException(final Exception cause) {
177120 .build ();
178121 }
179122
180- /**
181- * Represents a function that accepts three arguments to produce a {@code CommandResponse}. The arguments were
182- * extracted from a given JSON beforehand.
183- *
184- * @param <T> the type of the result of the function.
185- * @deprecated as of 2.3.0 please use {@link DeserializationFunction} instead.
186- */
187- @ Deprecated
188- @ FunctionalInterface
189- public interface FactoryMethodFunction <T extends CommandResponse <?>> {
190-
191- /**
192- * Creates a {@code CommandResponse} with the help of the given arguments.
193- *
194- * @param httpStatus the HTTP status of the response.
195- * @return the command response.
196- * @since 2.0.0
197- */
198- T create (HttpStatus httpStatus );
199-
200- }
201-
202123 /**
203124 * Function that actually deserializes a {@code CommandResponse} from a provided {@link DeserializationContext}.
204125 *
0 commit comments