Changeset 10 for party/src

Timestamp:

01/28/20 10:19:54 (5 years ago)

Author:

bart

Message:

Update 28 jan 2020

Location:

party/src

Files:

• main/java/geniusweb/party/Capabilities.java (modified) (6 diffs)
• main/java/geniusweb/party/inform/Inform.java (modified) (1 diff)
• test/java/geniusweb/party/CapabilitiesTest.java (modified) (4 diffs)

party/src/main/java/geniusweb/party/Capabilities.java

@@ -5 +5 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-
-import geniusweb.references.ProtocolRef;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -19 +16 @@
          * List of supported protocols
          */
-        private final Set<ProtocolRef> protocols;
+        private final Set<String> behaviours;
 
         /**
@@ -26 +23 @@
          */
         @JsonCreator
-        public Capabilities(@JsonProperty("protocols") Set<ProtocolRef> protocols) {
-                if (protocols == null) {
-                        throw new IllegalArgumentException("protocols==null");
+        public Capabilities(@JsonProperty("behaviours") Set<String> behaviours) {
+                if (behaviours == null) {
+                        throw new IllegalArgumentException("behaviours==null");
                 }
-                this.protocols = protocols;
+                this.behaviours = behaviours;
         }
 
-        public Set<ProtocolRef> getProtocols() {
-                return protocols;
+        public Set<String> getBehaviours() {
+                return behaviours;
         }
 
@@ -42 +39 @@
                 int result = 1;
                 result = prime * result
-                                + ((protocols == null) ? 0 : protocols.hashCode());
+                                + ((behaviours == null) ? 0 : behaviours.hashCode());
                 return result;
         }
@@ -55 +52 @@
                         return false;
                 Capabilities other = (Capabilities) obj;
-                if (protocols == null) {
-                        if (other.protocols != null)
+                if (behaviours == null) {
+                        if (other.behaviours != null)
                                 return false;
-                } else if (!protocols.equals(other.protocols))
+                } else if (!behaviours.equals(other.behaviours))
                         return false;
                 return true;
@@ -65 +62 @@
         @Override
         public String toString() {
-                return "Capabilities[" + "Protocols=" + protocols + "]";
+                return "Capabilities[" + "Behaviours=" + behaviours + "]";
         }
 

party/src/main/java/geniusweb/party/inform/Inform.java

@@ -3 +3 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import geniusweb.party.Party;
-
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 /**

party/src/test/java/geniusweb/party/CapabilitiesTest.java

@@ -4 +4 @@
 
 import java.io.IOException;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
@@ -18 +17 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import geniusweb.party.Capabilities;
-import geniusweb.references.ProtocolRef;
 import tudelft.utilities.junit.GeneralTests;
 
@@ -26 +23 @@
         private Capabilities capabilities1, capabilities1a, capabilities2,
                         capabilities3;
-        private String asJson = "{\"protocols\":[\"ws:localhost/protocol1\"]}";
+        private String asJson = "{\"behaviours\":[\"SAOP\"]}";
 
         @Before
         public void before() throws URISyntaxException {
-                capabilities1 = new Capabilities(Sets
-                                .newSet(new ProtocolRef(new URI("ws:localhost/protocol1"))));
-                capabilities1a = new Capabilities(Sets
-                                .newSet(new ProtocolRef(new URI("ws:localhost/protocol1"))));
-                capabilities2 = new Capabilities(Sets
-                                .newSet(new ProtocolRef(new URI("ws:localhost/protocol2"))));
-                capabilities3 = new Capabilities(Sets
-                                .newSet(new ProtocolRef(new URI("ws:localhost/protocol3"))));
+                capabilities1 = new Capabilities(Sets.newSet("SAOP"));
+                capabilities1a = new Capabilities(Sets.newSet("SAOP"));
+                capabilities2 = new Capabilities(Sets.newSet("SEB"));
+                capabilities3 = new Capabilities(Sets.newSet("SEB", "SAOP"));
         }
 
@@ -48 +41 @@
         @Override
         public List<String> getGeneralTestStrings() {
-                return Arrays.asList(
-                                "Capabilities.*Protocols=.*ProtocolRef.*protocol1.*",
-                                "Capabilities.*Protocols=.*ProtocolRef.*protocol2.*",
-                                "Capabilities.*Protocols=.*ProtocolRef.*protocol3.*");
+                return Arrays.asList("Capabilities.*Behaviours=.*SAOP.*",
+                                "Capabilities.*Behaviours=.*SEB.*",
+                                "Capabilities.*Behaviours=.*SEB.*SAOP.*");
         }