Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support zilla.yaml config reader and writer #323

Merged
merged 6 commits into from
Aug 3, 2023
Merged

Support zilla.yaml config reader and writer #323

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67f9fa6
Implement config reader and writer
jfallows Aug 2, 2023
755bc32
Remove unused fields
jfallows Aug 2, 2023
719ab83
Export binding-specific config types
jfallows Aug 2, 2023
b653464
Export binding-specific config types
jfallows Aug 2, 2023
1ead10a
Export binding-specific config types
jfallows Aug 2, 2023
d57d477
Support config writer output to YAML syntax
jfallows Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Export binding-specific config types
  • Loading branch information
@jfallows
jfallows committed Aug 2, 2023
commit 719ab830709c5418fa2714b7c2f3d759097c342c
6 changes: 3 additions & 3 deletions ...ernal/config/HttpAccessControlConfig.java → .../http/config/HttpAccessControlConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.aklivity.zilla.runtime.binding.http.internal.config;
package io.aklivity.zilla.runtime.binding.http.config;

import static io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig.HttpPolicyConfig.CROSS_ORIGIN;
import static io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig.HttpPolicyConfig.SAME_ORIGIN;
import static io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig.HttpPolicyConfig.CROSS_ORIGIN;
import static io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig.HttpPolicyConfig.SAME_ORIGIN;
import static java.lang.ThreadLocal.withInitial;
import static java.util.Collections.unmodifiableSet;
import static java.util.regex.Pattern.CASE_INSENSITIVE;
Expand Down
2 changes: 1 addition & 1 deletion ...ernal/config/HttpAuthorizationConfig.java → .../http/config/HttpAuthorizationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.aklivity.zilla.runtime.binding.http.internal.config;
package io.aklivity.zilla.runtime.binding.http.config;

import java.util.List;
import java.util.function.Function;
Expand Down
2 changes: 1 addition & 1 deletion .../internal/config/HttpConditionConfig.java → ...ding/http/config/HttpConditionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.aklivity.zilla.runtime.binding.http.internal.config;
package io.aklivity.zilla.runtime.binding.http.config;

import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion ...tp/internal/config/HttpOptionsConfig.java → ...inding/http/config/HttpOptionsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.aklivity.zilla.runtime.binding.http.internal.config;
package io.aklivity.zilla.runtime.binding.http.config;

import java.util.Map;
import java.util.SortedSet;
Expand Down
2 changes: 1 addition & 1 deletion ...ing/http/internal/config/HttpVersion.java → ...time/binding/http/config/HttpVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.aklivity.zilla.runtime.binding.http.internal.config;
package io.aklivity.zilla.runtime.binding.http.config;

