Skip to content

switch to spring mvc #2488

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

Open
p-hoffmann wants to merge 20 commits into
base: webapi-3.0
Choose a base branch
from
Open

switch to spring mvc #2488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fc12ba5
switch to spring mvc
p-hoffmann Nov 17, 2025
fdc162c
cleanup
p-hoffmann Nov 22, 2025
aef7820
cleanup p2
p-hoffmann Nov 22, 2025
c466048
Merge branch 'webapi-3.0' into p-hoffmann/spring-mvc
p-hoffmann Jan 24, 2026
a182b53
migreate auth provider
p-hoffmann Jan 24, 2026
124f0be
cleanup
p-hoffmann Jan 24, 2026
1b984a4
fix build issues
p-hoffmann Jan 24, 2026
bf051fc
fix
p-hoffmann Jan 24, 2026
f096024
fix
p-hoffmann Jan 24, 2026
14ede1b
fix
p-hoffmann Jan 24, 2026
4a3c474
fix
p-hoffmann Jan 24, 2026
9ecdff4
fix
p-hoffmann Jan 24, 2026
e67cf4e
fix
p-hoffmann Jan 24, 2026
8cb4b3f
fix
p-hoffmann Jan 24, 2026
f9be8d3
cleanup
p-hoffmann Jan 24, 2026
f3febb0
Merge branch 'webapi-3.0' into p-hoffmann/spring-mvc
p-hoffmann Jan 25, 2026
dced00e
fix
p-hoffmann Jan 25, 2026
eccbffe
fix
p-hoffmann Jan 25, 2026
5a3101c
Merge branch 'webapi-3.0' into p-hoffmann/spring-mvc
p-hoffmann Jan 25, 2026
07f0710
cleanup
p-hoffmann Jan 25, 2026
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
17 changes: 17 additions & 0 deletions docker/auth-test/setup-test-users.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
-- Initial security data (roles required for the application to function)
-- These must be created before WebAPI can properly handle authentication
INSERT INTO webapi.sec_role (id, name, system_role) VALUES (1, 'public', true) ON CONFLICT (id) DO NOTHING;
INSERT INTO webapi.sec_role (id, name, system_role) VALUES (2, 'admin', true) ON CONFLICT (id) DO NOTHING;
INSERT INTO webapi.sec_role (id, name, system_role) VALUES (1001, 'Atlas users', true) ON CONFLICT (id) DO NOTHING;
INSERT INTO webapi.sec_role (id, name, system_role) VALUES (1002, 'Moderator', true) ON CONFLICT (id) DO NOTHING;

-- Anonymous user (required for public endpoints)
INSERT INTO webapi.sec_user (id, login, name) VALUES (1, 'anonymous', 'anonymous') ON CONFLICT (id) DO NOTHING;
INSERT INTO webapi.sec_user_role (id, user_id, role_id, origin) VALUES (1, 1, 1, 'SYSTEM') ON CONFLICT (id) DO NOTHING;

-- Update sequences to avoid conflicts
SELECT setval('webapi.sec_role_sequence', GREATEST((SELECT COALESCE(MAX(id), 0) + 1 FROM webapi.sec_role), nextval('webapi.sec_role_sequence')));
SELECT setval('webapi.sec_user_sequence', GREATEST((SELECT COALESCE(MAX(id), 0) + 1 FROM webapi.sec_user), nextval('webapi.sec_user_sequence')));
SELECT setval('webapi.sec_user_role_sequence', GREATEST((SELECT COALESCE(MAX(id), 0) + 1 FROM webapi.sec_user_role), nextval('webapi.sec_user_role_sequence')));

-- Test users table for JDBC authentication
CREATE TABLE IF NOT EXISTS webapi.users (
id SERIAL PRIMARY KEY,
email VARCHAR(255) UNIQUE NOT NULL,
Expand Down
8 changes: 4 additions & 4 deletions docker/integration-test/postman/integration-tests.postman_collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,9 +929,9 @@
"method": "GET",
"header": [],
"url": {
"raw": "{{base_url}}/conceptset/",
"raw": "{{base_url}}/conceptset",
"host": ["{{base_url}}"],
"path": ["conceptset", ""]
"path": ["conceptset"]
}
}
},
Expand Down Expand Up @@ -986,9 +986,9 @@
"raw": "{\n \"name\": \"Test Concept Set\",\n \"description\": \"Integration test concept set\"\n}"
},
"url": {
"raw": "{{base_url}}/conceptset/",
"raw": "{{base_url}}/conceptset",
"host": ["{{base_url}}"],
"path": ["conceptset", ""]
"path": ["conceptset"]
}
}
},
Expand Down
107 changes: 23 additions & 84 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
<shiro.version>2.0.2</shiro.version>
<!-- tomcat.embed.version removed - using Spring Boot 3.5.6 managed version (10.1.48) -->

