Skip to content

Spotless index #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 10, 2025
Merged

Spotless index #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b56df27
set spotless index file to hidden subfolder. default was target, but …
rs-fraser Nov 4, 2025
1296882
use latest spotless version
rs-fraser Nov 4, 2025
c1215e1
Merge branch 'main' into spotless-index
rs-fraser Nov 5, 2025
61d9e72
formatting
rs-fraser Nov 5, 2025
a7a7315
use latest v2 of spotless to appease Jenkins
rs-fraser Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ generatedDBChangeSets/
/svg.pdf
/xsxx.pdf
xsxx2.pdf
.spotless

# Nix specifics
shell.nix
Expand Down
6 changes: 5 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,10 @@
<reflowLongStrings>true</reflowLongStrings>
</googleJavaFormat>
</java>
<upToDateChecking>
<enabled>true</enabled>
<indexFile>${project.basedir}/.spotless/spotless-index</indexFile>
</upToDateChecking>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -3059,7 +3063,7 @@
<servlet.version>3.1.0</servlet.version>
<sitemesh.version>2.4.2</sitemesh.version>
<urlrewrite.version>4.0.3</urlrewrite.version>
<spotless.version>2.43.0</spotless.version>
<spotless.version>2.46.1</spotless.version>
<npm.dependencies.collection.arg>install --force</npm.dependencies.collection.arg>

<!--Sonar properties-->
Expand Down
4 changes: 1 addition & 3 deletions src/test/java/com/researchspace/service/impl/EmailBroadcastTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

Expand Down
23 changes: 13 additions & 10 deletions src/test/java/com/researchspace/webapp/controller/WorkspaceControllerMVCIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();

Expand Down