Merge pull request #5500 from nickgros/SWC-7040

Sage-Bionetworks · Aug 28, 2024 · 7db9365 · 7db9365
2 parents 3974cef + fc39d67
commit 7db9365
Show file tree

Hide file tree

Showing 216 changed files with 1,464 additions and 2,076 deletions.
diff --git a/.github/workflows/build/action.yml b/.github/workflows/build/action.yml
@@ -3,11 +3,11 @@ description: 'Build SWC'
 runs:
   using: 'composite'
   steps:
-    - name: Set up JDK 8
-      uses: actions/setup-java@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v4
       with:
-        java-version: '8'
-        distribution: 'temurin'
+        java-version: '11'
+        distribution: 'corretto'
         cache: maven
     - name: Build with Maven
       shell: bash

diff --git a/package.json b/package.json
@@ -46,6 +46,7 @@
     "@types/uuid": "^9.0.7",
     "@typescript-eslint/eslint-plugin": "^6.4.0",
     "@typescript-eslint/parser": "^6.17.0",
+    "concurrently": "^8.2.2",
     "dotenv": "^16.3.1",
     "eslint": "^8.0.1",
     "husky": ">=6",
@@ -54,16 +55,17 @@
     "prettier": "^3.2.5",
     "prettier-plugin-java": "2.5.0",
     "typescript": "5.1.6",
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.0",
+    "wait-on": "^8.0.0"
   },
   "lint-staged": {
     "*.{*}": "prettier --write"
   },
   "scripts": {
     "build": "mvn -B package --file pom.xml",
-    "dev": "npm-run-all --parallel dev:tomcat dev:codeserver",
-    "dev:tomcat": "docker pull tomcat:9.0; docker run --name swc-dev --rm -p 8888:8080 -v \"/$(pwd)/target/portal-develop-SNAPSHOT/:/usr/local/tomcat/webapps/ROOT/\" -v \"/$HOME/.m2/settings.xml\":/root/.m2/settings.xml tomcat:9.0",
-    "dev:codeserver": "mvn gwt:run-codeserver -Dgwt.compiler.skip=true -Dnoserver=true -Dwar=/$(pwd)/target/portal-develop-SNAPSHOT -Dstyle=PRETTY",
+    "dev": "concurrently -k -n \"CODESERVER,TOMCAT\" -c \"auto,auto\" \"yarn dev:codeserver\" \"yarn dev:tomcat\"",
+    "dev:codeserver": "mvn clean gwt:run-codeserver",
+    "dev:tomcat": "wait-on tcp:9876 && docker pull tomcat:9.0; docker run --name swc-dev --rm -p 8888:8080 -v \"/$(pwd)/target/portal-develop-SNAPSHOT/:/usr/local/tomcat/webapps/ROOT/\" -v \"/$HOME/.m2/settings.xml\":/root/.m2/settings.xml tomcat:9.0",
     "docker:start": "docker pull tomcat:9.0; docker run --name swc-tomcat -d --rm -p 8888:8080 -v \"/$(pwd)/target/portal-develop-SNAPSHOT.war:/usr/local/tomcat/webapps/ROOT.war\" -v \"/$(pwd)/e2e_workflow/settings.xml\":/root/.m2/settings.xml tomcat:9.0",
     "docker:stop": "docker stop swc-tomcat",
     "prepare": "husky install",

diff --git a/pom.xml b/pom.xml
@@ -13,16 +13,15 @@
 
   <properties>
     <!-- Synapse Web Client -->
-    <!-- GWT needs at least java 1.5 -->
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <webappDirectory>
       ${project.build.directory}/${project.build.finalName}
     </webappDirectory>
     <synapse.version>499.0</synapse.version>
     <gwtVersion>2.11.0</gwtVersion>
     <org.springframework.version>5.3.37</org.springframework.version>
-    <guiceVersion>3.0</guiceVersion>
+    <guiceVersion>6.0.0</guiceVersion>
     <ginVersion>2.1.2</ginVersion>
     <xstream.version>1.3.1</xstream.version>
     <schema-to-pojo.version>0.6.10</schema-to-pojo.version>
@@ -208,12 +207,15 @@
               <goal>compile</goal>
               <goal>test</goal>
               <goal>i18n</goal>
+              <goal>run-codeserver</goal>
             </goals>
           </execution>
         </executions>
         <!-- Plugin configuration. There are many available options, see gwt-maven-plugin 
 					documentation at codehaus.org -->
         <configuration>
+          <workDir>${project.build.directory}/gwt/codeserver</workDir>
+          <launcherDir>${webappDirectory}</launcherDir>
           <runTarget>Portal.html</runTarget>
           <hostedWebapp>${webappDirectory}</hostedWebapp>
           <i18nMessagesBundle>
@@ -242,6 +244,12 @@
         <version>3.3.2</version>
         <configuration>
           <filesets>
+            <fileset>
+              <directory>gwt-unitCache</directory>
+              <includes>
+                <include>**/*</include>
+              </includes>
+            </fileset>
             <fileset>
               <!-- Clean dir where we copy JS/CSS from node_modules -->
               <directory>src/main/webapp/generated</directory>
@@ -370,7 +378,7 @@
                 src/main/webapp/sass:src/main/webapp/generated
               </arguments>
             </configuration>
-            <phase>compile</phase>
+            <phase>process-resources</phase>
           </execution>
         </executions>
 
@@ -587,6 +595,20 @@
       </plugin>
     </plugins>
   </build>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.inject</groupId>
+        <artifactId>guice</artifactId>
+        <version>${guiceVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.inject.extensions</groupId>
+        <artifactId>guice-servlet</artifactId>
+        <version>${guiceVersion}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>com.google.gwt.eventbinder</groupId>
@@ -784,16 +806,22 @@
       <version>${guiceVersion}</version>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt.inject</groupId>
-      <artifactId>gin</artifactId>
-      <version>${ginVersion}</version>
-      <scope>provided</scope>
+      <groupId>com.google.inject.extensions</groupId>
+      <artifactId>guice-servlet</artifactId>
+      <version>${guiceVersion}</version>
     </dependency>
     <dependency>
       <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-servlet</artifactId>
+      <artifactId>guice-assistedinject</artifactId>
       <version>${guiceVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.gwt.inject</groupId>
+      <artifactId>gin</artifactId>
+      <version>${ginVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- This provides the GWT MVP framework -->
     <dependency>
       <groupId>com.gwtplatform</groupId>
@@ -906,8 +934,8 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.10.19</version>
+      <artifactId>mockito-core</artifactId>
+      <version>2.28.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/src/test/java/org/sagebionetworks/web/client/SynapseJavascriptClientTest.java b/src/test/java/org/sagebionetworks/web/client/SynapseJavascriptClientTest.java
@@ -80,7 +80,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.sagebionetworks.client.exceptions.SynapseTooManyRequestsException;
 import org.sagebionetworks.repo.model.EntityChildrenRequest;
 import org.sagebionetworks.repo.model.ErrorResponseCode;
@@ -138,7 +138,7 @@
 import org.sagebionetworks.web.shared.exceptions.UnauthorizedException;
 import org.sagebionetworks.web.shared.exceptions.UnknownErrorException;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class SynapseJavascriptClientTest {
 
   SynapseJavascriptClient client;
@@ -225,9 +225,7 @@ public void before() throws RequestException {
     when(mockJsniUtils.getAccessTokenCookieUrl())
       .thenReturn(SESSION_COOKIE_URL);
 
-    when(
-      mockRequestBuilder.sendRequest(anyString(), any(RequestCallback.class))
-    )
+    when(mockRequestBuilder.sendRequest(any(), any(RequestCallback.class)))
       .thenReturn(mockRequest1, mockRequest2);
     client =
       new SynapseJavascriptClient(
@@ -1211,7 +1209,7 @@ public void testDeleteRequestsCannotBeCancelled() throws RequestException {
 
     client.deleteEntityById("syn111", null);
 
-    verify(mockRequestBuilder).sendRequest(anyString(), any());
+    verify(mockRequestBuilder).sendRequest(any(), any());
 
     // verify no requests are associated to the current URL
     assertNull(client.getCancellableRequests(currentUrl));

diff --git a/src/test/java/org/sagebionetworks/web/client/security/AuthenticationControllerImplTest.java b/src/test/java/org/sagebionetworks/web/client/security/AuthenticationControllerImplTest.java
@@ -25,7 +25,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.sagebionetworks.repo.model.UserProfile;
 import org.sagebionetworks.repo.model.auth.LoginRequest;
 import org.sagebionetworks.repo.model.auth.LoginResponse;
@@ -54,7 +54,7 @@
 import org.sagebionetworks.web.shared.exceptions.UnknownErrorException;
 import org.sagebionetworks.web.test.helper.AsyncMockStubber;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class AuthenticationControllerImplTest {
 
   public static final String ACCESS_TOKEN = "1111";

diff --git a/src/test/java/org/sagebionetworks/web/client/widget/CommaSeparatedValuesParserTest.java b/src/test/java/org/sagebionetworks/web/client/widget/CommaSeparatedValuesParserTest.java
@@ -9,11 +9,11 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.sagebionetworks.web.client.widget.csv.PapaCSVParser;
 import org.sagebionetworks.web.client.widget.csv.PapaParseResult;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class CommaSeparatedValuesParserTest extends TestCase {
 
   @Mock

diff --git a/src/test/java/org/sagebionetworks/web/client/widget/entity/EntityModalWidgetTest.java b/src/test/java/org/sagebionetworks/web/client/widget/entity/EntityModalWidgetTest.java
@@ -10,11 +10,11 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.sagebionetworks.web.client.GlobalApplicationState;
 import org.sagebionetworks.web.client.jsinterop.EntityModalProps;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class EntityModalWidgetTest {
 
   @Mock

diff --git a/...va/org/sagebionetworks/web/client/widget/entity/EntityViewScopeEditorModalWidgetTest.java b/...va/org/sagebionetworks/web/client/widget/entity/EntityViewScopeEditorModalWidgetTest.java
@@ -10,12 +10,12 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.sagebionetworks.web.client.GlobalApplicationState;
 import org.sagebionetworks.web.client.PlaceChanger;
 import org.sagebionetworks.web.client.jsinterop.EntityViewScopeEditorModalProps;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class EntityViewScopeEditorModalWidgetTest {
 
   @Mock

diff --git a/...st/java/org/sagebionetworks/web/client/widget/entity/SqlDefinedEditorModalWidgetTest.java b/...st/java/org/sagebionetworks/web/client/widget/entity/SqlDefinedEditorModalWidgetTest.java
@@ -10,12 +10,12 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.sagebionetworks.web.client.GlobalApplicationState;
 import org.sagebionetworks.web.client.PlaceChanger;
 import org.sagebionetworks.web.client.jsinterop.SqlDefinedTableEditorModalProps;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class SqlDefinedEditorModalWidgetTest {
 
   @Mock

diff --git a/src/test/java/org/sagebionetworks/web/unitclient/ClientPropertiesTest.java b/src/test/java/org/sagebionetworks/web/unitclient/ClientPropertiesTest.java
@@ -5,10 +5,10 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.sagebionetworks.web.client.resources.WebResource;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class ClientPropertiesTest {
 
   @Test

diff --git a/src/test/java/org/sagebionetworks/web/unitclient/DateTimeUtilsImplTest.java b/src/test/java/org/sagebionetworks/web/unitclient/DateTimeUtilsImplTest.java
@@ -1,6 +1,7 @@
 package org.sagebionetworks.web.unitclient;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -20,12 +21,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.sagebionetworks.web.client.DateTimeUtilsImpl;
 import org.sagebionetworks.web.client.GWTWrapper;
 import org.sagebionetworks.web.client.Moment;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class DateTimeUtilsImplTest {
 
   @Mock
@@ -111,7 +112,7 @@ public void testRelativeTime() {
 
     d = new Date();
     dateTimeUtils.getRelativeTime(d);
-    verify(mockMoment).getRelativeTime(anyString());
+    verify(mockMoment).getRelativeTime(any());
   }
 
   @Test

diff --git a/src/test/java/org/sagebionetworks/web/unitclient/GlobalApplicationStateImplTest.java b/src/test/java/org/sagebionetworks/web/unitclient/GlobalApplicationStateImplTest.java
@@ -121,7 +121,7 @@ public void before() {
     AsyncMockStubber
       .callSuccessWith("v1")
       .when(mockJsClient)
-      .getSynapseVersions(any(AsyncCallback.class));
+      .getSynapseVersions(any());
 
     globalApplicationState =
       new GlobalApplicationStateImpl(
@@ -398,15 +398,15 @@ public void testPushCurrentPlace() {
     globalApplicationState.pushCurrentPlace(mockPlace);
     // should have set the last place (to the current), and the current place (as requested)
     verify(mockSessionStorage)
-      .setItem(eq(GlobalApplicationStateImpl.LAST_PLACE), anyString());
+      .setItem(eq(GlobalApplicationStateImpl.LAST_PLACE), any());
     verify(mockGWT).newItem(newToken, false);
 
     // if I push the same place again, it should not push the history state again
-    when(mockAppPlaceHistoryMapper.getPlace(anyString())).thenReturn(mockPlace);
+    when(mockAppPlaceHistoryMapper.getPlace(any())).thenReturn(mockPlace);
     globalApplicationState.pushCurrentPlace(mockPlace);
     // verify that these were still only called once
     verify(mockSessionStorage)
-      .setItem(eq(GlobalApplicationStateImpl.LAST_PLACE), anyString());
+      .setItem(eq(GlobalApplicationStateImpl.LAST_PLACE), any());
     verify(mockGWT).newItem(newToken, false);
   }
 
@@ -418,15 +418,15 @@ public void testReplaceCurrentPlace() {
     globalApplicationState.replaceCurrentPlace(mockPlace);
     // should have set the last place (to the current), and the current place (as requested)
     verify(mockSessionStorage)
-      .setItem(eq(GlobalApplicationStateImpl.LAST_PLACE), anyString());
+      .setItem(eq(GlobalApplicationStateImpl.LAST_PLACE), any());
     verify(mockGWT).replaceItem(newToken, false);
 
     // if I push the same place again, it should not push the history state again
-    when(mockAppPlaceHistoryMapper.getPlace(anyString())).thenReturn(mockPlace);
+    when(mockAppPlaceHistoryMapper.getPlace(any())).thenReturn(mockPlace);
     globalApplicationState.replaceCurrentPlace(mockPlace);
     // verify that these were still only called once
     verify(mockSessionStorage)
-      .setItem(eq(GlobalApplicationStateImpl.LAST_PLACE), anyString());
+      .setItem(eq(GlobalApplicationStateImpl.LAST_PLACE), any());
     verify(mockGWT).replaceItem(newToken, false);
   }
 

diff --git a/src/test/java/org/sagebionetworks/web/unitclient/SessionDetectorTest.java b/src/test/java/org/sagebionetworks/web/unitclient/SessionDetectorTest.java
@@ -11,15 +11,15 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.sagebionetworks.web.client.GWTWrapper;
 import org.sagebionetworks.web.client.GlobalApplicationState;
 import org.sagebionetworks.web.client.SessionDetector;
 import org.sagebionetworks.web.client.cache.ClientCache;
 import org.sagebionetworks.web.client.security.AuthenticationController;
 import org.sagebionetworks.web.client.utils.Callback;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class SessionDetectorTest {
 
   SessionDetector sessionDetector;