Merge "Added STD sim 2.0.0 tests"

[nonrtric.git] / policy-agent / src / main / java / org / oransc / policyagent / dmaap / DmaapRequestMessage.java

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapRequestMessage.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapRequestMessage.java
index fe48aec..c2d0d4c 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapRequestMessage.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapRequestMessage.java
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 Nordix Foundation
+ * Copyright (C) 2020 Nordix Foundation
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,10 @@
 
 package org.oransc.policyagent.dmaap;
 
+import com.google.gson.JsonObject;
+
+import java.util.Optional;
+
 import org.immutables.gson.Gson;
 import org.immutables.value.Value;
 
@@ -27,12 +31,10 @@ import org.immutables.value.Value;
 @Gson.TypeAdapters
 public interface DmaapRequestMessage {
 
-    public static enum Operation {
+    public enum Operation {
         PUT, GET, DELETE, POST
     }
 
-    String type();
-
     String correlationId();
 
     String target();
@@ -49,5 +51,5 @@ public interface DmaapRequestMessage {
 
     String url();
 
-    String payload();
+    Optional<JsonObject> payload();
 }