Changeset 16

Timestamp:

09/22/20 08:52:08 (4 years ago)

Author:

bart

Message:

Version 1.5.

Files:

• pom.xml (modified) (4 diffs)
• src/main/java/geniusweb/profilesserver/AutoUpdatingProfilesRepository.java (added)
• src/main/java/geniusweb/profilesserver/DefaultProfilesRepository.java (added)
• src/main/java/geniusweb/profilesserver/ProfilesRepository.java (added)
• src/main/java/geniusweb/profilesserver/websocket/GetProfileSocket.java (modified) (4 diffs)
• src/main/java/geniusweb/profilesserver/websocket/Profiles.java (modified) (1 diff)
• src/main/java/geniusweb/profilesserver/websocket/ProfilesListSocket.java (modified) (5 diffs)
• src/main/webapp/css (added)
• src/main/webapp/css/list.css (added)
• src/main/webapp/index.jsp (modified) (2 diffs)
• src/main/webapp/list.xhtml (added)
• src/test/java/geniusweb/profilesserver/AutoUpdatingProfilesFactoryTest.java (modified) (2 diffs)
• src/test/java/geniusweb/profilesserver/DefaultProfilesFactoryTest.java (modified) (2 diffs)

pom.xml

@@ -6 +6 @@
         <artifactId>profilesserver</artifactId>
         <packaging>war</packaging>
-        <version>1.4.4</version> <!-- must equal ${geniusweb.version} -->
+        <version>1.5.0</version> <!-- must equal ${geniusweb.version} -->
         <name>profileserver Maven Webapp</name>
         <url>http://maven.apache.org</url>
@@ -18 +18 @@
                 <jackson-2-version>2.9.10</jackson-2-version>
                 <tomcat.version>8.5.20</tomcat.version>
-                <geniusweb.version>1.4.4</geniusweb.version>
+                <geniusweb.version>1.5.0</geniusweb.version>
         </properties>
 
@@ -70 +70 @@
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>tree</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.1.1</version>
                 </dependency>
 
@@ -87 +87 @@
                         <groupId>tudelft.utilities</groupId>
                         <artifactId>files</artifactId>
-                        <version>1.1.0</version>
+                        <version>1.1.1</version>
                 </dependency>
 

src/main/java/geniusweb/profilesserver/websocket/GetProfileSocket.java

@@ -28 +28 @@
 import geniusweb.profile.utilityspace.LinearAdditive;
 import geniusweb.profilesserver.Jackson;
-import geniusweb.profilesserver.ProfilesFactory;
+import geniusweb.profilesserver.ProfilesRepository;
 import geniusweb.profilesserver.events.ChangeEvent;
 import tudelft.utilities.immutablelist.FixedList;
@@ -38 +38 @@
  * and profiles. Every time something changes, a new list of domains and
  * profiles is sent. For each new websocket the server will create one of this
- * but they all share one {@link ProfilesFactory}.
+ * but they all share one {@link ProfilesRepository}.
  * 
  * <p>
@@ -80 +80 @@
                 };
                 sendupdatedProfile();
-                Profiles.factory.addListener(changeListener);
+                Profiles.repository.addListener(changeListener);
         }
 
         private void sendupdatedProfile() {
-                Profile newprof = Profiles.factory.getProfile(profilename);
+                Profile newprof = Profiles.repository.getProfile(profilename);
                 // notice, may be null if profile does not exist/was removed.
                 if (newprof == null ? prof != null : !newprof.equals(prof)) {
@@ -164 +164 @@
         @OnClose
         public void end() throws IOException {
-                Profiles.factory.removeListener(changeListener);
+                Profiles.repository.removeListener(changeListener);
         }
 

src/main/java/geniusweb/profilesserver/websocket/Profiles.java

@@ -1 +1 @@
 package geniusweb.profilesserver.websocket;
 
-import geniusweb.profilesserver.AutoUpdatingProfilesFactory;
-import geniusweb.profilesserver.ProfilesFactory;
+import geniusweb.profilesserver.AutoUpdatingProfilesRepository;
+import geniusweb.profilesserver.ProfilesRepository;
 import tudelft.utilities.logging.ReportToLogger;
 
 /**
- * Just a shared copy of the profiles factory, for use with all websockets.
+ * Just a shared copy of the profiles repository, for use with all websockets.
  * 
  */
 class Profiles {
-        public static final ProfilesFactory factory = new AutoUpdatingProfilesFactory(new ReportToLogger("profilesserver"));
+        public static final ProfilesRepository repository = new AutoUpdatingProfilesRepository(
+                        new ReportToLogger("profilesserver"));
 }

src/main/java/geniusweb/profilesserver/websocket/ProfilesListSocket.java

@@ -25 +25 @@
 
 import geniusweb.profilesserver.Jackson;
-import geniusweb.profilesserver.ProfilesFactory;
+import geniusweb.profilesserver.ProfilesRepository;
 import geniusweb.profilesserver.events.ChangeEvent;
 import tudelft.utilities.listener.Listener;
@@ -35 +35 @@
  * and profiles. Every time something changes, a new list of domains and
  * profiles is sent. For each new websocket the server will create one of this
- * but they all share one {@link ProfilesFactory}.
+ * but they all share one {@link ProfilesRepository}.
  */
 @ServerEndpoint("/websocket/liststream")
@@ -71 +71 @@
                         }
                 };
