Remove MvcUriBuilder and use javax.ws.rs.core.UriBuilder

Author: lefloh

core/src/main/java/org/mvcspec/ozark/MvcContextImpl.java

@@ -24,11 +24,11 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.mvc.MvcContext;
-import javax.mvc.uri.MvcUriBuilder;
 import javax.mvc.security.Csrf;
 import javax.mvc.security.Encoders;
 import javax.servlet.ServletContext;
 import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 import java.net.URI;
 import java.util.Locale;
@@ -127,7 +127,7 @@ public URI uri(String identifier, Map<String, Object> params) {
     }
 
     @Override
-    public MvcUriBuilder uriBuilder(String identifier) {
+    public UriBuilder uriBuilder(String identifier) {
         return applicationUris.getUriBuilder(identifier);
     }
 

core/src/main/java/org/mvcspec/ozark/uri/ApplicationUris.java

@@ -18,12 +18,13 @@
 import org.mvcspec.ozark.util.AnnotationUtils;
 
 import javax.enterprise.inject.Vetoed;
-import javax.mvc.uri.MvcUriBuilder;
-import javax.mvc.uri.UriRef;
+import javax.mvc.UriRef;
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriBuilder;
 import java.lang.reflect.Method;
 import java.net.URI;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -53,16 +54,28 @@ public URI get(String identifier) {
      * @see javax.mvc.MvcContext#uri(String, Map)
      */
     public URI get(String identifier, Map<String, Object> params) {
-        MvcUriBuilder uriBuilder = getUriBuilder(identifier);
-        params.forEach(uriBuilder::param);
-        return uriBuilder.build();
+        UriTemplate uriTemplate = getUriTemplate(identifier);
+        UriBuilder uriBuilder = UriBuilder.fromUri(uriTemplate.path());
+        Map<String, Object> pathParams = new HashMap<>();
+        // Everything which is not defined as query- or matrix-param should be a path-param
+        params.forEach((key, value) -> {
+            if (uriTemplate.queryParams().contains(key)) {
+                uriBuilder.queryParam(key, value);
+            } else if (uriTemplate.matrixParams().contains(key)) {
+                uriBuilder.matrixParam(key, value);
+            } else {
+                pathParams.put(key, value);
+            }
+        });
+        return uriBuilder.buildFromMap(pathParams);
     }
 
     /**
      * @see javax.mvc.MvcContext#uriBuilder(String)
      */
-    public MvcUriBuilder getUriBuilder(String identifier) {
-        return new DefaultMvcUriBuilder(getUriTemplate(identifier));
+    public UriBuilder getUriBuilder(String identifier) {
+        UriTemplate uriTemplate = getUriTemplate(identifier);
+        return UriBuilder.fromUri(uriTemplate.path());
     }
 
     /**

core/src/main/java/org/mvcspec/ozark/uri/DefaultMvcUriBuilder.java

@@ -16,8 +16,7 @@
 package org.mvcspec.ozark.uri;
 
 import javax.mvc.Controller;
-import javax.mvc.uri.MvcUriBuilder;
-import javax.mvc.uri.UriRef;
+import javax.mvc.UriRef;
 import javax.ws.rs.BeanParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.MatrixParam;
@@ -27,7 +26,7 @@
 import javax.ws.rs.QueryParam;
 
 /**
- * Some Controllers for {@link MvcUriBuilder related tests}
+ * Some Controllers for {@link javax.mvc.MvcContext#uriBuilder(String)} related tests}
  *
  * @author Florian Hirsch
  */

core/src/test/java/org/mvcspec/ozark/uri/DefaultMvcUriBuilderTest.java

@@ -27,7 +27,7 @@
     </parent>
     <artifactId>uri-builder</artifactId>
     <packaging>war</packaging>
-    <name>Ozark MvcUriBuilder Test</name>
+    <name>Ozark UriBuilder Test</name>
     <build>
         <finalName>${project.artifactId}</finalName>
     </build>

core/src/test/java/org/mvcspec/ozark/uri/UriBuilderTestControllers.java

@@ -16,7 +16,7 @@
 package org.mvcspec.ozark.test.uribuilder;
 
 import javax.mvc.Controller;
-import javax.mvc.uri.UriRef;
+import javax.mvc.UriRef;
 import javax.ws.rs.BeanParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.MatrixParam;

test/uri-builder/pom.xml

@@ -16,7 +16,7 @@
 package org.mvcspec.ozark.test.uribuilder;
 
 import javax.mvc.Controller;
-import javax.mvc.uri.UriRef;
+import javax.mvc.UriRef;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 

test/uri-builder/src/main/java/org/mvcspec/ozark/test/uribuilder/ParameterController.java

@@ -3,19 +3,17 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>MvcUriBuilder examples</title>
+    <title>UriBuilder examples</title>
     <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/ozark.css"/>
 </head>
 <body>
 <div class="container">
 
-    <h1>MvcUriBuilder</h1>
+    <h1>UriBuilder</h1>
 
     <p>
         Hardcoding URIs in a template can be awkward.
-        The MVC specification provides the
-        <a href="https://github.com/mvc-spec/mvc-spec/blob/master/api/src/main/java/javax/mvc/MvcUriBuilder.java">MvcUriBuilder</a>
-        to generate URIs from <code>@Path</code>,
+        The MVC specification provides methods to generate URIs from <code>@Path</code>,
         <code>@PathParam</code>, <code>@QueryParam</code> and <code>@MatrixParam</code> annotations.
         It can be used from a template but also from Java code.
     </p>
@@ -57,7 +55,7 @@ public class UriBuilderController {
     </p>
 
     <p>
-        But you don't have to use <code>UriRef</code> to use the <code>MvcUriBuilder</code>.
+        But you don't have to use <code>UriRef</code> annotation.
         You can also reference a controller method with the simple class name of your
         controller and the method name seperated by a '#':
     </p>

test/uri-builder/src/main/java/org/mvcspec/ozark/test/uribuilder/UriBuilderController.java

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>MvcUriBuilder test</title>
+    <title>UriBuilder test</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link rel="stylesheet" type="text/css" href="ozark.css">
 </head>
 <body>
-<h1>MvcUriBuilder test</h1>
+<h1>UriBuilder test</h1>
 <ul>
     <li><a href="resources/uri-builder">resources/uri-builder</a>
 </ul>