diff --git a/.gitignore b/.gitignore index bc52b25a79..5c6a961353 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ generatedDBChangeSets/ /svg.pdf /xsxx.pdf xsxx2.pdf +.spotless # Nix specifics shell.nix diff --git a/pom.xml b/pom.xml index bffeec2fe9..02316d9c23 100644 --- a/pom.xml +++ b/pom.xml @@ -263,6 +263,10 @@ true + + true + ${project.basedir}/.spotless/spotless-index + @@ -3059,7 +3063,7 @@ 3.1.0 2.4.2 4.0.3 - 2.43.0 + 2.46.1 install --force diff --git a/src/test/java/com/researchspace/service/impl/EmailBroadcastTest.java b/src/test/java/com/researchspace/service/impl/EmailBroadcastTest.java index d3638b2622..f8648845d8 100644 --- a/src/test/java/com/researchspace/service/impl/EmailBroadcastTest.java +++ b/src/test/java/com/researchspace/service/impl/EmailBroadcastTest.java @@ -53,9 +53,7 @@ public class EmailBroadcastTest extends SpringTransactionalTest { abstract static class NoRetryBroadcasterStub extends EmailBroadcastImp { @Override RetryConfig buildRetryConfig() { - return RetryConfig.custom() - .maxAttempts(1) - .build(); + return RetryConfig.custom().maxAttempts(1).build(); } } diff --git a/src/test/java/com/researchspace/webapp/controller/WorkspaceControllerMVCIT.java b/src/test/java/com/researchspace/webapp/controller/WorkspaceControllerMVCIT.java index 6370249cea..8737f51a47 100644 --- a/src/test/java/com/researchspace/webapp/controller/WorkspaceControllerMVCIT.java +++ b/src/test/java/com/researchspace/webapp/controller/WorkspaceControllerMVCIT.java @@ -1330,7 +1330,9 @@ public void testMoveDocumentIntoSharedNotebookMVC() throws Exception { Folder regularUserRoot = folderMgr.getRootFolderForUser(regularUser); StructuredDocument docToShare = createBasicDocumentInRootFolderWithText(regularUser, "anytext"); - SharePost toPost = createValidSharePostWithGroup(group, docToShare, group.getGroup().getCommunalGroupFolderId()); + SharePost toPost = + createValidSharePostWithGroup( + group, docToShare, group.getGroup().getCommunalGroupFolderId()); String apiKey = createNewApiKeyForUser(regularUser); // regular user shares a Doc into Group_shared_folder @@ -2422,18 +2424,19 @@ public void testPiSharesDocToGroupSubFolderThenMovesToGroupRoot() throws Excepti String apiKey = createNewApiKeyForUser(piUser); mockMvc - .perform(createBuilderForPostWithJSONBody(apiKey, "/share", piUser, sharePost)) - .andExpect(status().isCreated()) - .andReturn(); + .perform(createBuilderForPostWithJSONBody(apiKey, "/share", piUser, sharePost)) + .andExpect(status().isCreated()) + .andReturn(); // Move the doc to the top-level shared folder - MvcResult moveResult = mockMvc + MvcResult moveResult = + mockMvc .perform( - post("/workspace/ajax/move") - .param("parentFolderId", sharedSubFolder.getId() + "") - .param("toMove[]", doc.getId() + "") - .param("target", sharedFolderRootId + "") - .principal(new MockPrincipal(piUser.getUsername()))) + post("/workspace/ajax/move") + .param("parentFolderId", sharedSubFolder.getId() + "") + .param("toMove[]", doc.getId() + "") + .param("target", sharedFolderRootId + "") + .principal(new MockPrincipal(piUser.getUsername()))) .andExpect(status().isOk()) .andReturn();