public enum HttpVersion
{
Expand Down
11 changes: 7 additions & 4 deletions ...c/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpBindingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package io.aklivity.zilla.runtime.binding.http.internal.config;

import static io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig.HttpPolicyConfig.SAME_ORIGIN;
import static io.aklivity.zilla.runtime.binding.http.internal.config.HttpAuthorizationConfig.DEFAULT_CREDENTIALS;
import static io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig.HttpPolicyConfig.SAME_ORIGIN;
import static io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig.DEFAULT_CREDENTIALS;
import static java.util.EnumSet.allOf;
import static java.util.stream.Collectors.toList;

Expand All @@ -28,8 +28,11 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import io.aklivity.zilla.runtime.binding.http.internal.config.HttpAuthorizationConfig.HttpCredentialsConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpAuthorizationConfig.HttpPatternConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig.HttpCredentialsConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig.HttpPatternConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpOptionsConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpVersion;
import io.aklivity.zilla.runtime.engine.config.BindingConfig;
import io.aklivity.zilla.runtime.engine.config.KindConfig;

Expand Down
1 change: 1 addition & 0 deletions ...va/io/aklivity/zilla/runtime/binding/http/internal/config/HttpConditionConfigAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import jakarta.json.JsonString;
import jakarta.json.bind.adapter.JsonbAdapter;

import io.aklivity.zilla.runtime.binding.http.config.HttpConditionConfig;
import io.aklivity.zilla.runtime.binding.http.internal.HttpBinding;
import io.aklivity.zilla.runtime.engine.config.ConditionConfig;
import io.aklivity.zilla.runtime.engine.config.ConditionConfigAdapterSpi;
Expand Down
2 changes: 2 additions & 0 deletions ...ain/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpConditionMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import io.aklivity.zilla.runtime.binding.http.config.HttpConditionConfig;

public final class HttpConditionMatcher
{
private final Map<String, Matcher> headersMatch;
Expand Down
16 changes: 10 additions & 6 deletions ...java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpOptionsConfigAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package io.aklivity.zilla.runtime.binding.http.internal.config;

import static io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig.HttpPolicyConfig.CROSS_ORIGIN;
import static io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig.HttpPolicyConfig.SAME_ORIGIN;
import static io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig.HttpPolicyConfig.CROSS_ORIGIN;
import static io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig.HttpPolicyConfig.SAME_ORIGIN;

import java.time.Duration;
import java.util.ArrayList;
Expand All @@ -37,11 +37,15 @@
import jakarta.json.JsonString;
import jakarta.json.bind.adapter.JsonbAdapter;

import io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig.HttpAllowConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig.HttpExposeConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig.HttpCredentialsConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig.HttpPatternConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpOptionsConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpVersion;
import io.aklivity.zilla.runtime.binding.http.internal.HttpBinding;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig.HttpAllowConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig.HttpExposeConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpAuthorizationConfig.HttpCredentialsConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpAuthorizationConfig.HttpPatternConfig;
import io.aklivity.zilla.runtime.binding.http.internal.types.String16FW;
import io.aklivity.zilla.runtime.binding.http.internal.types.String8FW;
import io.aklivity.zilla.runtime.engine.config.OptionsConfig;
Expand Down
1 change: 1 addition & 0 deletions ...src/main/java/io/aklivity/zilla/runtime/binding/http/internal/config/HttpRouteConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.function.Function;
import java.util.function.LongPredicate;

import io.aklivity.zilla.runtime.binding.http.config.HttpConditionConfig;
import io.aklivity.zilla.runtime.engine.config.OptionsConfig;
import io.aklivity.zilla.runtime.engine.config.RouteConfig;

Expand Down
6 changes: 3 additions & 3 deletions ...c/main/java/io/aklivity/zilla/runtime/binding/http/internal/stream/HttpClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package io.aklivity.zilla.runtime.binding.http.internal.stream;

import static io.aklivity.zilla.runtime.binding.http.internal.config.HttpVersion.HTTP_1_1;
import static io.aklivity.zilla.runtime.binding.http.internal.config.HttpVersion.HTTP_2;
import static io.aklivity.zilla.runtime.binding.http.config.HttpVersion.HTTP_1_1;
import static io.aklivity.zilla.runtime.binding.http.config.HttpVersion.HTTP_2;
import static io.aklivity.zilla.runtime.binding.http.internal.hpack.HpackContext.TE;
import static io.aklivity.zilla.runtime.binding.http.internal.hpack.HpackContext.TRAILERS;
import static io.aklivity.zilla.runtime.binding.http.internal.hpack.HpackHeaderFieldFW.HeaderFieldType.UNKNOWN;
Expand Down Expand Up @@ -63,6 +63,7 @@
import org.agrona.collections.MutableInteger;
import org.agrona.concurrent.UnsafeBuffer;

import io.aklivity.zilla.runtime.binding.http.config.HttpVersion;
import io.aklivity.zilla.runtime.binding.http.internal.HttpBinding;
import io.aklivity.zilla.runtime.binding.http.internal.HttpConfiguration;
import io.aklivity.zilla.runtime.binding.http.internal.codec.Http2ContinuationFW;
Expand All @@ -82,7 +83,6 @@
import io.aklivity.zilla.runtime.binding.http.internal.codec.Http2WindowUpdateFW;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpBindingConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpRouteConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpVersion;
import io.aklivity.zilla.runtime.binding.http.internal.hpack.HpackContext;
import io.aklivity.zilla.runtime.binding.http.internal.hpack.HpackHeaderBlockFW;
import io.aklivity.zilla.runtime.binding.http.internal.hpack.HpackHeaderFieldFW;
Expand Down
8 changes: 4 additions & 4 deletions ...c/main/java/io/aklivity/zilla/runtime/binding/http/internal/stream/HttpServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package io.aklivity.zilla.runtime.binding.http.internal.stream;

import static io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig.HttpPolicyConfig.CROSS_ORIGIN;
import static io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig.HttpPolicyConfig.CROSS_ORIGIN;
import static io.aklivity.zilla.runtime.binding.http.internal.hpack.HpackContext.CONNECTION;
import static io.aklivity.zilla.runtime.binding.http.internal.hpack.HpackContext.KEEP_ALIVE;
import static io.aklivity.zilla.runtime.binding.http.internal.hpack.HpackContext.PROXY_CONNECTION;
Expand Down Expand Up @@ -79,6 +79,9 @@
import org.agrona.concurrent.AtomicBuffer;
import org.agrona.concurrent.UnsafeBuffer;

import io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig.HttpPolicyConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpVersion;
import io.aklivity.zilla.runtime.binding.http.internal.HttpBinding;
import io.aklivity.zilla.runtime.binding.http.internal.HttpConfiguration;
import io.aklivity.zilla.runtime.binding.http.internal.codec.Http2ContinuationFW;
Expand All @@ -96,11 +99,8 @@
import io.aklivity.zilla.runtime.binding.http.internal.codec.Http2Setting;
import io.aklivity.zilla.runtime.binding.http.internal.codec.Http2SettingsFW;
import io.aklivity.zilla.runtime.binding.http.internal.codec.Http2WindowUpdateFW;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig.HttpPolicyConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpBindingConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpRouteConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpVersion;
import io.aklivity.zilla.runtime.binding.http.internal.hpack.HpackContext;
import io.aklivity.zilla.runtime.binding.http.internal.hpack.HpackHeaderBlockFW;
import io.aklivity.zilla.runtime.binding.http.internal.hpack.HpackHeaderFieldFW;
Expand Down
2 changes: 2 additions & 0 deletions runtime/binding-http/src/main/moditect/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
{
requires io.aklivity.zilla.runtime.engine;

exports io.aklivity.zilla.runtime.binding.http.config;

provides io.aklivity.zilla.runtime.engine.binding.BindingFactorySpi
with io.aklivity.zilla.runtime.binding.http.internal.HttpBindingFactorySpi;

Expand Down
2 changes: 2 additions & 0 deletions ...o/aklivity/zilla/runtime/binding/http/internal/config/HttpConditionConfigAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
import org.junit.Before;
import org.junit.Test;

import io.aklivity.zilla.runtime.binding.http.config.HttpConditionConfig;

public class HttpConditionConfigAdapterTest
{
private Jsonb jsonb;
Expand Down
14 changes: 9 additions & 5 deletions .../io/aklivity/zilla/runtime/binding/http/internal/config/HttpOptionsConfigAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package io.aklivity.zilla.runtime.binding.http.internal.config;

import static io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig.HttpPolicyConfig.CROSS_ORIGIN;
import static io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig.HttpPolicyConfig.CROSS_ORIGIN;
import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
import static java.util.Collections.singletonMap;
Expand All @@ -37,10 +37,14 @@
import org.junit.Before;
import org.junit.Test;

import io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig.HttpAllowConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpAccessControlConfig.HttpExposeConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpAuthorizationConfig.HttpCredentialsConfig;
import io.aklivity.zilla.runtime.binding.http.internal.config.HttpAuthorizationConfig.HttpPatternConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig.HttpAllowConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAccessControlConfig.HttpExposeConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig.HttpCredentialsConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig.HttpPatternConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpOptionsConfig;
import io.aklivity.zilla.runtime.binding.http.config.HttpVersion;
import io.aklivity.zilla.runtime.binding.http.internal.types.String16FW;
import io.aklivity.zilla.runtime.binding.http.internal.types.String8FW;

Expand Down
2 changes: 1 addition & 1 deletion ...p/internal/config/TcpConditionConfig.java → ...inding/tcp/config/TcpConditionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.aklivity.zilla.runtime.binding.tcp.internal.config;
package io.aklivity.zilla.runtime.binding.tcp.config;

import io.aklivity.zilla.runtime.engine.config.ConditionConfig;

Expand Down
2 changes: 1 addition & 1 deletion ...tcp/internal/config/TcpOptionsConfig.java → .../binding/tcp/config/TcpOptionsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.aklivity.zilla.runtime.binding.tcp.internal.config;
package io.aklivity.zilla.runtime.binding.tcp.config;

import io.aklivity.zilla.runtime.engine.config.OptionsConfig;

Expand Down
1 change: 1 addition & 0 deletions ...src/main/java/io/aklivity/zilla/runtime/binding/tcp/internal/config/TcpBindingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.net.InetSocketAddress;
import java.util.List;

import io.aklivity.zilla.runtime.binding.tcp.config.TcpOptionsConfig;
import io.aklivity.zilla.runtime.engine.config.BindingConfig;
import io.aklivity.zilla.runtime.engine.config.KindConfig;
import io.aklivity.zilla.runtime.engine.config.RouteConfig;
Expand Down
1 change: 1 addition & 0 deletions ...java/io/aklivity/zilla/runtime/binding/tcp/internal/config/TcpConditionConfigAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.agrona.collections.IntHashSet;
import org.agrona.collections.MutableInteger;

import io.aklivity.zilla.runtime.binding.tcp.config.TcpConditionConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.TcpBinding;
import io.aklivity.zilla.runtime.engine.config.ConditionConfig;
import io.aklivity.zilla.runtime.engine.config.ConditionConfigAdapterSpi;
Expand Down
1 change: 1 addition & 0 deletions .../main/java/io/aklivity/zilla/runtime/binding/tcp/internal/config/TcpConditionMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import org.agrona.collections.IntHashSet;

import io.aklivity.zilla.runtime.binding.tcp.config.TcpConditionConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.util.Cidr;

public final class TcpConditionMatcher
Expand Down
1 change: 1 addition & 0 deletions ...n/java/io/aklivity/zilla/runtime/binding/tcp/internal/config/TcpOptionsConfigAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.agrona.collections.IntHashSet;
import org.agrona.collections.MutableInteger;

import io.aklivity.zilla.runtime.binding.tcp.config.TcpOptionsConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.TcpBinding;
import io.aklivity.zilla.runtime.engine.config.OptionsConfig;
import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi;
Expand Down
1 change: 1 addition & 0 deletions ...p/src/main/java/io/aklivity/zilla/runtime/binding/tcp/internal/config/TcpRouteConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.function.LongPredicate;
import java.util.function.Predicate;

import io.aklivity.zilla.runtime.binding.tcp.config.TcpConditionConfig;
import io.aklivity.zilla.runtime.engine.config.RouteConfig;

public final class TcpRouteConfig
Expand Down
2 changes: 2 additions & 0 deletions ...in/java/io/aklivity/zilla/runtime/binding/tcp/internal/config/TcpServerBindingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@

import org.agrona.LangUtil;

import io.aklivity.zilla.runtime.binding.tcp.config.TcpOptionsConfig;

public final class TcpServerBindingConfig
{
public final long id;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/io/aklivity/zilla/runtime/binding/tcp/internal/stream/TcpClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
import org.agrona.MutableDirectBuffer;
import org.agrona.concurrent.UnsafeBuffer;

import io.aklivity.zilla.runtime.binding.tcp.config.TcpOptionsConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.TcpConfiguration;
import io.aklivity.zilla.runtime.binding.tcp.internal.config.TcpBindingConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.config.TcpOptionsConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.types.Flyweight;
import io.aklivity.zilla.runtime.binding.tcp.internal.types.OctetsFW;
import io.aklivity.zilla.runtime.binding.tcp.internal.types.stream.AbortFW;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/io/aklivity/zilla/runtime/binding/tcp/internal/stream/TcpClientRouter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

import org.agrona.collections.Long2ObjectHashMap;

import io.aklivity.zilla.runtime.binding.tcp.config.TcpOptionsConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.config.TcpBindingConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.config.TcpOptionsConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.config.TcpRouteConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.types.Array32FW;
import io.aklivity.zilla.runtime.binding.tcp.internal.types.OctetsFW;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/io/aklivity/zilla/runtime/binding/tcp/internal/stream/TcpServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
import org.agrona.MutableDirectBuffer;
import org.agrona.concurrent.UnsafeBuffer;

import io.aklivity.zilla.runtime.binding.tcp.config.TcpOptionsConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.TcpConfiguration;
import io.aklivity.zilla.runtime.binding.tcp.internal.config.TcpBindingConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.config.TcpOptionsConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.config.TcpRouteConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.config.TcpServerBindingConfig;
import io.aklivity.zilla.runtime.binding.tcp.internal.types.Flyweight;
Expand Down
2 changes: 2 additions & 0 deletions runtime/binding-tcp/src/main/moditect/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
{
requires io.aklivity.zilla.runtime.engine;

exports io.aklivity.zilla.runtime.binding.tcp.config;

provides io.aklivity.zilla.runtime.engine.binding.BindingFactorySpi
with io.aklivity.zilla.runtime.binding.tcp.internal.TcpBindingFactorySpi;

Expand Down
2 changes: 2 additions & 0 deletions .../io/aklivity/zilla/runtime/binding/tcp/internal/config/TcpConditionConfigAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import org.junit.Before;
import org.junit.Test;

import io.aklivity.zilla.runtime.binding.tcp.config.TcpConditionConfig;

public class TcpConditionConfigAdapterTest
{
private Jsonb jsonb;
Expand Down
2 changes: 2 additions & 0 deletions ...va/io/aklivity/zilla/runtime/binding/tcp/internal/config/TcpOptionsConfigAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import org.junit.Before;
import org.junit.Test;

import io.aklivity.zilla.runtime.binding.tcp.config.TcpOptionsConfig;

public class TcpOptionsConfigAdapterTest
{
private Jsonb jsonb;
Expand Down
2 changes: 1 addition & 1 deletion ...s/internal/config/TlsConditionConfig.java → ...inding/tls/config/TlsConditionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.aklivity.zilla.runtime.binding.tls.internal.config;
package io.aklivity.zilla.runtime.binding.tls.config;

import io.aklivity.zilla.runtime.engine.config.ConditionConfig;

Expand Down
2 changes: 1 addition & 1 deletion ...inding/tls/internal/config/TlsMutual.java → ...runtime/binding/tls/config/TlsMutual.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.aklivity.zilla.runtime.binding.tls.internal.config;
package io.aklivity.zilla.runtime.binding.tls.config;

public enum TlsMutual
{
Expand Down
2 changes: 1 addition & 1 deletion ...tls/internal/config/TlsOptionsConfig.java → .../binding/tls/config/TlsOptionsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
package io.aklivity.zilla.runtime.binding.tls.internal.config;
package io.aklivity.zilla.runtime.binding.tls.config;

import java.util.List;

Expand Down
2 changes: 2 additions & 0 deletions ...src/main/java/io/aklivity/zilla/runtime/binding/tls/internal/config/TlsBindingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@

import org.agrona.LangUtil;

import io.aklivity.zilla.runtime.binding.tls.config.TlsMutual;
import io.aklivity.zilla.runtime.binding.tls.config.TlsOptionsConfig;
import io.aklivity.zilla.runtime.binding.tls.internal.TlsConfiguration;
import io.aklivity.zilla.runtime.binding.tls.internal.identity.TlsClientX509ExtendedKeyManager;
import io.aklivity.zilla.runtime.binding.tls.internal.types.Array32FW;
Expand Down
Loading