Skip to content

Commit aee50fe

Browse files
committed
fix filter config conflict
1 parent 26783d2 commit aee50fe

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/main/java/edu/harvard/iq/dataverse/api/ApiRouter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@
1010
import jakarta.servlet.ServletRequest;
1111
import jakarta.servlet.ServletResponse;
1212
import jakarta.servlet.http.HttpServletRequest;
13-
import jakarta.servlet.annotation.WebFilter;
1413

1514
/**
1615
* Routes API calls that don't have a version number to the latest API version
1716
*
1817
* @author michael
1918
*/
20-
@WebFilter("/api/*")
2119
public class ApiRouter implements Filter {
2220
private static final Logger logger = Logger.getLogger(ApiRouter.class.getName());
2321

src/main/webapp/WEB-INF/web.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,4 +262,14 @@
262262
<url-pattern>/dvn/api/data-deposit/v1.1/swordv2/edit-media/*</url-pattern>
263263
</filter-mapping>
264264
<!-- END Data Deposit API (SWORD v2) -->
265+
<!-- API version filter -->
266+
<filter>
267+
<filter-name>ApiRouter</filter-name>
268+
<filter-class>edu.harvard.iq.dataverse.api.ApiRouter</filter-class>
269+
</filter>
270+
<filter-mapping>
271+
<filter-name>ApiRouter</filter-name>
272+
<url-pattern>/api/*</url-pattern>
273+
<dispatcher>REQUEST</dispatcher>
274+
</filter-mapping>
265275
</web-app>

0 commit comments

Comments
 (0)