just pass all possible values to CreateThing.of and let the validatio…

…n happen Signed-off-by: Klem Yannic (INST/ECS1) <Yannic.Klem@bosch-si.com>
eclipse-ditto · Oct 22, 2018 · 98526a4 · 98526a4
1 parent a53896c
commit 98526a4
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/...src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/things/ThingsRoute.java b/...src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/things/ThingsRoute.java
@@ -148,24 +148,16 @@ private Route things(final RequestContext ctx, final DittoHeaders dittoHeaders)
                         post(() -> // POST /things
                                 extractDataBytes(payloadSource ->
                                         handlePerRequest(ctx, dittoHeaders, payloadSource,
-                                                thingJson -> fromThingJson(thingJson, dittoHeaders)
+                                                thingJson -> CreateThing.of(createThingForPost(thingJson),
+                                                        createInlinePolicyJson(thingJson), getCopyPolicyFrom(thingJson),
+                                                        dittoHeaders)
                                         )
                                 )
                         )
                 )
         );
     }
 
-    private CreateThing fromThingJson(final String thingJson, final DittoHeaders dittoHeaders) {
-        final String policyIdOrPlaceholder = getCopyPolicyFrom(thingJson);
-        if (policyIdOrPlaceholder == null) {
-            return CreateThing.of(createThingForPost(thingJson), createInlinePolicyJson(thingJson), dittoHeaders);
-        } else {
-            return CreateThing.withCopiedPolicy(createThingForPost(thingJson), policyIdOrPlaceholder, dittoHeaders);
-        }
-    }
-
-
     private Route buildRetrieveThingsRoute(final RequestContext ctx, final DittoHeaders dittoHeaders) {
         return parameter(ThingsParameter.IDS.toString(), idsString ->
                 parameterOptional(ThingsParameter.FIELDS.toString(), fieldsString ->