-                Profiles.factory.addListener(changeListener);
+                Profiles.repository.addListener(changeListener);
         }
 
@@ -90 +90 @@
         private Map<URI, List<URI>> getDomainsProfiles() {
                 Map<URI, List<URI>> allprofiles = new HashMap<>();
-                for (String domain : Profiles.factory.getDomains()) {
-                        List<URI> profiles = Profiles.factory.getProfiles(domain).stream()
+                for (String domain : Profiles.repository.getDomains()) {
+                        List<URI> profiles = Profiles.repository.getProfiles(domain).stream()
                                         .map(profile -> makeURI(domain, profile.getName()))
                                         .collect(Collectors.toList());
@@ -153 +153 @@
         @OnClose
         public void end() throws IOException {
-                Profiles.factory.removeListener(changeListener);
+                Profiles.repository.removeListener(changeListener);
         }
 

src/main/webapp/index.jsp

@@ -1 +1 @@
 <html>
+<head>
+<title>profiles server</title>
+<link rel="stylesheet" type="text/css" href="css/list.css" />
+
+</head>
 <body>
         <h1>GeniusWeb Domains and Profiles Server.</h1>
@@ -10 +15 @@
                 </h1>
 
-                The list of currently available profiles is <a
-                        href="websocket/list.xhtml">here</a>.<br> The list of domain and
-                profile files is browsable <a href="domainsrepo">here</a>. Notice that
-                these may contain files with errors, and thus are not available for
-                use.
+                The list of currently available profiles is <aa 
+                        onclick="window.location='list.xhtml'+window.location.search;">here</aa>.<br>
+                The list of domain and profile files is browsable <a
+                        href="domainsrepo">here</a>. Notice that these may contain files with
+                errors, and thus are not available for use.
                 <p>
                         For creating a profile or adding it to the server please check the <a
                                 href="https://tracinsy.ewi.tudelft.nl/pubtrac/GeniusWebProfilesServer">wiki</a>.
+
                 
 </body>

src/test/java/geniusweb/profilesserver/AutoUpdatingProfilesFactoryTest.java

@@ -51 +51 @@
         private List<String> warnings;
         private Path copyrepodir;
-        private AutoUpdatingProfilesFactory factory;
+        private AutoUpdatingProfilesRepository factory;
         private final long HIGHRATE = 500; // fast so that we can test quickly.
         private final List<ChangeEvent> changes = new LinkedList<>();
@@ -80 +80 @@
                 };
 
-                factory = new AutoUpdatingProfilesFactory(logger) {
+                factory = new AutoUpdatingProfilesRepository(logger) {
 
                         @Override

src/test/java/geniusweb/profilesserver/DefaultProfilesFactoryTest.java

@@ -27 +27 @@
         private Domain domain1 = mock(Domain.class);
         private List<ChangeEvent> events = new LinkedList<>();
-        private DefaultProfilesFactory factory;
+        private DefaultProfilesRepository factory;
 
         private Profile profile1 = mock(Profile.class);
@@ -40 +40 @@
                 when(profile1a.getDomain()).thenReturn(domain1);
                 when(profile1a.getName()).thenReturn(PROFILE1);
-                factory = new DefaultProfilesFactory();
+                factory = new DefaultProfilesRepository();
                 factory.addListener(new Listener<ChangeEvent>() {