Skip to content

Commit 968d289

Browse files
authored
Modularize JabSrv (#13908)
* Create MapResource * Refactor classes * Move resources to sub package * Add MapResource - and reorder * Try to fix JabSrvLauncher
1 parent 1b67d8d commit 968d289

File tree

13 files changed

+430
-353
lines changed

13 files changed

+430
-353
lines changed

.jbang/JabSrvLauncher.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@
3434
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/command/Command.java
3535
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/command/CommandResource.java
3636
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/command/SelectEntriesCommand.java
37+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/resources/LibrariesResource.java
38+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/resources/LibraryResource.java
39+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/resources/MapResource.java
40+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/resources/RootResource.java
41+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/services/FilesToServe.java
42+
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/services/ServerUtils.java
3743
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/CORSFilter.java
38-
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/LibrariesResource.java
39-
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/LibraryResource.java
4044
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/PreferencesFactory.java
41-
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/RootResource.java
4245
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/Server.java
43-
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/services/FilesToServe.java
44-
//SOURCES ../jabsrv/src/main/java/org/jabref/http/server/services/ServerUtils.java
4546

4647
// REPOS mavencentral,snapshots=https://central.sonatype.com/repository/maven-snapshots/
4748
// REPOS mavencentral,mavencentralsnapshots=https://central.sonatype.com/repository/maven-snapshots/,s01oss=https://s01.oss.sonatype.org/content/repositories/snapshots/,oss=https://oss.sonatype.org/content/repositories,jitpack=https://jitpack.io,oss2=https://oss.sonatype.org/content/groups/public,ossrh=https://oss.sonatype.org/content/repositories/snapshots

docs/code-howtos/http-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parent: Code Howtos
66
JabRef has a built-in http server.
77
The source is located in the project `jabsrv`.
88

9-
The resource for a library is implemented at [`org.jabref.http.server.LibraryResource`](https://github.com/JabRef/jabref/blob/main/jabsrv/src/main/java/org/jabref/http/server/LibraryResource.java).
9+
The resource for a library is implemented at [`org.jabref.http.server.resources.LibraryResource`](https://github.com/JabRef/jabref/blob/main/jabsrv/src/main/java/org/jabref/http/server/resources/LibraryResource.java).
1010

1111
## Start http server
1212

jabsrv-cli/src/main/java/org/jabref/http/server/cli/ServerCli.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static void main(final String[] args) throws InterruptedException {
4444

4545
@Override
4646
public Void call() throws InterruptedException {
47-
// The server serves the last opened files (see org.jabref.http.server.LibraryResource.getLibraryPath)
47+
// The server serves the last opened files (see org.jabref.http.server.resources.LibraryResource.getLibraryPath)
4848
final List<Path> filesToServe = new ArrayList<>(JabRefCliPreferences.getInstance().getLastFilesOpenedPreferences().getLastFilesOpened());
4949

5050
// Additionally, files can be provided as args

jabsrv/src/main/java/module-info.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
opens org.jabref.http.server.command to com.google.gson, org.glassfish.hk2.locator, org.glassfish.hk2.utilities, com.fasterxml.jackson.databind;
1414
exports org.jabref.http.server.services;
1515
exports org.jabref.http;
16+
opens org.jabref.http.server.resources to org.glassfish.hk2.locator, org.glassfish.hk2.utilities;
17+
exports org.jabref.http.server.resources;
1618

1719
requires javafx.base;
1820

@@ -58,5 +60,4 @@
5860
requires jersey.server;
5961
requires com.fasterxml.jackson.annotation;
6062
requires com.fasterxml.jackson.databind;
61-
6263
}

jabsrv/src/main/java/org/jabref/http/server/LibraryResource.java

Lines changed: 0 additions & 342 deletions
This file was deleted.

0 commit comments

Comments
 (0)