Changeset 8 for src

Timestamp:

11/28/19 14:41:10 (5 years ago)

Author:

bart

Message:

Release 1.1.0

Location:

src

Files:

• main/java/geniusweb/partiesserver/RunParty.java (modified) (1 diff)
• main/java/geniusweb/partiesserver/SimpleSecurityManager.java (added)
• main/java/geniusweb/partiesserver/repository/AvailablePartiesRepo.java (modified) (3 diffs)
• main/java/geniusweb/partiesserver/repository/RunningPartiesRepo.java (modified) (3 diffs)
• main/java/geniusweb/partiesserver/repository/RunningParty.java (modified) (6 diffs)
• main/java/geniusweb/partiesserver/websocket/PartySocket.java (modified) (7 diffs)
• main/webapp/partiesrepo/boulware-1.1.0.jar (added)
• main/webapp/partiesrepo/conceder-1.1.0.jar (added)
• main/webapp/partiesrepo/hardliner-1.1.0.jar (added)
• main/webapp/partiesrepo/linear-1.1.0.jar (added)
• main/webapp/partiesrepo/randomparty-1.1.0.jar (added)
• main/webapp/partiesrepo/randompyparty-1.1.0.jar (added)
• main/webapp/partiesrepo/timedependentparty-1.1.0.jar (added)
• test/java/geniusweb/partiesserver/AvailablePartiesUpdaterTest.java (modified) (4 diffs)
• test/java/geniusweb/partiesserver/JavaClientTest.java (modified) (3 diffs)
• test/java/geniusweb/partiesserver/repository/RunningPartyTest.java (modified) (5 diffs)
• test/java/geniusweb/partiesserver/websocket/PartySocketTest.java (modified) (2 diffs)

src/main/java/geniusweb/partiesserver/RunParty.java

@@ -60 +60 @@
                 String name = request.getPathInfo().substring(1);
                 log.log(Level.INFO, "request to run " + name);
-
+                System.setSecurityManager(new SimpleSecurityManager());
                 AvailableParty party = AvailablePartiesRepo.instance().get(name);
                 if (party == null) {

src/main/java/geniusweb/partiesserver/repository/AvailablePartiesRepo.java

@@ -12 +12 @@
  * Stores all currently available parties that can be run.
  */
-public class AvailablePartiesRepo extends DefaultListenable<String> implements Repository<String, AvailableParty> {
+public class AvailablePartiesRepo extends DefaultListenable<String>
+                implements Repository<String, AvailableParty> {
         private static final AvailablePartiesRepo instance = new AvailablePartiesRepo();
 
@@ -37 +38 @@
         public void put(AvailableParty entity) {
                 availableParties.put(entity.getID(), entity);
-                notifyChange(entity.getID());
+                notifyListeners(entity.getID());
         }
 
@@ -43 +44 @@
         public void remove(String id) {
                 availableParties.remove(id);
-                notifyChange(id);
+                notifyListeners(id);
         }
 

src/main/java/geniusweb/partiesserver/repository/RunningPartiesRepo.java

@@ -74 +74 @@
                         runningParties.put(id, newParty);
                 }
-                notifyChange(id);
+                notifyListeners(id);
         }
 
@@ -87 +87 @@
                         runningParties.put(id, newParty);
                 }
-                notifyChange(id);
+                notifyListeners(id);
 
         }
@@ -125 +125 @@
                         }
                 }
-                notifyChange(id);
+                notifyListeners(id);
         }
 

src/main/java/geniusweb/partiesserver/repository/RunningParty.java

@@ -9 +9 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 
-import geniusweb.actions.Action;
 import geniusweb.actions.PartyId;
 import geniusweb.connection.DefaultConnection;
 import geniusweb.partiesserver.RunningPartiesUpdater;
+import geniusweb.partiesserver.websocket.PartySocket;
 import geniusweb.party.Party;
 import geniusweb.party.inform.Inform;
@@ -40 +40 @@
          * set when someone contacts our socket. null if not set.
          */
