You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by se...@apache.org on 2020/05/05 15:20:20 UTC
svn commit: r1877402 - in /ctakes/trunk/ctakes-tiny-rest: ./
src/main/java/org/apache/ctakes/rest/filter/
src/main/java/org/apache/ctakes/rest/service/ src/main/webapp/WEB-INF/
Author: seanfinan
Date: Tue May 5 15:20:19 2020
New Revision: 1877402
URL: http://svn.apache.org/viewvc?rev=1877402&view=rev
Log:
Added CORS
Added:
ctakes/trunk/ctakes-tiny-rest/src/main/java/org/apache/ctakes/rest/filter/
ctakes/trunk/ctakes-tiny-rest/src/main/java/org/apache/ctakes/rest/filter/CORSFilter.java
Modified:
ctakes/trunk/ctakes-tiny-rest/pom.xml
ctakes/trunk/ctakes-tiny-rest/src/main/java/org/apache/ctakes/rest/service/TinyController.java
ctakes/trunk/ctakes-tiny-rest/src/main/webapp/WEB-INF/web.xml
Modified: ctakes/trunk/ctakes-tiny-rest/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-tiny-rest/pom.xml?rev=1877402&r1=1877401&r2=1877402&view=diff
==============================================================================
--- ctakes/trunk/ctakes-tiny-rest/pom.xml (original)
+++ ctakes/trunk/ctakes-tiny-rest/pom.xml Tue May 5 15:20:19 2020
@@ -38,6 +38,12 @@
<dependencies>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${springframework.version}</version>
Added: ctakes/trunk/ctakes-tiny-rest/src/main/java/org/apache/ctakes/rest/filter/CORSFilter.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-tiny-rest/src/main/java/org/apache/ctakes/rest/filter/CORSFilter.java?rev=1877402&view=auto
==============================================================================
--- ctakes/trunk/ctakes-tiny-rest/src/main/java/org/apache/ctakes/rest/filter/CORSFilter.java (added)
+++ ctakes/trunk/ctakes-tiny-rest/src/main/java/org/apache/ctakes/rest/filter/CORSFilter.java Tue May 5 15:20:19 2020
@@ -0,0 +1,30 @@
+package org.apache.ctakes.rest.filter;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class CORSFilter extends OncePerRequestFilter {
+ private static final Log log = LogFactory.getLog( CORSFilter.class );
+
+ @Override
+ protected void doFilterInternal( final HttpServletRequest request,
+ final HttpServletResponse response,
+ final FilterChain filterChain ) throws ServletException, IOException {
+ log.debug( "Invoking CORS filter" );
+ response.addHeader( "Access-Control-Allow-Origin", "*" );
+ if ( request.getHeader( "Access-Control-Request-Method" ) != null && "OPTIONS".equals( request.getMethod() ) ) {
+ response.addHeader( "Access-Control-Allow-Methods", "GET, POST, PUT, DELETE" );
+ response.addHeader( "Access-Control-Allow-Headers", "Content-Type" );
+ }
+ filterChain.doFilter( request, response );
+ log.debug( "Exiting CORS filter" );
+ }
+
+}
\ No newline at end of file
Modified: ctakes/trunk/ctakes-tiny-rest/src/main/java/org/apache/ctakes/rest/service/TinyController.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-tiny-rest/src/main/java/org/apache/ctakes/rest/service/TinyController.java?rev=1877402&r1=1877401&r2=1877402&view=diff
==============================================================================
--- ctakes/trunk/ctakes-tiny-rest/src/main/java/org/apache/ctakes/rest/service/TinyController.java (original)
+++ ctakes/trunk/ctakes-tiny-rest/src/main/java/org/apache/ctakes/rest/service/TinyController.java Tue May 5 15:20:19 2020
@@ -63,6 +63,7 @@ public class TinyController {
public String processText( @RequestBody final String text,
@RequestParam( "format" ) final Optional<String> responseFormat )
throws AnalysisEngineProcessException {
+ LOGGER.info( "Processing " + text );
final String format = responseFormat.orElse( "default" ).toLowerCase();
switch ( format ) {
case "fhir":
Modified: ctakes/trunk/ctakes-tiny-rest/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-tiny-rest/src/main/webapp/WEB-INF/web.xml?rev=1877402&r1=1877401&r2=1877402&view=diff
==============================================================================
--- ctakes/trunk/ctakes-tiny-rest/src/main/webapp/WEB-INF/web.xml (original)
+++ ctakes/trunk/ctakes-tiny-rest/src/main/webapp/WEB-INF/web.xml Tue May 5 15:20:19 2020
@@ -13,12 +13,12 @@
<servlet-name>ctakes-rest-service</servlet-name>
<url-pattern>/service/*</url-pattern>
</servlet-mapping>
- <!-- <filter>-->
- <!-- <filter-name>CORS</filter-name>-->
- <!-- <filter-class>org.apache.ctakes.rest.filter.CORSFilter</filter-class>-->
- <!-- </filter>-->
- <!-- <filter-mapping>-->
- <!-- <filter-name>CORS</filter-name>-->
- <!-- <url-pattern>/service/*</url-pattern>-->
- <!-- </filter-mapping>-->
+ <filter>
+ <filter-name>CORS</filter-name>
+ <filter-class>org.apache.ctakes.rest.filter.CORSFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>CORS</filter-name>
+ <url-pattern>/service/*</url-pattern>
+ </filter-mapping>
</web-app>