Update to up-spec v1.6.0-alpha.7

README.adoc

@@ -4,7 +4,7 @@
 [.specitem,oft-sid="uman~up-java-readme~1",oft-covers="req~up-language-documentation~1",tags="LanguageLibrary"]
 == Overview
 
-This is the https://github.com/eclipse-uprotocol/uprotocol-spec/blob/v1.6.0-alpha.6/languages.adoc[uProtocol v1.6.0-alpha.6 Language Library] for the Java programming language. The library is organized into packages that are described in <<sdk-packages>> below and organized by the layers of the protocol.
+This is the https://github.com/eclipse-uprotocol/uprotocol-spec/blob/v1.6.0-alpha.7/languages.adoc[uProtocol v1.6.0-alpha.7 Language Library] for the Java programming language. The library is organized into packages that are described in <<sdk-packages>> below and organized by the layers of the protocol.
 
 Each package folder contains a `README.adoc` file that describes the purpose of the package and how to use it.
 
@@ -38,15 +38,15 @@ The following dependency needs to be added to your Maven POM file, setting `${up
 
 | xref:src/main/java/org/eclipse/uprotocol/client/README.adoc[`*client*`]
 | Top level client-facing interfaces to communication with USubscription, UDiscovery, and UTwin services.
-| https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/up-l3/README.adoc[Application Layer (uP-L3)]
+| https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/up-l3/README.adoc[Application Layer (uP-L3)]
 
 | xref:src/main/java/org/eclipse/uprotocol/communication/README.adoc[`*communication*`]
 | Common implementation of communication messaging patterns (publisher, subscriber, RpcClient, RpcServer, etc..) that are built on top of the L1 transport interface (see below).
-| https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/up-l2/api.adoc[Communication Layer (uP-L2)] 
+| https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/up-l2/api.adoc[Communication Layer (uP-L2)] 
 
 | xref:src/main/java/org/eclipse/uprotocol/transport/README.adoc[`*transport*`] 
 | Interface and data model for how to send() and receive() messages in a common way across various transport technologies (ex. zenoh, mqtt, http, etc...). the interface is implemented by transports (ex. up-transport-android-java), and the interface is then used to build the uProtocol layer 2 communication layer implementation.
-| https://github.com/eclipse-uprotocol/uprotocol-spec/blob/v1.6.0-alpha.6/up-l1/README.adoc[Transport Layer (uP-L1)] 
+| https://github.com/eclipse-uprotocol/uprotocol-spec/blob/v1.6.0-alpha.7/up-l1/README.adoc[Transport Layer (uP-L1)] 
 
 | xref:src/main/java/org/eclipse/uprotocol/uri/README.adoc[`*uuri*`]
 | uProtocol addressing scheme (UUri) builders, validators, and serializers. 

src/main/java/org/eclipse/uprotocol/client/usubscription/v3/USubscriptionClient.java

@@ -32,7 +32,7 @@
 /**
  * The client-side interface for interacting with a USubscription service instance.
  *
- * @see <a href="https://github.com/eclipse-uprotocol/up-spec/tree/v1.6.0-alpha.6/up-l3/usubscription/v3">
+ * @see <a href="https://github.com/eclipse-uprotocol/up-spec/tree/v1.6.0-alpha.7/up-l3/usubscription/v3">
  * USubscription service specification</a>
  */
 public interface USubscriptionClient {

src/main/java/org/eclipse/uprotocol/communication/Notifier.java

@@ -21,7 +21,7 @@
 /**
  * A client for sending Notification messages to a uEntity.
  *
- * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/up-l2/api.adoc">
+ * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/up-l2/api.adoc">
  * Communication Layer API Specifications</a>
  */
 // [impl->dsn~communication-layer-api-declaration~1]

src/main/java/org/eclipse/uprotocol/communication/Publisher.java

@@ -17,7 +17,7 @@
 /**
  * A client for publishing messages to a topic.
  *
- * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/up-l2/api.adoc">
+ * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/up-l2/api.adoc">
  * Communication Layer API Specifications</a>
  */
 // [impl->dsn~communication-layer-api-declaration~1]

src/main/java/org/eclipse/uprotocol/communication/RpcClient.java

@@ -19,7 +19,7 @@
 /**
  * A client for performing Remote Procedure Calls (RPC) on (other) uEntities.
  *
- * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/up-l2/api.adoc">
+ * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/up-l2/api.adoc">
  * Communication Layer API specification</a>
  */
 // [impl->dsn~communication-layer-api-declaration~1]

src/main/java/org/eclipse/uprotocol/communication/RpcServer.java

@@ -21,7 +21,7 @@
 /**
  * A server for exposing Remote Procedure Call (RPC) endpoints.
  *
- * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/up-l2/api.adoc">
+ * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/up-l2/api.adoc">
  * Communication Layer API specification</a>
  */
 // [impl->dsn~communication-layer-api-declaration~1]

src/main/java/org/eclipse/uprotocol/communication/Subscriber.java

@@ -25,7 +25,7 @@
 /**
  * A client for subscribing to topics.
  *
- * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/up-l2/api.adoc">
+ * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/up-l2/api.adoc">
  * Communication Layer API Specifications</a>
  */
 // [impl->dsn~communication-layer-api-declaration~1]

src/main/java/org/eclipse/uprotocol/transport/UListener.java

@@ -19,7 +19,7 @@
  *
  * Implementations contain the details for what should occur when a message is received.
  *
- * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/up-l1/README.adoc">
+ * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/up-l1/README.adoc">
  * uProtocol Transport Layer specification</a>
  */
 // [impl->dsn~ulistener-declaration~1]

src/main/java/org/eclipse/uprotocol/transport/UTransport.java

@@ -27,7 +27,7 @@
  * UTransport implementations contain the details for connecting to the underlying transport technology and
  * sending UMessage using the configured technology.
  *
- * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/up-l1/README.adoc">
+ * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/up-l1/README.adoc">
  * uProtocol Transport Layer specification</a>
  */
 // [impl->dsn~utransport-declaration~1]
@@ -48,7 +48,7 @@ public interface UTransport {
      * <p>
      * The listener will be invoked for each message that matches the given source filter pattern
      * according to the rules defined by the
-     * <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/basics/uri.adoc">UUri
+     * <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/basics/uri.adoc">UUri
      * specification</a>.
      * <p>
      * This default implementation invokes {@link #registerListener(UUri, Optional<UUri>, UListener)} with the
@@ -71,7 +71,7 @@ default CompletionStage<Void> registerListener(UUri sourceFilter, UListener list
      * <p>
      * The listener will be invoked for each message that matches the given source and sink filter patterns
      * according to the rules defined by the
-     * <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/basics/uri.adoc">UUri
+     * <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/basics/uri.adoc">UUri
      * specification</a>.
      *
      * @param sourceFilter The <em>source</em> address pattern that messages need to match.

src/main/java/org/eclipse/uprotocol/uri/serializer/UriSerializer.java

@@ -23,7 +23,7 @@
  * Provides functionality for serializing and deserializing {@link UUri}s to/from their
  * corresponding URI representation as defined by the uProtocol specification.
  *
- * @see <a href="https://github.com/eclipse-uprotocol/uprotocol-spec/blob/v1.6.0-alpha.6/basics/uri.adoc">
+ * @see <a href="https://github.com/eclipse-uprotocol/uprotocol-spec/blob/v1.6.0-alpha.7/basics/uri.adoc">
  * uProtocol URI Specification</a>
  */
 public final class UriSerializer {
@@ -50,7 +50,7 @@ private UriSerializer() {
      * @throws IllegalArgumentException if the UUri does not comply with the UUri specification.
      */
     // [impl->dsn~uri-authority-mapping~1]
-    // [impl->dsn~uri-path-mapping~1]
+    // [impl->dsn~uri-path-mapping~2]
     // [impl->req~uri-serialization~1]
     public static String serialize(UUri uuri) {
         return serialize(uuri, false);
@@ -69,7 +69,7 @@ public static String serialize(UUri uuri) {
      * @throws IllegalArgumentException if the UUri does not comply with the UUri specification.
      */
     // [impl->dsn~uri-authority-mapping~1]
-    // [impl->dsn~uri-path-mapping~1]
+    // [impl->dsn~uri-path-mapping~2]
     // [impl->req~uri-serialization~1]
     public static String serialize(UUri uuri, boolean includeScheme) {
         Objects.requireNonNull(uuri);
@@ -102,7 +102,7 @@ public static String serialize(UUri uuri, boolean includeScheme) {
      * @throws IllegalArgumentException if the URI is invalid.
      */
     // [impl->dsn~uri-scheme~1]
-    // [impl->dsn~uri-path-mapping~1]
+    // [impl->dsn~uri-path-mapping~2]
     // [impl->req~uri-serialization~1]
     // [impl->dsn~uri-authority-mapping~1]
     public static UUri deserialize(String uProtocolUri) {
@@ -120,7 +120,7 @@ public static UUri deserialize(String uProtocolUri) {
      * @throws IllegalArgumentException if the URI is invalid.
      */
     // [impl->dsn~uri-scheme~1]
-    // [impl->dsn~uri-path-mapping~1]
+    // [impl->dsn~uri-path-mapping~2]
     // [impl->req~uri-serialization~1]
     // [impl->dsn~uri-authority-mapping~1]
     public static UUri deserialize(URI uProtocolUri) {

src/main/java/org/eclipse/uprotocol/uuid/factory/UuidFactory.java

@@ -21,7 +21,7 @@
 /**
  * A factory for creating uProtocol UUIDs.
  *
- * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/basics/uuid.adoc">
+ * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/basics/uuid.adoc">
  * uProtocol UUID Specification</a>
  */
 // [impl->dsn~uuid-spec~1]

src/main/java/org/eclipse/uprotocol/uuid/factory/UuidUtils.java

@@ -57,7 +57,7 @@ private static boolean isRfc9562Variant(UUID uuid) {
      * @return {@code true} if is a uProtocol UUID or {@code false} if uuid is {@code null}
      *         or is not a v7 UUID.
      * @see <a href="https://www.rfc-editor.org/rfc/rfc9562.html">RFC 9562</a>
-     * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.6/basics/uuid.adoc">
+     * @see <a href="https://github.com/eclipse-uprotocol/up-spec/blob/v1.6.0-alpha.7/basics/uuid.adoc">
      * uProtocol UUID specification</a>
      */
     public static boolean isUProtocol(UUID uuid) {

src/test/java/org/eclipse/uprotocol/uri/UuriTests.java

@@ -22,7 +22,6 @@
 import org.eclipse.uprotocol.v1.UUri;
 import org.junit.platform.suite.api.ConfigurationParameter;
 import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectClasspathResource;
 import org.junit.platform.suite.api.SelectFile;
 import org.junit.platform.suite.api.Suite;
 
@@ -38,17 +37,11 @@
 @Suite
 @IncludeEngines("cucumber")
 // [utest->dsn~uri-pattern-matching~2]
-// TODO: replace with feature from up-spec once the referenced version contains fixes
-// see https://github.com/eclipse-uprotocol/up-spec/issues/302
-// @SelectFile("up-spec/basics/uuri_pattern_matching.feature")
-@SelectClasspathResource("features/uuri_pattern_matching.feature")
+@SelectFile("up-spec/basics/uuri_pattern_matching.feature")
 // [utest->req~uri-data-model-proto~1]
 @SelectFile("up-spec/basics/uuri_protobuf_serialization.feature")
 // [utest->req~uri-serialization~1]
-// TODO: replace with feature from up-spec once the referenced version contains missing examples
-// see https://github.com/eclipse-uprotocol/up-spec/issues/300
-// @SelectFile("up-spec/basics/uuri_uri_serialization.feature")
-@SelectClasspathResource("features/uuri_uri_serialization.feature")
+@SelectFile("up-spec/basics/uuri_uri_serialization.feature")
 @ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.eclipse.uprotocol.uri")
 public class UuriTests {
 

src/test/java/org/eclipse/uprotocol/uuid/UuidTests.java

@@ -34,7 +34,7 @@
 @Suite
 @IncludeEngines("cucumber")
 // [utest->req~uuid-proto~1]
-// @SelectFile("up-spec/basics/uuid_protobuf_serialization.feature")
+@SelectFile("up-spec/basics/uuid_protobuf_serialization.feature")
 // [utest->req~uuid-hex-and-dash~1]
 @SelectFile("up-spec/basics/uuid_string_serialization.feature")
 @ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.eclipse.uprotocol.uuid")