-        private final transient DefaultConnection<Inform, Action> connection;
+        private final transient PartySocket connection;
 
         /**
@@ -58 +58 @@
          */
         protected RunningParty(Party party, PartyId id, String name, Date start,
-                        Date end, DefaultConnection conn) {
+                        Date end, PartySocket conn) {
                 if (party == null || id == null || name == null || start == null
                                 || end == null) {
@@ -101 +101 @@
          * @param name         The name, this should match the filename in the repo
          *                     (without the .jar).
-         * @param maxRunTimeMS the maximum runtime for this party (ms). The {@link RunningPartiesUpdater} 
-         * will keep an eye on the time and handle removal after time is up.
+         * @param maxRunTimeMS the maximum runtime for this party (ms). The
+         *                     {@link RunningPartiesUpdater} will keep an eye on the
+         *                     time and handle removal after time is up.
          * 
          */
@@ -212 +213 @@
          */
         public void inform(Inform info) {
-                connection.notifyChange(info);
+                connection.notifyListeners(info);
         }
 
@@ -223 +224 @@
          * @throws IllegalStateException if the party is already connected.
          */
-        public RunningParty withConnection(
-                        DefaultConnection<Inform, Action> newconn) {
+        public RunningParty withConnection(PartySocket newconn) {
                 if (newconn == null)
                         throw new NullPointerException("newconn must be not null");

src/main/java/geniusweb/partiesserver/websocket/PartySocket.java

@@ -5 +5 @@
 import java.net.URI;
 import java.util.Date;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.logging.Level;
 
@@ -23 +25 @@
 import geniusweb.actions.Action;
 import geniusweb.actions.PartyId;
-import geniusweb.connection.DefaultConnection;
+import geniusweb.connection.ConnectionEnd;
 import geniusweb.partiesserver.repository.RunningPartiesRepo;
 import geniusweb.partiesserver.repository.RunningParty;
 import geniusweb.party.Party;
-import geniusweb.party.inform.Finished;
 import geniusweb.party.inform.Inform;
 import geniusweb.party.inform.Settings;
@@ -41 +42 @@
  */
 @ServerEndpoint("/party/{party}")
-public class PartySocket extends DefaultConnection<Inform, Action> {
+public class PartySocket implements ConnectionEnd<Inform, Action> {
         private final static ObjectMapper jackson = new ObjectMapper();
         private final Reporter log;
         private final RunningPartiesRepo runningparties;
+        private final List<Listener<Inform>> listeners = new CopyOnWriteArrayList<Listener<Inform>>();
 
         // should all be final, except that we can only set them when start is
@@ -86 +88 @@
                                                 runningparties.removeListener(this);
                                                 session.close(new CloseReason(CloseCodes.GOING_AWAY,
-                                                                "party died"));
+                                                                "detected that party vanished"));
                                         } catch (IOException e) {
                                                 log.log(Level.WARNING,
@@ -131 +133 @@
                                 party.inform(info);
                         } catch (Throwable e) {
-                                // simple sandbox
-                                log.log(Level.WARNING, "Party failed on inform:", e);
+                                log.log(Level.WARNING, "Party failed on inform.", e);
+                                // we don't use jackson.writeValueAsString(e) here because
+                                // CloseReason has 123 char limit.
+                                // The error will be too large to fit and will be truncated
+                                // therefore we send a plain string and hope that enough
+                                // will arrive at the other side (the protocol)
+                                session.close(new CloseReason(
+                                                CloseReason.CloseCodes.CLOSED_ABNORMALLY,
+                                                "party threw exception: " + collectReasons(e)));
                         }
-                } // else dead but that's handled in the listener above
+                } // else party is dead but that's handled in the listener above
+        }
+
+        /**
+         * 
+         * @param e an exception
+         * @return collect all reasons and sub-reasons
+         */
+        private String collectReasons(Throwable e) {
+                String reason = "";
+                do {
+                        reason = reason + " : " + e.getClass().getSimpleName() + ":"
+                                        + e.getMessage();
+                        e = e.getCause();
+                } while (e != null);
+                return reason;
         }
 
@@ -145 +169 @@
          */
         private void sniff(Inform info, RunningParty party) throws IOException {
-                if (info instanceof Finished) {
-                        session.close(new CloseReason(CloseCodes.GOING_AWAY,
-                                        "session reached agreement"));
-                } else if (info instanceof Settings) {
+                // do NOT sniff Finished messages and close sockets. Parties and their
+                // sockets need to stay running till all messages are handled
+                if (info instanceof Settings) {
                         Date end = ((Settings) info).getProgress().getTerminationTime();
                         runningparties.replace(party.withEndTime(end));
@@ -209 +232 @@
         }
 
+        @Override
+        public void addListener(Listener<Inform> l) {
+                listeners.add(l);
+        }
+
+        @Override
+        public void removeListener(Listener<Inform> l) {
+                listeners.remove(l);
+        }
+
+        /**
+         * This should only be called by the owner of the listenable, not by
+         * listeners or others. Avoid calling this from synchronized blocks as a
+         * notified listener might immediately make more calls to you.
+         * <p>
+         * Any listeners that throw an exception will be intercepted and their
+         * stacktrace is printed.
+         * 
+         * @param data information about the change.
+         */
+        public void notifyListeners(Inform data) {
+                for (Listener<Inform> l : listeners) {
+                        l.notifyChange(data);
+                }
+        }
+
 }

src/test/java/geniusweb/partiesserver/AvailablePartiesUpdaterTest.java

@@ -31 +31 @@
 
 public class AvailablePartiesUpdaterTest {
+        private static final String RANDOMPARTY = "target/jars/randomparty-1.1.0.jar";
         private static final int TESTRATE = 200; // check file changes every 200ms
         @SuppressWarnings("unchecked")
@@ -146 +147 @@
         public void randomPartyJarTest() throws IOException, InterruptedException {
                 init();
-                Files.copy(Paths.get("target/jars/randomparty-1.0.0.jar"),
-                                tmpdir.resolve(RNDPARTY));
+                Files.copy(Paths.get(RANDOMPARTY), tmpdir.resolve(RNDPARTY));
 
                 Thread.sleep(2 * TESTRATE);
@@ -157 +157 @@
         public void removeJarTest() throws IOException, InterruptedException {
                 init();
-                Files.copy(Paths.get("target/jars/randomparty-1.0.0.jar"), RNDPARTY);
+                Files.copy(Paths.get(RANDOMPARTY), RNDPARTY);
                 Thread.sleep(2 * TESTRATE);
                 assertEquals(1, repo.list().size());
@@ -169 +169 @@
         public void removeRootTest() throws IOException, InterruptedException {
                 init();
-                Files.copy(Paths.get("target/jars/randomparty-1.0.0.jar"), RNDPARTY);
+                Files.copy(Paths.get(RANDOMPARTY), RNDPARTY);
                 Thread.sleep(2 * TESTRATE);
                 assertEquals(1, repo.list().size());

src/test/java/geniusweb/partiesserver/JavaClientTest.java

@@ -39 +39 @@
  */
 public class JavaClientTest {
-//      private static final String JSON = "{\"jobs\":[\"jobs1\"]}";
+        private static final String RANDOMPARTY = "http://localhost:8080/partiesserver/run/randomparty-1.1.0";
+        // private static final String JSON = "{\"jobs\":[\"jobs1\"]}";
 //      private static final String JOBS1PROFILE = "{\"LinearAdditiveUtilitySpace\":{\"issueUtilities\":{\"lease car\":{\"discreteutils\":{\"valueUtilities\":{\"no\":0,\"yes\":1}}},\"permanent contract\":{\"discreteutils\":{\"valueUtilities\":{\"no\":0,\"yes\":1}}},\"career development opportunities\":{\"discreteutils\":{\"valueUtilities\":{\"high\":1,\"low\":0,\"medium\":0.5}}},\"fte\":{\"discreteutils\":{\"valueUtilities\":{\"1.0\":0.75,\"0.6\":0.25,\"0.8\":0.5}}},\"salary\":{\"discreteutils\":{\"valueUtilities\":{\"4000\":1.0,\"2500\":0.25,\"3500\":0.75,\"2000\":0,\"3000\":0.3}}},\"work from home\":{\"discreteutils\":{\"valueUtilities\":{\"1\":0.5,\"2\":0.666666666666,\"0\":0.333333333}}}},\"issueWeights\":{\"lease car\":0.06,\"permanent contract\":0.16,\"career development opportunities\":0.04,\"fte\":0.32,\"salary\":0.24,\"work from home\":0.18},\"domain\":{\"name\":\"jobs\",\"issuesValues\":{\"lease car\":{\"values\":[\"yes\",\"no\"]},\"permanent contract\":{\"values\":[\"yes\",\"no\"]},\"career development opportunities\":{\"values\":[\"low\",\"medium\",\"high\"]},\"fte\":{\"values\":[\"0.6\",\"0.8\",\"1.0\"]},\"salary\":{\"values\":[\"2000\",\"2500\",\"3000\",\"3500\",\"4000\"]},\"work from home\":{\"values\":[\"0\",\"1\",\"2\"]}}},\"name\":\"jobs1\"}}";
         private EmbeddedTomcat tomcat = new EmbeddedTomcat();
@@ -60 +61 @@
         public void after() throws Throwable {
                 Thread.sleep(2000);
+                System.setSecurityManager(null);
                 tomcat.stop();
         }
@@ -157 +159 @@
          */
         private String startParty() throws IOException, InterruptedException {
-                URL url = new URL(
-                                "http://localhost:8080/partiesserver/run/randomparty-1.0.0");
+                URL url = new URL(RANDOMPARTY);
                 HttpURLConnection conn = (HttpURLConnection) url.openConnection();
                 conn.setRequestMethod("GET");

src/test/java/geniusweb/partiesserver/repository/RunningPartyTest.java

@@ -16 +16 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import geniusweb.actions.Action;
 import geniusweb.actions.PartyId;
-import geniusweb.connection.DefaultConnection;
-import geniusweb.partiesserver.repository.AvailableParty;
-import geniusweb.partiesserver.repository.RunningParty;
+import geniusweb.partiesserver.websocket.PartySocket;
 import geniusweb.party.Capabilities;
 import geniusweb.party.DefaultParty;
@@ -90 +87 @@
                 RunningParty rparty = new RunningParty(party1, id1, "name1", now, end,
                                 null);
-                DefaultConnection<Inform, Action> connection = mock(
-                                DefaultConnection.class);
+                PartySocket connection = mock(PartySocket.class);
                 rparty = rparty.withConnection(connection);
         }
@@ -99 +95 @@
                 RunningParty rparty = new RunningParty(party1, id1, "name1", now, end,
                                 null);
-                DefaultConnection<Inform, Action> connection = mock(
-                                DefaultConnection.class);
+                PartySocket connection = mock(PartySocket.class);
                 rparty = rparty.withConnection(connection);
                 rparty = rparty.withConnection(connection);
@@ -112 +107 @@
                 RunningParty rparty = new RunningParty(party1, id1, "name1", now, end,
                                 null);
-                DefaultConnection<Inform, Action> connection = mock(
-                                DefaultConnection.class);
+                PartySocket connection = mock(PartySocket.class);
                 rparty = rparty.withConnection(connection);
 
@@ -120 +114 @@
 
                 ArgumentCaptor<Inform> argument = ArgumentCaptor.forClass(Inform.class);
-                verify(connection, times(1)).notifyChange(argument.capture());
+                verify(connection, times(1)).notifyListeners(argument.capture());
                 assertEquals(info, argument.getValue());
         }

src/test/java/geniusweb/partiesserver/websocket/PartySocketTest.java

@@ -23 +23 @@
 import geniusweb.actions.EndNegotiation;
 import geniusweb.actions.PartyId;
-import geniusweb.connection.Connection;
+import geniusweb.connection.ConnectionEnd;
 import geniusweb.partiesserver.repository.RunningPartiesRepo;
 import geniusweb.partiesserver.repository.RunningParty;
-import geniusweb.partiesserver.websocket.PartySocket;
 import geniusweb.party.Party;
 import geniusweb.party.inform.Inform;
@@ -83 +82 @@
 
                 @SuppressWarnings("unchecked")
-                Connection<Inform, Action> connection = mock(Connection.class);
+                ConnectionEnd<Inform, Action> connection = mock(ConnectionEnd.class);
                 /*
                  * we must call runningparty directly on this one because