Switch to eclipse jaxrs-api dependency.

noboomu · Jan 8, 2019 · aeca144 · aeca144
1 parent 7a95dad
commit aeca144
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -240,15 +240,13 @@
 			<artifactId>slf4j-ext</artifactId>
 			<version>1.7.25</version>
 		</dependency>
-		
+
 		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.1.1</version>
+			<groupId>jakarta.ws.rs</groupId>
+			<artifactId>jakarta.ws.rs-api</artifactId>
+			<version>2.1.4</version>
 		</dependency>
 
-
-
 		<dependency>
 			<groupId>net.openhft</groupId>
 			<artifactId>compiler</artifactId>
@@ -303,8 +301,6 @@
 			<version>4.4.10</version>
 		</dependency>
 
-
-
 		<dependency>
 			<groupId>org.fusesource.jansi</groupId>
 			<artifactId>jansi</artifactId>

diff --git a/src/main/java/io/sinistral/proteus/server/handlers/HandlerGenerator.java b/src/main/java/io/sinistral/proteus/server/handlers/HandlerGenerator.java
@@ -750,7 +750,7 @@ protected void addClassMethodHandlers(TypeSpec.Builder typeBuilder, Class<?> cla
             List<String> securityDefinitions = new ArrayList<>();
 
             /*
-             * @TODO wrap blocking in BlockingHandler
+             * @TODO wrap blocking in BlockingHandler?
              */
 
             if (Optional.ofNullable(m.getAnnotation(Path.class)).isPresent()) {

diff --git a/src/main/java/io/sinistral/proteus/server/handlers/ProteusHandler.java b/src/main/java/io/sinistral/proteus/server/handlers/ProteusHandler.java
@@ -276,11 +276,10 @@ public void handleRequest(HttpServerExchange exchange) throws Exception
         else
         {
             // already something in the resolved path
-            StringBuilder sb = new StringBuilder(exchange.getResolvedPath().length() + match.getMatched().length());
 
-            sb.append(exchange.getResolvedPath());
-            sb.append(match.getMatched());
-            exchange.setResolvedPath(sb.toString());
+            String sb = exchange.getResolvedPath() +
+                    match.getMatched();
+            exchange.setResolvedPath(sb);
         }
 
         match.getValue().handleRequest(exchange);