1 files changed, 43 insertions, 7 deletions

diff --git a/language-web/src/main/java/tools/refinery/language/web/xtext/XtextWebSocketRequest.java b/language-web/src/main/java/tools/refinery/language/web/xtext/XtextWebSocketRequest.java
index e34bf73a..8aee70a1 100644
--- a/language-web/src/main/java/tools/refinery/language/web/xtext/XtextWebSocketRequest.java
+++ b/language-web/src/main/java/tools/refinery/language/web/xtext/XtextWebSocketRequest.java
@@ -1,5 +1,6 @@
 package tools.refinery.language.web.xtext;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -8,8 +9,15 @@ import com.google.gson.annotations.SerializedName;
 public class XtextWebSocketRequest {
         private String id;
 
+        @SerializedName("resource")
+        private String resourceName;
+
+        private String contentType;
+
+        private String requiredStateId;
+
         @SerializedName("request")
-        private Map<String, String> requestData;
+        private List<Map<String, String>> requestData;
 
         public String getId() {
                 return id;
@@ -19,17 +27,41 @@ public class XtextWebSocketRequest {
                 this.id = id;
         }
 
-        public Map<String, String> getRequestData() {
+        public String getResourceName() {
+                return resourceName;
+        }
+
+        public void setResourceName(String resourceName) {
+                this.resourceName = resourceName;
+        }
+
+        public String getContentType() {
+                return contentType;
+        }
+
+        public void setContentType(String contentType) {
+                this.contentType = contentType;
+        }
+
+        public String getRequiredStateId() {
+                return requiredStateId;
+        }
+
+        public void setRequiredStateId(String requiredStateId) {
+                this.requiredStateId = requiredStateId;
+        }
+
+        public List<Map<String, String>> getRequestData() {
                 return requestData;
         }
 
-        public void setRequestData(Map<String, String> request) {
-                this.requestData = request;
+        public void setRequestData(List<Map<String, String>> requestData) {
+                this.requestData = requestData;
         }
 
         @Override
         public int hashCode() {
-                return Objects.hash(id, requestData);
+                return Objects.hash(contentType, id, requestData, requiredStateId, resourceName);
         }
 
         @Override
@@ -41,11 +73,15 @@ public class XtextWebSocketRequest {
                 if (getClass() != obj.getClass())
                         return false;
                 XtextWebSocketRequest other = (XtextWebSocketRequest) obj;
-                return Objects.equals(id, other.id) && Objects.equals(requestData, other.requestData);
+                return Objects.equals(contentType, other.contentType) && Objects.equals(id, other.id)
+                                && Objects.equals(requestData, other.requestData)
+                                && Objects.equals(requiredStateId, other.requiredStateId)
+                                && Objects.equals(resourceName, other.resourceName);
         }
 
         @Override
         public String toString() {
-                return "XtextWebSocketRequest [id=" + id + ", requestData=" + requestData + "]";
+                return "XtextWebSocketRequest [id=" + id + ", resourceName=" + resourceName + ", contentType=" + contentType
+                                + ", requiredStateId=" + requiredStateId + ", requestData=" + requestData + "]";
         }
 }