refactor: Remove message container (#120)

Author: fabriziodemaria

src/main/java/com/spotify/confidence/EventUploader.java

@@ -14,7 +14,7 @@ static Event.Builder event(
         .setPayload(
             Struct.newBuilder()
                 .putAllFields(context.asProtoMap())
-                .putFields("message", message.orElse(ConfidenceValue.Struct.EMPTY).toProto()));
+                .putAllFields(message.orElse(ConfidenceValue.Struct.EMPTY).asProtoMap()));
   }
 
   CompletableFuture<Boolean> upload(List<Event> events);

src/test/java/com/spotify/confidence/EventSenderEngineTest.java

@@ -110,17 +110,10 @@ public void testOverlappingKeysInPayload() throws InterruptedException {
             Struct.newBuilder()
                 .putAllFields(
                     Map.of(
+                        "a",
+                        Value.newBuilder().setNumberValue(0).build(),
                         "message",
-                            Value.newBuilder()
-                                .setStructValue(
-                                    Struct.newBuilder()
-                                        .putFields(
-                                            "a", Value.newBuilder().setNumberValue(0).build())
-                                        .putFields(
-                                            "message",
-                                            Value.newBuilder().setNumberValue(1).build()))
-                                .build(),
-                        "a", Value.newBuilder().setNumberValue(2).build()))
+                        Value.newBuilder().setNumberValue(1).build()))
                 .build());
   }
 
@@ -199,15 +192,7 @@ public void testEngineUploadsWhenIntermittentErrorWillRetry() throws IOException
     final Set<Value> uniqueEventIds =
         fakeUploader.uploadCalls.stream()
             .flatMap(Collection::stream)
-            .map(
-                event ->
-                    event
-                        .getPayload()
-                        .getFieldsMap()
-                        .get("message")
-                        .getStructValue()
-                        .getFieldsMap()
-                        .get("id"))
+            .map(event -> event.getPayload().getFieldsMap().get("id"))
             .collect(Collectors.toSet());
     // Verify all events reached the uploader
     assertThat(uniqueEventIds.size()).isEqualTo(numEvents);

src/test/java/com/spotify/confidence/GrpcEventUploaderTest.java

@@ -97,14 +97,7 @@ public void testMapsSingleEventBatchToProtobuf() throws ExecutionException, Inte
     assertThat(protoEvent.getEventDefinition()).isEqualTo("eventDefinitions/event1");
 
     final Map<String, com.google.protobuf.Value> fieldsMap = protoEvent.getPayload().getFieldsMap();
-    assertThat(
-            fieldsMap
-                .get("message")
-                .getStructValue()
-                .getFieldsMap()
-                .get("messageKey")
-                .getStringValue())
-        .isEqualTo("value_1");
+    assertThat(fieldsMap.get("messageKey").getStringValue()).isEqualTo("value_1");
     assertThat(fieldsMap.get("contextKey").getStringValue()).isEqualTo("value_1");
   }
 
@@ -136,14 +129,7 @@ public void testMapsMultiEventBatchToProtobuf() {
 
       final Map<String, com.google.protobuf.Value> fieldsMap =
           protoEvent.getPayload().getFieldsMap();
-      assertThat(
-              fieldsMap
-                  .get("message")
-                  .getStructValue()
-                  .getFieldsMap()
-                  .get("messageKey")
-                  .getStringValue())
-          .isEqualTo("value_m" + (i + 1));
+      assertThat(fieldsMap.get("messageKey").getStringValue()).isEqualTo("value_m" + (i + 1));
       assertThat(fieldsMap.get("contextKey").getStringValue()).isEqualTo("value_c" + (i + 1));
     }
   }