X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fdmaap%2FDmaapRequestMessage.java;fp=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fmodel%2FDmaapRequestMessage.java;h=fe48aec2fc26e81f462cb2d32fedecf4260c0418;hb=0b2f51f6215dad3fc93d74572ad23f950ad8ae98;hp=0648940d4e7327c02893b1fd8d7b136064c9e83a;hpb=3482ea81c8189d5cfacf4005e1c92673304e11b3;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/model/DmaapRequestMessage.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapRequestMessage.java
similarity index 59%
rename from policy-agent/src/main/java/org/oransc/policyagent/model/DmaapRequestMessage.java
rename to policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapRequestMessage.java
index 0648940d..fe48aec2 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/model/DmaapRequestMessage.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapRequestMessage.java
@@ -18,29 +18,36 @@
  * ========================LICENSE_END===================================
  */
 
-package org.oransc.policyagent.model;
-
-import java.sql.Timestamp;
-import javax.validation.constraints.NotNull;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class DmaapRequestMessage {
-
-    @NotNull
-    private String type;
-    @NotNull
-    private String correlationId;
-    @NotNull
-    private String target;
-    private Timestamp timestamp;
-    private String apiVersion;
-    @NotNull
-    private String originatorId;
-    private String requestId;
-    @NotNull
-    private String operation;
-    private String payload;
+package org.oransc.policyagent.dmaap;
+
+import org.immutables.gson.Gson;
+import org.immutables.value.Value;
+
+@Value.Immutable
+@Gson.TypeAdapters
+public interface DmaapRequestMessage {
+
+    public static enum Operation {
+        PUT, GET, DELETE, POST
+    }
+
+    String type();
+
+    String correlationId();
+
+    String target();
+
+    String timestamp();
+
+    String apiVersion();
+
+    String originatorId();
+
+    String requestId();
+
+    Operation operation();
+
+    String url();
+
+    String payload();
 }