<commons-fileupload.version>1.5</commons-fileupload.version>

<circe.version>1.12.1</circe.version>
<jersey.version>3.1.9</jersey.version>
<SqlRender.version>1.19.1</SqlRender.version>
<hive-jdbc.version>3.1.2</hive-jdbc.version>
<pac4j.version>6.0.5</pac4j.version>
Expand Down Expand Up @@ -198,7 +195,6 @@
<server.servlet.context-path>/WebAPI</server.servlet.context-path>

<arachne.version>1.17.4</arachne.version>
<jersey-media-multipart.version>3.1.9</jersey-media-multipart.version>
<execution.invalidation.period>600000</execution.invalidation.period>
<execution.invalidation.maxage.hours>12</execution.invalidation.maxage.hours>
<execution.status.period>10000</execution.status.period>
Expand Down Expand Up @@ -716,28 +712,6 @@
<artifactId>tomcat-juli</artifactId>
<version>10.1.48</version><!-- Not managed by Spring Boot, must match tomcat-embed version -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jersey</artifactId>
<exclusions>
<exclusion>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
Expand Down Expand Up @@ -791,17 +765,7 @@
<artifactId>cache-api</artifactId>
<version>1.1.1</version>
</dependency>
<!-- JAXB dependencies for Java 11+ (ehcache still uses javax.xml.bind) -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.1</version>
</dependency>
<!-- javax.xml.bind dependencies removed - ehcache 3.11.0+ no longer requires them -->
<dependency>
<groupId>org.ohdsi.sql</groupId>
<artifactId>SqlRender</artifactId>
Expand Down Expand Up @@ -895,13 +859,7 @@
<version>9.1.6</version>
</dependency>

<!-- overriding commons-fileupload version from the plug-in above -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons-fileupload.version}</version>
</dependency>

<!-- commons-fileupload removed - not used in codebase -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand All @@ -913,11 +871,7 @@
<artifactId>mssql-jdbc</artifactId>
<version>12.8.1.jre11</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j</artifactId>
<version>1.9.0</version>
</dependency>
<!-- msal4j removed - not used in codebase -->
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
Expand All @@ -935,11 +889,7 @@
<artifactId>commons-csv</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>2.1.3</version>
</dependency>
<!-- dom4j removed - not used in codebase -->
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
Expand Down Expand Up @@ -1113,10 +1063,12 @@
<artifactId>jasypt</artifactId>
<version>1.9.3</version>
</dependency>
<!-- JAX-RS API removed - all Jersey code migrated to Spring MVC -->
<!-- JAXB API - needed by some legacy code -->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey-media-multipart.version}</version>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
Expand Down Expand Up @@ -1198,7 +1150,20 @@
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>3.9.11</version>
<version>3.11.1</version>
<classifier>jakarta</classifier><!-- Using Jakarta classifier to avoid javax.xml.bind dependency -->
<exclusions>
<exclusion>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Jakarta JAXB runtime for ehcache XML configuration -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>3.0.2</version><!-- Jakarta EE 9 compatible -->
</dependency> <dependency>
<groupId>com.opentable.components</groupId>
<artifactId>otj-pg-embedded</artifactId>
Expand Down Expand Up @@ -1817,32 +1782,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>1.19.4</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>1.19.4</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>1.19.4</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>1.19.4</version>
</dependency>
</dependencies>
</profile>
<profile>
Expand Down
23 changes: 0 additions & 23 deletions src/main/java/org/ohdsi/webapi/JdbcExceptionMapper.java
View file
Open in desktop

This file was deleted.

83 changes: 0 additions & 83 deletions src/main/java/org/ohdsi/webapi/JerseyConfig.java
View file
Open in desktop

This file was deleted.

Loading