Merge branch 'release/0.14'

Author: jfallows

pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.reaktivity</groupId>
   <artifactId>nukleus-proxy</artifactId>
-  <version>0.13</version>
+  <version>0.14</version>
   <name>Proxy Nukleus Implementation</name>
   <description>Proxy Nukleus Implementation</description>
   <url>https://github.com/reaktivity/nukleus-proxy.java</url>
@@ -62,7 +62,7 @@
 
     <nukleus.plugin.version>0.85</nukleus.plugin.version>
 
-    <nukleus.proxy.spec.version>0.17</nukleus.proxy.spec.version>
+    <nukleus.proxy.spec.version>0.18</nukleus.proxy.spec.version>
     <reaktor.version>0.171</reaktor.version>
   </properties>
   <dependencies>

src/main/java/org/reaktivity/nukleus/proxy/internal/stream/ProxyServerFactory.java

@@ -1270,6 +1270,7 @@ private int decodeHeader(
         decode:
         if (length >= HEADER_V2_SIZE)
         {
+            int anchor = progress;
             DirectBuffer header = headerRO;
             header.wrap(buffer, progress, HEADER_V2_SIZE);
             if (!HEADER_V2.equals(header))
@@ -1279,6 +1280,9 @@ private int decodeHeader(
             }
 
             progress += HEADER_V2_SIZE;
+
+            updateCRC32C(net.crc32c, buffer, anchor, progress - anchor);
+
             net.decoder = decodeVersion;
         }
 
@@ -1333,23 +1337,25 @@ private int decodeCommand(
         decode:
         if (length > 0)
         {
+            int anchor = progress;
             int command = buffer.getByte(progress) & 0x0f;
 
+            progress++;
+
+            updateCRC32C(net.crc32c, buffer, anchor, progress - anchor);
+
             switch (command)
             {
             case 0:
-                progress++;
                 net.decoder = decodeLocal;
                 break;
             case 1:
-                progress++;
                 net.decoder = decodeProxy;
                 break;
             default:
                 net.cleanup(traceId, authorization);
                 break decode;
             }
-
         }
 
         return progress;

src/main/moditect/module-info.java

@@ -17,9 +17,12 @@
 {
     requires org.reaktivity.reaktor;
 
-    provides org.reaktivity.nukleus.NukleusFactorySpi
+    provides org.reaktivity.reaktor.nukleus.NukleusFactorySpi
         with org.reaktivity.nukleus.proxy.internal.ProxyNukleusFactorySpi;
 
-    provides org.reaktivity.nukleus.ControllerFactorySpi
-        with org.reaktivity.nukleus.proxy.internal.ProxyControllerFactorySpi;
+    provides org.reaktivity.reaktor.config.OptionsAdapterSpi
+        with org.reaktivity.nukleus.proxy.internal.config.ProxyOptionsAdapter;
+
+    provides org.reaktivity.reaktor.config.ConditionAdapterSpi
+        with org.reaktivity.nukleus.proxy.internal.config.ProxyConditionAdapter;
 }