From d039d8f24e274efbcad35da290af1e38a9bf2799 Mon Sep 17 00:00:00 2001 From: jaguililla Date: Fri, 23 Aug 2024 00:53:31 +0200 Subject: [PATCH] Rename modules and packages --- README.md | 24 +- core/README.md | 20 +- core/api/core.api | 308 +++---- .../main/kotlin/com/hexagonkt/core/Checks.kt | 2 +- .../com/hexagonkt/core/ClasspathHandler.kt | 4 +- .../core/ClasspathHandlerProvider.kt | 2 +- .../com/hexagonkt/core/CodedException.kt | 2 +- .../main/kotlin/com/hexagonkt/core/Data.kt | 2 +- .../main/kotlin/com/hexagonkt/core/Dates.kt | 2 +- .../kotlin/com/hexagonkt/core/Exceptions.kt | 4 +- .../main/kotlin/com/hexagonkt/core/Helpers.kt | 4 +- .../main/kotlin/com/hexagonkt/core/I18n.kt | 2 +- .../src/main/kotlin/com/hexagonkt/core/Jvm.kt | 6 +- .../com/hexagonkt/core/MapResourceBundle.kt | 2 +- .../com/hexagonkt/core/MultipleException.kt | 2 +- .../main/kotlin/com/hexagonkt/core/Network.kt | 2 +- .../main/kotlin/com/hexagonkt/core/OsKind.kt | 2 +- .../core/ResourceNotFoundException.kt | 2 +- .../main/kotlin/com/hexagonkt/core/Uuids.kt | 6 +- .../com/hexagonkt/core/logging/Logger.kt | 6 +- .../com/hexagonkt/core/logging/Logging.kt | 15 +- .../com/hexagonkt/core/media/MediaType.kt | 6 +- .../hexagonkt/core/media/MediaTypeGroup.kt | 2 +- .../com/hexagonkt/core/media/MediaTypes.kt | 4 +- .../com/hexagonkt/core/security/Crypto.kt | 2 +- .../com/hexagonkt/core/security/KeyStores.kt | 2 +- .../kotlin/com/hexagonkt/core/text/Ansi.kt | 2 +- .../com/hexagonkt/core/text/AnsiColor.kt | 4 +- .../com/hexagonkt/core/text/AnsiEffect.kt | 2 +- .../kotlin/com/hexagonkt/core/text/Cases.kt | 2 +- .../kotlin/com/hexagonkt/core/text/Glob.kt | 2 +- .../kotlin/com/hexagonkt/core/text/Strings.kt | 6 +- core/src/main/kotlin/module-info.java | 14 +- .../core/native-image.properties | 6 +- .../java.net.spi.URLStreamHandlerProvider | 2 +- .../kotlin/com/hexagonkt/core/ChecksTest.kt | 2 +- .../core/ClasspathHandlerProviderTest.kt | 2 +- .../com/hexagonkt/core/CodedExceptionTest.kt | 2 +- .../kotlin/com/hexagonkt/core/CoreTest.kt | 2 +- .../kotlin/com/hexagonkt/core/DataTest.kt | 2 +- .../kotlin/com/hexagonkt/core/DatesTest.kt | 2 +- .../com/hexagonkt/core/ExceptionsTest.kt | 10 +- .../kotlin/com/hexagonkt/core/HelpersTest.kt | 4 +- .../kotlin/com/hexagonkt/core/I18nTest.kt | 2 +- .../test/kotlin/com/hexagonkt/core/JvmTest.kt | 2 +- .../hexagonkt/core/MapResourceBundleTest.kt | 2 +- .../hexagonkt/core/MultipleExceptionTest.kt | 2 +- .../kotlin/com/hexagonkt/core/NetworkTest.kt | 2 +- .../kotlin/com/hexagonkt/core/UuidsTest.kt | 2 +- .../com/hexagonkt/core/logging/LoggerTest.kt | 14 +- .../com/hexagonkt/core/logging/LoggingTest.kt | 4 +- .../com/hexagonkt/core/media/MediaTypeTest.kt | 4 +- .../hexagonkt/core/media/MediaTypesTest.kt | 6 +- .../com/hexagonkt/core/security/CryptoTest.kt | 2 +- .../hexagonkt/core/security/KeyStoresTest.kt | 4 +- .../com/hexagonkt/core/text/AnsiTest.kt | 18 +- .../com/hexagonkt/core/text/CasesTest.kt | 4 +- .../com/hexagonkt/core/text/GlobTest.kt | 2 +- .../com/hexagonkt/core/text/StringsTest.kt | 14 +- core/src/test/resources/build.properties | 2 +- core/src/test/resources/sample.properties | 2 +- gradle.properties | 4 +- handlers/README.md | 6 +- handlers/api/handlers.api | 68 +- .../com/hexagonkt/handlers/JmhBenchmark.kt | 2 +- .../com/hexagonkt/handlers/AfterHandler.kt | 2 +- .../com/hexagonkt/handlers/BeforeHandler.kt | 2 +- .../com/hexagonkt/handlers/ChainHandler.kt | 2 +- .../kotlin/com/hexagonkt/handlers/Context.kt | 2 +- .../hexagonkt/handlers/ExceptionHandler.kt | 2 +- .../com/hexagonkt/handlers/FilterHandler.kt | 2 +- .../kotlin/com/hexagonkt/handlers/Handler.kt | 2 +- .../kotlin/com/hexagonkt/handlers/Handlers.kt | 2 +- .../com/hexagonkt/handlers/OnHandler.kt | 2 +- handlers/src/main/kotlin/module-info.java | 4 +- .../hexagonkt/handlers/ChainHandlerTest.kt | 4 +- .../com/hexagonkt/handlers/EventContext.kt | 2 +- .../handlers/ExceptionHandlerTest.kt | 2 +- .../com/hexagonkt/handlers/HandlerTest.kt | 2 +- .../com/hexagonkt/handlers/HandlersTest.kt | 2 +- .../com/hexagonkt/handlers/OnHandlerTest.kt | 4 +- http/http/README.md | 8 +- http/http/api/http.api | 770 +++++++++--------- .../main/kotlin/com/hexagonkt/http/Http.kt | 16 +- .../kotlin/com/hexagonkt/http/SslSettings.kt | 2 +- .../com/hexagonkt/http/model/Authorization.kt | 2 +- .../com/hexagonkt/http/model/ContentType.kt | 6 +- .../kotlin/com/hexagonkt/http/model/Cookie.kt | 2 +- .../hexagonkt/http/model/CookieSameSite.kt | 2 +- .../com/hexagonkt/http/model/FormParameter.kt | 2 +- .../hexagonkt/http/model/FormParameters.kt | 2 +- .../kotlin/com/hexagonkt/http/model/Header.kt | 2 +- .../com/hexagonkt/http/model/Headers.kt | 2 +- .../com/hexagonkt/http/model/HttpBase.kt | 2 +- .../com/hexagonkt/http/model/HttpCall.kt | 2 +- .../com/hexagonkt/http/model/HttpField.kt | 2 +- .../com/hexagonkt/http/model/HttpMessage.kt | 2 +- .../com/hexagonkt/http/model/HttpMethod.kt | 2 +- .../com/hexagonkt/http/model/HttpPart.kt | 2 +- .../com/hexagonkt/http/model/HttpProtocol.kt | 2 +- .../com/hexagonkt/http/model/HttpRequest.kt | 8 +- .../hexagonkt/http/model/HttpRequestPort.kt | 6 +- .../com/hexagonkt/http/model/HttpResponse.kt | 6 +- .../hexagonkt/http/model/HttpResponsePort.kt | 4 +- .../com/hexagonkt/http/model/HttpStatus.kt | 6 +- .../hexagonkt/http/model/HttpStatusType.kt | 2 +- .../com/hexagonkt/http/model/HttpStatuses.kt | 4 +- .../hexagonkt/http/model/QueryParameter.kt | 2 +- .../hexagonkt/http/model/QueryParameters.kt | 2 +- .../com/hexagonkt/http/model/ServerEvent.kt | 2 +- .../hexagonkt/http/model/ws/CloseStatuses.kt | 2 +- .../com/hexagonkt/http/model/ws/WsSession.kt | 4 +- .../http/patterns/LiteralPathPattern.kt | 2 +- .../hexagonkt/http/patterns/PathPattern.kt | 2 +- .../hexagonkt/http/patterns/PathPatterns.kt | 6 +- .../http/patterns/RegexPathPattern.kt | 8 +- .../http/patterns/TemplatePathPattern.kt | 2 +- .../http/patterns/WildcardPathPattern.kt | 4 +- http/http/src/main/kotlin/module-info.java | 12 +- .../kotlin/com/hexagonkt/http/HttpTest.kt | 16 +- .../com/hexagonkt/http/SslSettingsTest.kt | 2 +- .../hexagonkt/http/model/ContentTypeTest.kt | 6 +- .../com/hexagonkt/http/model/CookieTest.kt | 4 +- .../http/model/FormParametersTest.kt | 4 +- .../com/hexagonkt/http/model/HeadersTest.kt | 4 +- .../com/hexagonkt/http/model/HttpCallTest.kt | 10 +- .../com/hexagonkt/http/model/HttpFieldTest.kt | 2 +- .../hexagonkt/http/model/HttpMethodTest.kt | 2 +- .../com/hexagonkt/http/model/HttpPartTest.kt | 8 +- .../hexagonkt/http/model/HttpProtocolTest.kt | 4 +- .../hexagonkt/http/model/HttpRequestTest.kt | 24 +- .../hexagonkt/http/model/HttpResponseTest.kt | 6 +- .../hexagonkt/http/model/HttpStatusTest.kt | 4 +- .../hexagonkt/http/model/HttpStatusesTest.kt | 4 +- .../http/model/QueryParametersTest.kt | 4 +- .../hexagonkt/http/model/ServerEventTest.kt | 2 +- .../http/model/ws/WebSocketModelTest.kt | 6 +- .../http/patterns/LiteralPathPatternTest.kt | 2 +- .../http/patterns/PathPatternsTest.kt | 2 +- .../http/patterns/RegexPathPatternTest.kt | 4 +- .../http/patterns/TemplatePathPatternTest.kt | 2 +- .../http/patterns/WildcardPathPatternTest.kt | 2 +- http/http_client/README.md | 38 +- http/http_client/api/http_client.api | 92 +-- .../com/hexagonkt/http/client/HttpClient.kt | 22 +- .../hexagonkt/http/client/HttpClientPort.kt | 10 +- .../http/client/HttpClientSettings.kt | 6 +- .../src/main/kotlin/module-info.java | 6 +- .../hexagonkt/http/client/CheatSheetTest.kt | 2 +- .../http/client/HttpClientSettingsTest.kt | 4 +- .../hexagonkt/http/client/HttpClientTest.kt | 20 +- .../com/hexagonkt/http/client/VoidAdapter.kt | 6 +- http/http_client_java/README.md | 6 +- .../http_client_java/api/http_client_java.api | 14 +- .../http/client/java/JavaClientAdapter.kt | 34 +- .../src/main/kotlin/module-info.java | 8 +- .../http/client/java/AdapterExamplesTest.kt | 12 +- .../http/client/java/JavaClientAdapterTest.kt | 6 +- http/http_client_jetty/README.md | 6 +- .../api/http_client_jetty.api | 16 +- .../http/client/jetty/JettyClientAdapter.kt | 28 +- .../src/main/kotlin/module-info.java | 8 +- .../client/jetty/JettyClientAdapterTest.kt | 6 +- http/http_client_jetty_ws/README.md | 6 +- .../api/http_client_jetty_ws.api | 12 +- .../client/jetty/ws/JettyClientWsSession.kt | 6 +- .../client/jetty/ws/JettyWebSocketAdapter.kt | 4 +- .../client/jetty/ws/JettyWsClientAdapter.kt | 10 +- .../src/main/kotlin/module-info.java | 8 +- .../client/jetty/ws/JettyClientAdapterTest.kt | 6 +- http/http_handlers/README.md | 82 +- http/http_handlers/api/http_handlers.api | 500 ++++++------ .../hexagonkt/http/handlers/AfterHandler.kt | 12 +- .../hexagonkt/http/handlers/BeforeHandler.kt | 12 +- .../http/handlers/ExceptionHandler.kt | 8 +- .../hexagonkt/http/handlers/FilterHandler.kt | 12 +- .../hexagonkt/http/handlers/HandlerBuilder.kt | 8 +- .../com/hexagonkt/http/handlers/Handlers.kt | 12 +- .../hexagonkt/http/handlers/HttpCallback.kt | 2 +- .../hexagonkt/http/handlers/HttpContext.kt | 22 +- .../hexagonkt/http/handlers/HttpController.kt | 6 +- .../http/handlers/HttpExceptionCallback.kt | 2 +- .../hexagonkt/http/handlers/HttpHandler.kt | 8 +- .../hexagonkt/http/handlers/HttpPredicate.kt | 20 +- .../com/hexagonkt/http/handlers/OnHandler.kt | 12 +- .../hexagonkt/http/handlers/PathHandler.kt | 18 +- .../src/main/kotlin/module-info.java | 8 +- .../http/handlers/AfterHandlerTest.kt | 4 +- .../http/handlers/BeforeHandlerTest.kt | 6 +- .../com/hexagonkt/http/handlers/BooksTest.kt | 16 +- .../com/hexagonkt/http/handlers/ErrorsTest.kt | 14 +- .../com/hexagonkt/http/handlers/Examples.kt | 8 +- .../http/handlers/FilterHandlerTest.kt | 4 +- .../hexagonkt/http/handlers/FiltersTest.kt | 18 +- .../http/handlers/HandlerBuilderTest.kt | 16 +- .../hexagonkt/http/handlers/HandlersTest.kt | 10 +- .../http/handlers/HttpContextTest.kt | 28 +- .../http/handlers/HttpControllerTest.kt | 4 +- .../http/handlers/HttpPredicateTest.kt | 22 +- .../hexagonkt/http/handlers/HttpServerTest.kt | 18 +- .../hexagonkt/http/handlers/OnHandlerTest.kt | 6 +- .../http/handlers/PathHandlerTest.kt | 6 +- .../hexagonkt/http/handlers/RoutingTest.kt | 8 +- .../http/handlers/ServerSentEventsTest.kt | 16 +- http/http_server/README.md | 82 +- http/http_server/api/http_server.api | 124 +-- .../http/server/callbacks/DateBenchmark.kt | 8 +- .../com/hexagonkt/http/server/HttpServer.kt | 50 +- .../http/server/HttpServerFeature.kt | 2 +- .../hexagonkt/http/server/HttpServerPort.kt | 4 +- .../http/server/HttpServerSettings.kt | 12 +- .../com/hexagonkt/http/server/HttpServers.kt | 6 +- .../http/server/callbacks/CorsCallback.kt | 16 +- .../http/server/callbacks/DateCallback.kt | 8 +- .../http/server/callbacks/FileCallback.kt | 12 +- .../http/server/callbacks/LoggingCallback.kt | 8 +- .../http/server/callbacks/UrlCallback.kt | 18 +- .../http/server/handlers/CorsHandler.kt | 18 +- .../src/main/kotlin/module-info.java | 10 +- .../hexagonkt/http/server/CheatSheetTest.kt | 2 +- .../http/server/HttpServerSettingsTest.kt | 6 +- .../hexagonkt/http/server/HttpServerTest.kt | 8 +- .../com/hexagonkt/http/server/VoidAdapter.kt | 8 +- .../http/server/callbacks/CorsCallbackTest.kt | 4 +- .../http/server/callbacks/DateCallbackTest.kt | 10 +- .../http/server/callbacks/FileCallbackTest.kt | 12 +- .../server/callbacks/LoggingCallbackTest.kt | 20 +- .../http/server/callbacks/UrlCallbackTest.kt | 12 +- http/http_server_helidon/README.md | 6 +- .../api/http_server_helidon.api | 52 +- .../hexagonkt/http/server/helidon/Helidon.kt | 8 +- .../server/helidon/HelidonRequestAdapter.kt | 10 +- .../server/helidon/HelidonServerAdapter.kt | 34 +- .../src/main/kotlin/module-info.java | 8 +- .../server/helidon/AdapterExamplesTest.kt | 12 +- http/http_server_jetty/README.md | 6 +- .../api/http_server_jetty.api | 14 +- .../com/hexagonkt/http/server/jetty/Jetty.kt | 8 +- .../http/server/jetty/JettyServletAdapter.kt | 24 +- .../src/main/kotlin/module-info.java | 10 +- .../http/server/jetty/AdapterExamplesTest.kt | 12 +- .../http/server/jetty/HelloWorldTest.kt | 20 +- .../http/server/jetty/JettyPocWsServerTest.kt | 20 +- .../server/jetty/JettyServletAdapterTest.kt | 18 +- http/http_server_netty/README.md | 6 +- .../api/http_server_netty.api | 52 +- .../server/netty/HttpChannelInitializer.kt | 6 +- .../server/netty/HttpsChannelInitializer.kt | 8 +- .../com/hexagonkt/http/server/netty/Netty.kt | 8 +- .../http/server/netty/NettyRequestAdapter.kt | 16 +- .../http/server/netty/NettyServerAdapter.kt | 30 +- .../http/server/netty/NettyServerHandler.kt | 24 +- .../server/netty/NettyWebSocketHandler.kt | 4 +- .../http/server/netty/NettyWsSession.kt | 8 +- .../src/main/kotlin/module-info.java | 8 +- .../http/server/netty/AdapterExamplesTest.kt | 12 +- .../server/netty/NettyServerHandlerTest.kt | 4 +- .../hexagonkt/http/server/netty/WebSocket.kt | 14 +- .../server/netty/poc/NettyWsClientTest.kt | 4 +- http/http_server_netty_epoll/README.md | 6 +- .../api/http_server_netty_epoll.api | 2 +- .../netty/epoll/NettyEpollServerAdapter.kt | 8 +- .../src/main/kotlin/module-info.java | 6 +- .../server/netty/epoll/AdapterExamplesTest.kt | 12 +- http/http_server_servlet/README.md | 6 +- .../api/http_server_servlet.api | 10 +- .../http/server/servlet/ServletFilter.kt | 16 +- .../server/servlet/ServletRequestAdapter.kt | 8 +- .../servlet/ServletRequestAdapterSync.kt | 6 +- .../http/server/servlet/ServletServer.kt | 30 +- .../src/main/kotlin/module-info.java | 8 +- .../http/server/servlet/ServletServerTest.kt | 14 +- http/http_test/README.md | 10 +- .../com/hexagonkt/http/test/BaseTest.kt | 24 +- .../http/test/examples/BenchmarkIT.kt | 8 +- .../http/test/examples/BenchmarkSimulation.kt | 2 +- .../hexagonkt/http/test/examples/BooksTest.kt | 28 +- .../http/test/examples/ClientCookiesTest.kt | 28 +- .../http/test/examples/ClientHttp2Test.kt | 38 +- .../http/test/examples/ClientHttpsTest.kt | 38 +- .../http/test/examples/ClientMultipartTest.kt | 26 +- .../http/test/examples/ClientTest.kt | 50 +- .../http/test/examples/CookiesTest.kt | 26 +- .../hexagonkt/http/test/examples/CorsTest.kt | 34 +- .../http/test/examples/ErrorsTest.kt | 26 +- .../hexagonkt/http/test/examples/FilesTest.kt | 36 +- .../http/test/examples/FiltersTest.kt | 36 +- .../hexagonkt/http/test/examples/HttpsTest.kt | 38 +- .../test/examples/MultipartSamplesTest.kt | 22 +- .../http/test/examples/MultipartTest.kt | 36 +- .../http/test/examples/SamplesTest.kt | 50 +- .../hexagonkt/http/test/examples/SseTest.kt | 22 +- .../http/test/examples/WebSocketsTest.kt | 32 +- .../hexagonkt/http/test/examples/ZipTest.kt | 24 +- .../src/main/resources/logging.properties | 2 +- http/rest/README.md | 6 +- .../main/kotlin/com/hexagonkt/rest/Rest.kt | 10 +- .../rest/SerializeRequestCallback.kt | 10 +- .../rest/SerializeResponseCallback.kt | 10 +- http/rest/src/main/kotlin/module-info.java | 8 +- .../kotlin/com/hexagonkt/rest/RestTest.kt | 32 +- .../rest/SerializeRequestCallbackTest.kt | 16 +- .../rest/SerializeResponseCallbackTest.kt | 16 +- .../hexagonkt/rest/tools/HttpClientTool.kt | 32 +- .../hexagonkt/rest/tools/HttpServerTool.kt | 18 +- .../hexagonkt/rest/tools/RecordCallback.kt | 4 +- .../rest/tools/openapi/VerifySpecCallback.kt | 12 +- .../src/main/kotlin/module-info.java_ | 14 +- .../rest/tools/HttpClientToolTest.kt | 22 +- .../rest/tools/HttpServerToolTest.kt | 40 +- .../tools/openapi/VerifySpecCallbackTest.kt | 22 +- http/web/README.md | 6 +- .../src/main/kotlin/com/hexagonkt/web/Web.kt | 16 +- http/web/src/main/kotlin/module-info.java | 10 +- .../web/JettyServletAdapterTodoTest.kt | 6 +- .../test/kotlin/com/hexagonkt/web/WebTest.kt | 26 +- .../com/hexagonkt/web/examples/TodoTest.kt | 28 +- .../store_mongodb_json/reflect-config.json | 2 +- serialization/serialization/README.md | 8 +- .../serialization/api/serialization.api | 104 +-- .../com/hexagonkt/serialization/Data.kt | 2 +- .../hexagonkt/serialization/MutableData.kt | 2 +- .../hexagonkt/serialization/Serialization.kt | 10 +- .../serialization/SerializationFormat.kt | 6 +- .../serialization/SerializationManager.kt | 4 +- .../src/main/kotlin/module-info.java | 6 +- .../hexagonkt/serialization/CheatSheetTest.kt | 2 +- .../serialization/MutableDataTest.kt | 6 +- .../serialization/SerializationFormatTest.kt | 2 +- .../serialization/SerializationManagerTest.kt | 12 +- .../hexagonkt/serialization/TestUtilities.kt | 8 +- .../serialization_dsl_json/README.md | 6 +- .../api/serialization_dsl_json.api | 10 +- .../hexagonkt/serialization/dsl/json/Json.kt | 2 +- .../serialization/dsl/json/JsonFormat.kt | 8 +- .../src/main/kotlin/module-info.java_ | 6 +- .../serialization/dsl/json/JsonTest.kt | 10 +- .../api/serialization_jackson.api | 6 +- .../serialization/jackson/JacksonHelper.kt | 2 +- .../jackson/JacksonTextFormat.kt | 8 +- .../src/main/kotlin/module-info.java | 6 +- .../jackson/JacksonHelperTest.kt | 6 +- .../jackson/JacksonTextFormatTest.kt | 6 +- .../serialization_jackson/reflect-config.json | 6 +- .../api/serialization_jackson_csv.api | 6 +- .../serialization/jackson/csv/Csv.kt | 8 +- .../src/main/kotlin/module-info.java | 8 +- .../serialization/jackson/csv/CsvTest.kt | 4 +- .../api/serialization_jackson_json.api | 10 +- .../serialization/jackson/json/Json.kt | 2 +- .../serialization/jackson/json/JsonFormat.kt | 8 +- .../src/main/kotlin/module-info.java | 8 +- .../serialization/jackson/json/JsonTest.kt | 10 +- .../jackson/json/SerializationHelpersTest.kt | 16 +- .../jackson/json/SerializationTest.kt | 16 +- .../jackson/json/TestUtilities.kt | 16 +- .../api/serialization_jackson_toml.api | 6 +- .../serialization/jackson/toml/Toml.kt | 8 +- .../src/main/kotlin/module-info.java | 8 +- .../serialization/jackson/toml/TomlTest.kt | 14 +- .../reflect-config.json | 2 +- .../api/serialization_jackson_xml.api | 6 +- .../serialization/jackson/xml/Xml.kt | 10 +- .../src/main/kotlin/module-info.java | 8 +- .../serialization/jackson/xml/XmlTest.kt | 8 +- .../reflect-config.json | 2 +- .../api/serialization_jackson_yaml.api | 10 +- .../serialization/jackson/yaml/Yaml.kt | 2 +- .../serialization/jackson/yaml/YamlFormat.kt | 8 +- .../src/main/kotlin/module-info.java | 8 +- .../serialization/jackson/yaml/YamlTest.kt | 16 +- .../reflect-config.json | 2 +- .../serialization/test/SerializationTest.kt | 6 +- serverless/serverless_http_google/README.md | 2 +- .../serverless_http_google/build.gradle.kts | 2 +- .../google/GoogleServerlessHttpAdapter.kt | 12 +- .../google/GoogleServerlessHttpAdapterTest.kt | 12 +- site/build.gradle.kts | 4 +- site/mkdocs/index.html | 2 +- site/pages/examples/http_client_examples.md | 30 +- site/pages/examples/http_server_examples.md | 28 +- site/pages/examples/templates_examples.md | 10 +- site/pages/index.md | 12 +- site/pages/maven.md | 4 +- site/pages/quick_start.md | 6 +- starters/README.md | 4 +- starters/build.gradle.kts | 2 +- starters/hexagon_bom.xml | 66 +- starters/kotlin_lean_pom.xml | 2 +- templates/templates/README.md | 10 +- templates/templates/api/templates.api | 18 +- .../hexagonkt/templates/TemplateManager.kt | 6 +- .../com/hexagonkt/templates/TemplatePort.kt | 4 +- .../src/main/kotlin/module-info.java | 6 +- .../com/hexagonkt/templates/CheatSheetTest.kt | 2 +- .../templates/SampleTemplateAdapter.kt | 2 +- .../templates/TemplateManagerTest.kt | 6 +- .../hexagonkt/templates/TemplatePortTest.kt | 2 +- .../templates/examples/TemplatesTest.kt | 12 +- templates/templates_freemarker/README.md | 6 +- .../api/templates_freemarker.api | 10 +- .../templates/freemarker/FreeMarkerAdapter.kt | 8 +- .../src/main/kotlin/module-info.java | 6 +- .../freemarker/FreeMarkerAdapterTest.kt | 4 +- .../FreeMarkerTemplateAdapterTest.kt | 6 +- templates/templates_jte/README.md | 6 +- .../com/hexagonkt/templates/jte/JteAdapter.kt | 10 +- .../src/main/kotlin/module-info.java | 6 +- .../hexagonkt/templates/jte/JteAdapterTest.kt | 8 +- .../JteTemplateAdapterPrecompiledBaseTest.kt | 8 +- .../jte/JteTemplateAdapterPrecompiledTest.kt | 8 +- .../templates/jte/JteTemplateAdapterTest.kt | 8 +- templates/templates_pebble/README.md | 6 +- .../templates_pebble/api/templates_pebble.api | 2 +- .../templates/pebble/PebbleAdapter.kt | 4 +- .../src/main/kotlin/module-info.java | 6 +- .../templates/pebble/PebbleAdapterTest.kt | 4 +- .../pebble/PebbleTemplateAdapterTest.kt | 6 +- templates/templates_rocker/README.md | 6 +- .../templates_rocker/api/templates_rocker.api | 2 +- .../templates/rocker/RockerAdapter.kt | 4 +- .../src/main/kotlin/module-info.java_ | 6 +- .../templates/rocker/RockerAdapterTest.kt | 4 +- .../rocker/RockerTemplateAdapterTest.kt | 6 +- .../templates/test/TemplateAdapterTest.kt | 8 +- 425 files changed, 3034 insertions(+), 3035 deletions(-) diff --git a/README.md b/README.md index 6ca44dcb22..a7129456a1 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Coverage - + Maven Central Repository

@@ -102,14 +102,14 @@ from scratch following these steps: mavenCentral() } - implementation("com.hexagonkt:http_server_jetty:$hexagonVersion") + implementation("com.hexagontk:http_server_jetty:$hexagonVersion") ``` * In Maven. Declare the dependency in `pom.xml`: ```xml - com.hexagonkt + com.hexagontk http_server_jetty $hexagonVersion @@ -119,10 +119,10 @@ from scratch following these steps: ```kotlin // hello_world -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.http.model.ContentType -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.jetty.serve +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.http.model.ContentType +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.jetty.serve lateinit var server: HttpServer @@ -154,7 +154,7 @@ fun main() { Books Example A simple CRUD example showing how to manage book resources. Here you can check the -[full test](http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BooksTest.kt). +[full test](http_test/src/main/kotlin/com/hexagontk/http/test/examples/BooksTest.kt). ```kotlin // books @@ -228,7 +228,7 @@ private val path: PathHandler = path { Error Handling Example Code to show how to handle callback exceptions and HTTP error codes. Here you can check the -[full test](http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ErrorsTest.kt). +[full test](http_test/src/main/kotlin/com/hexagontk/http/test/examples/ErrorsTest.kt). ```kotlin // errors @@ -277,7 +277,7 @@ private val path: PathHandler = path { Filters Example This example shows how to add filters before and after route execution. Here you can check the -[full test](http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FiltersTest.kt). +[full test](http_test/src/main/kotlin/com/hexagontk/http/test/examples/FiltersTest.kt). ```kotlin // filters @@ -346,7 +346,7 @@ private val path: PathHandler = path { Files Example The following code shows how to serve resources and receive files. Here you can check the -[full test](http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FilesTest.kt). +[full test](http_test/src/main/kotlin/com/hexagontk/http/test/examples/FilesTest.kt). ```kotlin // files @@ -461,7 +461,7 @@ be up-to-date of project's news following [@hexagontk] on X (Twitter). Thanks to all project's [contributors]! -[![CodeTriage](https://www.codetriage.com/hexagonkt/hexagon/badges/users.svg)][CodeTriage] +[![CodeTriage](https://www.codetriage.com/hexagontk/hexagon/badges/users.svg)][CodeTriage] [give it a star]: https://github.com/hexagontk/hexagon/stargazers [discussions]: https://github.com/hexagontk/hexagon/discussions/categories/q-a diff --git a/core/README.md b/core/README.md index 60ab345a24..befd115138 100644 --- a/core/README.md +++ b/core/README.md @@ -16,44 +16,44 @@ application), you can import it with the following code: mavenCentral() } - implementation("com.hexagonkt:core:$hexagonVersion") + implementation("com.hexagontk:core:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk core $hexagonVersion ``` -# Package com.hexagonkt.core +# Package com.hexagontk.core JVM information and other useful utilities. Includes basic program settings support at the [Jvm] object (like loading and retrieving system settings). -[Jvm]: /api/core/com.hexagonkt.core/-jvm +[Jvm]: /api/core/com.hexagontk.core/-jvm -# Package com.hexagonkt.core.logging +# Package com.hexagontk.core.logging Provides a logging management capabilities abstracting the application from logging libraries. The following code block shows the most common use cases for the [Logger] class: -@code core/src/test/kotlin/com/hexagonkt/core/logging/LoggerTest.kt?logger +@code core/src/test/kotlin/com/hexagontk/core/logging/LoggerTest.kt?logger By default, Hexagon uses the [System.Logger] class. -[Logger]: /api/core/com.hexagonkt.core.logging/-logger +[Logger]: /api/core/com.hexagontk.core.logging/-logger [System.Logger]: https://docs.oracle.com/javase/9/docs/api/java/lang/System.Logger.html -# Package com.hexagonkt.core.media +# Package com.hexagontk.core.media Media types definitions and constants for default media types. -# Package com.hexagonkt.core.security +# Package com.hexagontk.core.security Cryptography and key stores utilities. -# Package com.hexagonkt.core.text +# Package com.hexagontk.core.text Text utilities to allow the use of ANSI escape codes and case converting tools among other features. > TODO Create 'Pairs' class to model a list of pairs with repeatable keys diff --git a/core/api/core.api b/core/api/core.api index a76c43688c..dfd6e929d2 100644 --- a/core/api/core.api +++ b/core/api/core.api @@ -1,4 +1,4 @@ -public final class com/hexagonkt/core/ChecksKt { +public final class com/hexagontk/core/ChecksKt { public static final fun check (Ljava/lang/String;[Lkotlin/jvm/functions/Function0;)V public static final fun checkSize (Ljava/util/Collection;Lkotlin/ranges/IntRange;)Ljava/util/Collection; public static final fun requireGreater (Ljava/lang/Object;Lkotlin/reflect/KProperty1;Ljava/lang/Object;)V @@ -13,19 +13,19 @@ public final class com/hexagonkt/core/ChecksKt { public static final fun requireNotBlanks (Ljava/lang/Object;Lkotlin/reflect/KProperty1;)V } -public final class com/hexagonkt/core/ClasspathHandler : java/net/URLStreamHandler { - public static final field INSTANCE Lcom/hexagonkt/core/ClasspathHandler; +public final class com/hexagontk/core/ClasspathHandler : java/net/URLStreamHandler { + public static final field INSTANCE Lcom/hexagontk/core/ClasspathHandler; public final fun createURLStreamHandler (Ljava/lang/String;)Ljava/net/URLStreamHandler; public final fun registerHandler ()V } -public final class com/hexagonkt/core/CodedException : java/lang/RuntimeException { +public final class com/hexagontk/core/CodedException : java/lang/RuntimeException { public fun (ILjava/lang/String;Ljava/lang/Throwable;)V public synthetic fun (ILjava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getCode ()I } -public final class com/hexagonkt/core/DataKt { +public final class com/hexagontk/core/DataKt { public static final fun fieldsMapOf ([Lkotlin/Pair;)Ljava/util/Map; public static final fun fieldsMapOfNotNull ([Lkotlin/Pair;)Ljava/util/Map; public static final fun filterNotEmpty (Ljava/util/Collection;)Ljava/util/Collection; @@ -82,7 +82,7 @@ public final class com/hexagonkt/core/DataKt { public static final fun requireStrings (Ljava/util/Map;Lkotlin/reflect/KProperty1;)Ljava/util/Collection; } -public final class com/hexagonkt/core/DatesKt { +public final class com/hexagontk/core/DatesKt { public static final fun getGMT_ZONE ()Ljava/time/ZoneId; public static final fun parseDuration (Ljava/lang/String;)Ljava/time/Duration; public static final fun parseLocalDate (Ljava/lang/String;)Ljava/time/LocalDate; @@ -103,7 +103,7 @@ public final class com/hexagonkt/core/DatesKt { public static synthetic fun withZone$default (Ljava/time/LocalDateTime;Ljava/time/ZoneId;ILjava/lang/Object;)Ljava/time/ZonedDateTime; } -public final class com/hexagonkt/core/ExceptionsKt { +public final class com/hexagontk/core/ExceptionsKt { public static final fun filterStackTrace (Ljava/lang/Throwable;Ljava/lang/String;)[Ljava/lang/StackTraceElement; public static final fun getAssertEnabled ()Z public static final fun getFail ()Ljava/lang/Void; @@ -111,7 +111,7 @@ public final class com/hexagonkt/core/ExceptionsKt { public static synthetic fun toText$default (Ljava/lang/Throwable;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String; } -public final class com/hexagonkt/core/HelpersKt { +public final class com/hexagontk/core/HelpersKt { public static final fun exec (Ljava/lang/String;Ljava/io/File;JZ)Ljava/lang/String; public static final fun exec (Ljava/util/List;Ljava/io/File;JZ)Ljava/lang/String; public static synthetic fun exec$default (Ljava/lang/String;Ljava/io/File;JZILjava/lang/Object;)Ljava/lang/String; @@ -122,7 +122,7 @@ public final class com/hexagonkt/core/HelpersKt { public static synthetic fun shell$default (Ljava/lang/String;Ljava/io/File;JZILjava/lang/Object;)Ljava/lang/String; } -public final class com/hexagonkt/core/I18nKt { +public final class com/hexagontk/core/I18nKt { public static final fun countryOf (Ljava/lang/String;)Ljava/util/Locale; public static final fun countryOfOrNull (Ljava/lang/String;)Ljava/util/Locale; public static final fun getCountryCodes ()Ljava/util/Set; @@ -140,8 +140,8 @@ public final class com/hexagonkt/core/I18nKt { public static synthetic fun resourceBundle$default (Lkotlin/reflect/KClass;Ljava/util/Locale;ILjava/lang/Object;)Ljava/util/ResourceBundle; } -public final class com/hexagonkt/core/Jvm { - public static final field INSTANCE Lcom/hexagonkt/core/Jvm; +public final class com/hexagontk/core/Jvm { + public static final field INSTANCE Lcom/hexagontk/core/Jvm; public final fun getCharset ()Ljava/nio/charset/Charset; public final fun getConsole ()Ljava/io/Console; public final fun getCpuCount ()I @@ -151,7 +151,7 @@ public final class com/hexagonkt/core/Jvm { public final fun getLocaleCode ()Ljava/lang/String; public final fun getName ()Ljava/lang/String; public final fun getOs ()Ljava/lang/String; - public final fun getOsKind ()Lcom/hexagonkt/core/OsKind; + public final fun getOsKind ()Lcom/hexagontk/core/OsKind; public final fun getRuntime ()Ljava/lang/Runtime; public final fun getTimeZone ()Ljava/util/TimeZone; public final fun getVersion ()Ljava/lang/String; @@ -166,7 +166,7 @@ public final class com/hexagonkt/core/Jvm { public final fun usedMemory ()Ljava/lang/String; } -public abstract class com/hexagonkt/core/MapResourceBundle : java/util/ListResourceBundle { +public abstract class com/hexagontk/core/MapResourceBundle : java/util/ListResourceBundle { public fun (Ljava/util/Map;)V public fun ([Lkotlin/Pair;)V protected fun getContents ()[[Ljava/lang/Object; @@ -174,7 +174,7 @@ public abstract class com/hexagonkt/core/MapResourceBundle : java/util/ListResou public final fun getMap ()Ljava/util/Map; } -public final class com/hexagonkt/core/MultipleException : java/lang/RuntimeException { +public final class com/hexagontk/core/MultipleException : java/lang/RuntimeException { public fun (Ljava/lang/String;Ljava/util/List;)V public fun (Ljava/lang/String;[Ljava/lang/Throwable;)V public fun (Ljava/util/List;Ljava/lang/String;)V @@ -183,7 +183,7 @@ public final class com/hexagonkt/core/MultipleException : java/lang/RuntimeExcep public final fun getCauses ()Ljava/util/List; } -public final class com/hexagonkt/core/NetworkKt { +public final class com/hexagontk/core/NetworkKt { public static final fun exists (Ljava/net/URL;)Z public static final fun firstVariant (Ljava/net/URL;[Ljava/lang/String;)Ljava/net/URL; public static final fun freePort ()I @@ -198,35 +198,35 @@ public final class com/hexagonkt/core/NetworkKt { public static final fun urlOf (Ljava/lang/String;)Ljava/net/URL; } -public final class com/hexagonkt/core/OsKind : java/lang/Enum { - public static final field LINUX Lcom/hexagonkt/core/OsKind; - public static final field MACOS Lcom/hexagonkt/core/OsKind; - public static final field UNIX Lcom/hexagonkt/core/OsKind; - public static final field WINDOWS Lcom/hexagonkt/core/OsKind; +public final class com/hexagontk/core/OsKind : java/lang/Enum { + public static final field LINUX Lcom/hexagontk/core/OsKind; + public static final field MACOS Lcom/hexagontk/core/OsKind; + public static final field UNIX Lcom/hexagontk/core/OsKind; + public static final field WINDOWS Lcom/hexagontk/core/OsKind; public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lcom/hexagonkt/core/OsKind; - public static fun values ()[Lcom/hexagonkt/core/OsKind; + public static fun valueOf (Ljava/lang/String;)Lcom/hexagontk/core/OsKind; + public static fun values ()[Lcom/hexagontk/core/OsKind; } -public final class com/hexagonkt/core/ResourceNotFoundException : java/io/IOException { +public final class com/hexagontk/core/ResourceNotFoundException : java/io/IOException { public fun (Ljava/lang/String;)V } -public final class com/hexagonkt/core/UuidsKt { +public final class com/hexagontk/core/UuidsKt { public static final fun bytes (Ljava/util/UUID;)[B public static final fun toBase64 (Ljava/util/UUID;)Ljava/lang/String; public static final fun uuid (Ljava/lang/String;)Ljava/util/UUID; public static final fun uuid ([B)Ljava/util/UUID; } -public final class com/hexagonkt/core/logging/Logger { +public final class com/hexagontk/core/logging/Logger { public fun (Ljava/lang/String;Ljava/lang/System$Logger;)V public synthetic fun (Ljava/lang/String;Ljava/lang/System$Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Lkotlin/reflect/KClass;)V public final fun debug (Lkotlin/jvm/functions/Function0;)V public final fun error (Ljava/lang/Throwable;Lkotlin/jvm/functions/Function1;)V public final fun error (Lkotlin/jvm/functions/Function0;)V - public static synthetic fun error$default (Lcom/hexagonkt/core/logging/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun error$default (Lcom/hexagontk/core/logging/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V public final fun getName ()Ljava/lang/String; public final fun info (Lkotlin/jvm/functions/Function0;)V public final fun isLoggable (Ljava/lang/System$Logger$Level;)Z @@ -235,149 +235,149 @@ public final class com/hexagonkt/core/logging/Logger { public final fun trace (Lkotlin/jvm/functions/Function0;)V public final fun warn (Ljava/lang/Throwable;Lkotlin/jvm/functions/Function1;)V public final fun warn (Lkotlin/jvm/functions/Function0;)V - public static synthetic fun warn$default (Lcom/hexagonkt/core/logging/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun warn$default (Lcom/hexagontk/core/logging/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V } -public final class com/hexagonkt/core/logging/LoggingKt { +public final class com/hexagontk/core/logging/LoggingKt { public static final fun debug (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object; public static synthetic fun debug$default (Ljava/lang/Object;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/Object; - public static final fun getLogger ()Lcom/hexagonkt/core/logging/Logger; + public static final fun getLogger ()Lcom/hexagontk/core/logging/Logger; public static final fun info (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object; public static synthetic fun info$default (Ljava/lang/Object;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/Object; public static final fun trace (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object; public static synthetic fun trace$default (Ljava/lang/Object;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/Object; } -public final class com/hexagonkt/core/media/MediaType { - public static final field Companion Lcom/hexagonkt/core/media/MediaType$Companion; - public fun (Lcom/hexagonkt/core/media/MediaTypeGroup;Ljava/lang/String;)V - public final fun component1 ()Lcom/hexagonkt/core/media/MediaTypeGroup; +public final class com/hexagontk/core/media/MediaType { + public static final field Companion Lcom/hexagontk/core/media/MediaType$Companion; + public fun (Lcom/hexagontk/core/media/MediaTypeGroup;Ljava/lang/String;)V + public final fun component1 ()Lcom/hexagontk/core/media/MediaTypeGroup; public final fun component2 ()Ljava/lang/String; - public final fun copy (Lcom/hexagonkt/core/media/MediaTypeGroup;Ljava/lang/String;)Lcom/hexagonkt/core/media/MediaType; - public static synthetic fun copy$default (Lcom/hexagonkt/core/media/MediaType;Lcom/hexagonkt/core/media/MediaTypeGroup;Ljava/lang/String;ILjava/lang/Object;)Lcom/hexagonkt/core/media/MediaType; + public final fun copy (Lcom/hexagontk/core/media/MediaTypeGroup;Ljava/lang/String;)Lcom/hexagontk/core/media/MediaType; + public static synthetic fun copy$default (Lcom/hexagontk/core/media/MediaType;Lcom/hexagontk/core/media/MediaTypeGroup;Ljava/lang/String;ILjava/lang/Object;)Lcom/hexagontk/core/media/MediaType; public fun equals (Ljava/lang/Object;)Z public final fun getFullType ()Ljava/lang/String; - public final fun getGroup ()Lcom/hexagonkt/core/media/MediaTypeGroup; + public final fun getGroup ()Lcom/hexagontk/core/media/MediaTypeGroup; public final fun getType ()Ljava/lang/String; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/core/media/MediaType$Companion { - public final fun get (Ljava/lang/String;)Lcom/hexagonkt/core/media/MediaType; +public final class com/hexagontk/core/media/MediaType$Companion { + public final fun get (Ljava/lang/String;)Lcom/hexagontk/core/media/MediaType; public final fun getFullTypes ()Ljava/util/Map; - public final fun invoke (Ljava/lang/String;)Lcom/hexagonkt/core/media/MediaType; + public final fun invoke (Ljava/lang/String;)Lcom/hexagontk/core/media/MediaType; } -public final class com/hexagonkt/core/media/MediaTypeGroup : java/lang/Enum { - public static final field ANY Lcom/hexagonkt/core/media/MediaTypeGroup; - public static final field APPLICATION Lcom/hexagonkt/core/media/MediaTypeGroup; - public static final field AUDIO Lcom/hexagonkt/core/media/MediaTypeGroup; - public static final field FONT Lcom/hexagonkt/core/media/MediaTypeGroup; - public static final field IMAGE Lcom/hexagonkt/core/media/MediaTypeGroup; - public static final field MULTIPART Lcom/hexagonkt/core/media/MediaTypeGroup; - public static final field TEXT Lcom/hexagonkt/core/media/MediaTypeGroup; - public static final field VIDEO Lcom/hexagonkt/core/media/MediaTypeGroup; +public final class com/hexagontk/core/media/MediaTypeGroup : java/lang/Enum { + public static final field ANY Lcom/hexagontk/core/media/MediaTypeGroup; + public static final field APPLICATION Lcom/hexagontk/core/media/MediaTypeGroup; + public static final field AUDIO Lcom/hexagontk/core/media/MediaTypeGroup; + public static final field FONT Lcom/hexagontk/core/media/MediaTypeGroup; + public static final field IMAGE Lcom/hexagontk/core/media/MediaTypeGroup; + public static final field MULTIPART Lcom/hexagontk/core/media/MediaTypeGroup; + public static final field TEXT Lcom/hexagontk/core/media/MediaTypeGroup; + public static final field VIDEO Lcom/hexagontk/core/media/MediaTypeGroup; public static fun getEntries ()Lkotlin/enums/EnumEntries; public final fun getText ()Ljava/lang/String; - public static fun valueOf (Ljava/lang/String;)Lcom/hexagonkt/core/media/MediaTypeGroup; - public static fun values ()[Lcom/hexagonkt/core/media/MediaTypeGroup; + public static fun valueOf (Ljava/lang/String;)Lcom/hexagontk/core/media/MediaTypeGroup; + public static fun values ()[Lcom/hexagontk/core/media/MediaTypeGroup; } -public final class com/hexagonkt/core/media/MediaTypesKt { - public static final fun extensionsOf (Lcom/hexagonkt/core/media/MediaType;)Ljava/util/List; - public static final fun getANY_MEDIA ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_7Z ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_AVRO ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_BZIP ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_BZIP2 ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_CBOR ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_CDF ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_COMPRESS ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_EPUB_ZIP ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_GZIP ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_JAVA_ARCHIVE ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_JSON ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_OCTET_STREAM ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_OGG ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_PDF ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_PHP ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_POSTSCRIPT ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_RAR ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_RTF ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_TOML ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_WEB_MANIFEST ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_XHTML ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_XML ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_X_CSH ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_X_GTAR ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_X_LATEX ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_X_SH ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_X_TAR ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_X_TCL ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_X_TEX ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_X_TEXINFO ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_YAML ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAPPLICATION_ZIP ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAUDIO_AAC ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAUDIO_BASIC ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAUDIO_MIDI ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAUDIO_MPEG ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAUDIO_OGG ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAUDIO_OPUS ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAUDIO_WAV ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getAUDIO_WEBM ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getDEFAULT_MEDIA_TYPE ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getFONT_OTF ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getFONT_TTF ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getFONT_WOFF ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getFONT_WOFF2 ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getIMAGE_AVIF ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getIMAGE_GIF ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getIMAGE_ICO ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getIMAGE_JPEG ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getIMAGE_PNG ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getIMAGE_SVG ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getIMAGE_TIFF ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getIMAGE_WEBP ()Lcom/hexagonkt/core/media/MediaType; +public final class com/hexagontk/core/media/MediaTypesKt { + public static final fun extensionsOf (Lcom/hexagontk/core/media/MediaType;)Ljava/util/List; + public static final fun getANY_MEDIA ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_7Z ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_AVRO ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_BZIP ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_BZIP2 ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_CBOR ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_CDF ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_COMPRESS ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_EPUB_ZIP ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_GZIP ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_JAVA_ARCHIVE ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_JSON ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_OCTET_STREAM ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_OGG ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_PDF ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_PHP ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_POSTSCRIPT ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_RAR ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_RTF ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_TOML ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_WEB_MANIFEST ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_XHTML ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_XML ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_X_CSH ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_X_GTAR ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_X_LATEX ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_X_SH ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_X_TAR ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_X_TCL ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_X_TEX ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_X_TEXINFO ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_YAML ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAPPLICATION_ZIP ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAUDIO_AAC ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAUDIO_BASIC ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAUDIO_MIDI ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAUDIO_MPEG ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAUDIO_OGG ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAUDIO_OPUS ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAUDIO_WAV ()Lcom/hexagontk/core/media/MediaType; + public static final fun getAUDIO_WEBM ()Lcom/hexagontk/core/media/MediaType; + public static final fun getDEFAULT_MEDIA_TYPE ()Lcom/hexagontk/core/media/MediaType; + public static final fun getFONT_OTF ()Lcom/hexagontk/core/media/MediaType; + public static final fun getFONT_TTF ()Lcom/hexagontk/core/media/MediaType; + public static final fun getFONT_WOFF ()Lcom/hexagontk/core/media/MediaType; + public static final fun getFONT_WOFF2 ()Lcom/hexagontk/core/media/MediaType; + public static final fun getIMAGE_AVIF ()Lcom/hexagontk/core/media/MediaType; + public static final fun getIMAGE_GIF ()Lcom/hexagontk/core/media/MediaType; + public static final fun getIMAGE_ICO ()Lcom/hexagontk/core/media/MediaType; + public static final fun getIMAGE_JPEG ()Lcom/hexagontk/core/media/MediaType; + public static final fun getIMAGE_PNG ()Lcom/hexagontk/core/media/MediaType; + public static final fun getIMAGE_SVG ()Lcom/hexagontk/core/media/MediaType; + public static final fun getIMAGE_TIFF ()Lcom/hexagontk/core/media/MediaType; + public static final fun getIMAGE_WEBP ()Lcom/hexagontk/core/media/MediaType; public static final fun getMEDIA_TYPE_FORMAT ()Lkotlin/text/Regex; - public static final fun getMULTIPART_ALTERNATIVE ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getMULTIPART_APPLEDOUBLE ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getMULTIPART_DIGEST ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getMULTIPART_MIXED ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getMULTIPART_PARALLEL ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getTEXT_CALENDAR ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getTEXT_CSS ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getTEXT_CSV ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getTEXT_EVENT_STREAM ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getTEXT_HTML ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getTEXT_JAVASCRIPT ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getTEXT_MARKDOWN ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getTEXT_PLAIN ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getTEXT_RICHTEXT ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getTEXT_TAB_SEPARATED_VALUES ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getTEXT_X_JAVA_PROPERTIES ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getVIDEO_MP4 ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getVIDEO_MPEG ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getVIDEO_OGG ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getVIDEO_QUICKTIME ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getVIDEO_WEBM ()Lcom/hexagonkt/core/media/MediaType; - public static final fun getVIDEO_X_MSVIDEO ()Lcom/hexagonkt/core/media/MediaType; - public static final fun mediaTypeOf (Ljava/io/File;)Lcom/hexagonkt/core/media/MediaType; - public static final fun mediaTypeOf (Ljava/lang/String;)Lcom/hexagonkt/core/media/MediaType; - public static final fun mediaTypeOf (Ljava/net/URI;)Lcom/hexagonkt/core/media/MediaType; - public static final fun mediaTypeOf (Ljava/net/URL;)Lcom/hexagonkt/core/media/MediaType; - public static final fun mediaTypeOf (Ljava/nio/file/Path;)Lcom/hexagonkt/core/media/MediaType; - public static final fun mediaTypeOfOrNull (Ljava/io/File;)Lcom/hexagonkt/core/media/MediaType; - public static final fun mediaTypeOfOrNull (Ljava/lang/String;)Lcom/hexagonkt/core/media/MediaType; - public static final fun mediaTypeOfOrNull (Ljava/net/URI;)Lcom/hexagonkt/core/media/MediaType; - public static final fun mediaTypeOfOrNull (Ljava/net/URL;)Lcom/hexagonkt/core/media/MediaType; - public static final fun mediaTypeOfOrNull (Ljava/nio/file/Path;)Lcom/hexagonkt/core/media/MediaType; - public static final fun parseMediaType (Ljava/lang/String;)Lcom/hexagonkt/core/media/MediaType; + public static final fun getMULTIPART_ALTERNATIVE ()Lcom/hexagontk/core/media/MediaType; + public static final fun getMULTIPART_APPLEDOUBLE ()Lcom/hexagontk/core/media/MediaType; + public static final fun getMULTIPART_DIGEST ()Lcom/hexagontk/core/media/MediaType; + public static final fun getMULTIPART_MIXED ()Lcom/hexagontk/core/media/MediaType; + public static final fun getMULTIPART_PARALLEL ()Lcom/hexagontk/core/media/MediaType; + public static final fun getTEXT_CALENDAR ()Lcom/hexagontk/core/media/MediaType; + public static final fun getTEXT_CSS ()Lcom/hexagontk/core/media/MediaType; + public static final fun getTEXT_CSV ()Lcom/hexagontk/core/media/MediaType; + public static final fun getTEXT_EVENT_STREAM ()Lcom/hexagontk/core/media/MediaType; + public static final fun getTEXT_HTML ()Lcom/hexagontk/core/media/MediaType; + public static final fun getTEXT_JAVASCRIPT ()Lcom/hexagontk/core/media/MediaType; + public static final fun getTEXT_MARKDOWN ()Lcom/hexagontk/core/media/MediaType; + public static final fun getTEXT_PLAIN ()Lcom/hexagontk/core/media/MediaType; + public static final fun getTEXT_RICHTEXT ()Lcom/hexagontk/core/media/MediaType; + public static final fun getTEXT_TAB_SEPARATED_VALUES ()Lcom/hexagontk/core/media/MediaType; + public static final fun getTEXT_X_JAVA_PROPERTIES ()Lcom/hexagontk/core/media/MediaType; + public static final fun getVIDEO_MP4 ()Lcom/hexagontk/core/media/MediaType; + public static final fun getVIDEO_MPEG ()Lcom/hexagontk/core/media/MediaType; + public static final fun getVIDEO_OGG ()Lcom/hexagontk/core/media/MediaType; + public static final fun getVIDEO_QUICKTIME ()Lcom/hexagontk/core/media/MediaType; + public static final fun getVIDEO_WEBM ()Lcom/hexagontk/core/media/MediaType; + public static final fun getVIDEO_X_MSVIDEO ()Lcom/hexagontk/core/media/MediaType; + public static final fun mediaTypeOf (Ljava/io/File;)Lcom/hexagontk/core/media/MediaType; + public static final fun mediaTypeOf (Ljava/lang/String;)Lcom/hexagontk/core/media/MediaType; + public static final fun mediaTypeOf (Ljava/net/URI;)Lcom/hexagontk/core/media/MediaType; + public static final fun mediaTypeOf (Ljava/net/URL;)Lcom/hexagontk/core/media/MediaType; + public static final fun mediaTypeOf (Ljava/nio/file/Path;)Lcom/hexagontk/core/media/MediaType; + public static final fun mediaTypeOfOrNull (Ljava/io/File;)Lcom/hexagontk/core/media/MediaType; + public static final fun mediaTypeOfOrNull (Ljava/lang/String;)Lcom/hexagontk/core/media/MediaType; + public static final fun mediaTypeOfOrNull (Ljava/net/URI;)Lcom/hexagontk/core/media/MediaType; + public static final fun mediaTypeOfOrNull (Ljava/net/URL;)Lcom/hexagontk/core/media/MediaType; + public static final fun mediaTypeOfOrNull (Ljava/nio/file/Path;)Lcom/hexagontk/core/media/MediaType; + public static final fun parseMediaType (Ljava/lang/String;)Lcom/hexagontk/core/media/MediaType; public static final fun pathExtension (Ljava/lang/String;)Ljava/lang/String; } -public final class com/hexagonkt/core/security/CryptoKt { +public final class com/hexagontk/core/security/CryptoKt { public static final fun chainHmac (Ljava/lang/String;[Ljava/lang/String;)[B public static final fun hash (Ljava/lang/String;Ljava/lang/String;)[B public static final fun hash (Ljava/lang/String;[B)[B @@ -385,7 +385,7 @@ public final class com/hexagonkt/core/security/CryptoKt { public static final fun sign (Ljava/lang/String;Ljava/lang/String;[B)[B } -public final class com/hexagonkt/core/security/KeyStoresKt { +public final class com/hexagontk/core/security/KeyStoresKt { public static final fun createKeyManagerFactory (Ljava/net/URL;Ljava/lang/String;Ljava/lang/String;)Ljavax/net/ssl/KeyManagerFactory; public static synthetic fun createKeyManagerFactory$default (Ljava/net/URL;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Ljavax/net/ssl/KeyManagerFactory; public static final fun createTrustManagerFactory (Ljava/net/URL;Ljava/lang/String;Ljava/lang/String;)Ljavax/net/ssl/TrustManagerFactory; @@ -395,16 +395,16 @@ public final class com/hexagonkt/core/security/KeyStoresKt { public static final fun loadKeyStore (Ljava/net/URL;Ljava/lang/String;)Ljava/security/KeyStore; } -public final class com/hexagonkt/core/text/Ansi { +public final class com/hexagontk/core/text/Ansi { public static final field CSI Ljava/lang/String; - public static final field INSTANCE Lcom/hexagonkt/core/text/Ansi; + public static final field INSTANCE Lcom/hexagontk/core/text/Ansi; public static final field OSC Ljava/lang/String; public static final field RESET Ljava/lang/String; public static final field ST Ljava/lang/String; public final fun getREGEX ()Lkotlin/text/Regex; } -public final class com/hexagonkt/core/text/AnsiColor { +public final class com/hexagontk/core/text/AnsiColor { public static final field BLACK Ljava/lang/String; public static final field BLACK_BG Ljava/lang/String; public static final field BLUE Ljava/lang/String; @@ -431,7 +431,7 @@ public final class com/hexagonkt/core/text/AnsiColor { public static final field DEFAULT_BG Ljava/lang/String; public static final field GREEN Ljava/lang/String; public static final field GREEN_BG Ljava/lang/String; - public static final field INSTANCE Lcom/hexagonkt/core/text/AnsiColor; + public static final field INSTANCE Lcom/hexagontk/core/text/AnsiColor; public static final field MAGENTA Ljava/lang/String; public static final field MAGENTA_BG Ljava/lang/String; public static final field RED Ljava/lang/String; @@ -441,12 +441,12 @@ public final class com/hexagonkt/core/text/AnsiColor { public static final field YELLOW Ljava/lang/String; public static final field YELLOW_BG Ljava/lang/String; public final fun bg (III)Ljava/lang/String; - public static synthetic fun bg$default (Lcom/hexagonkt/core/text/AnsiColor;IIIILjava/lang/Object;)Ljava/lang/String; + public static synthetic fun bg$default (Lcom/hexagontk/core/text/AnsiColor;IIIILjava/lang/Object;)Ljava/lang/String; public final fun fg (III)Ljava/lang/String; - public static synthetic fun fg$default (Lcom/hexagonkt/core/text/AnsiColor;IIIILjava/lang/Object;)Ljava/lang/String; + public static synthetic fun fg$default (Lcom/hexagontk/core/text/AnsiColor;IIIILjava/lang/Object;)Ljava/lang/String; } -public final class com/hexagonkt/core/text/AnsiEffect { +public final class com/hexagontk/core/text/AnsiEffect { public static final field BLINK Ljava/lang/String; public static final field BLINK_OFF Ljava/lang/String; public static final field BOLD Ljava/lang/String; @@ -454,7 +454,7 @@ public final class com/hexagonkt/core/text/AnsiEffect { public static final field DIM Ljava/lang/String; public static final field DIM_OFF Ljava/lang/String; public static final field FAST_BLINK Ljava/lang/String; - public static final field INSTANCE Lcom/hexagonkt/core/text/AnsiEffect; + public static final field INSTANCE Lcom/hexagontk/core/text/AnsiEffect; public static final field INVERSE Ljava/lang/String; public static final field INVERSE_OFF Ljava/lang/String; public static final field ITALIC Ljava/lang/String; @@ -465,7 +465,7 @@ public final class com/hexagonkt/core/text/AnsiEffect { public static final field UNDERLINE_OFF Ljava/lang/String; } -public final class com/hexagonkt/core/text/CasesKt { +public final class com/hexagontk/core/text/CasesKt { public static final fun camelToSnake (Ljava/lang/String;)Ljava/lang/String; public static final fun camelToWords (Ljava/lang/String;)Ljava/util/List; public static final fun getCAMEL_CASE ()Lkotlin/text/Regex; @@ -485,11 +485,11 @@ public final class com/hexagonkt/core/text/CasesKt { public static final fun wordsToTitle (Ljava/util/List;)Ljava/lang/String; } -public final class com/hexagonkt/core/text/Glob { +public final class com/hexagontk/core/text/Glob { public fun (Ljava/lang/String;)V public final fun component1 ()Ljava/lang/String; - public final fun copy (Ljava/lang/String;)Lcom/hexagonkt/core/text/Glob; - public static synthetic fun copy$default (Lcom/hexagonkt/core/text/Glob;Ljava/lang/String;ILjava/lang/Object;)Lcom/hexagonkt/core/text/Glob; + public final fun copy (Ljava/lang/String;)Lcom/hexagontk/core/text/Glob; + public static synthetic fun copy$default (Lcom/hexagontk/core/text/Glob;Ljava/lang/String;ILjava/lang/Object;)Lcom/hexagontk/core/text/Glob; public fun equals (Ljava/lang/Object;)Z public final fun getPattern ()Ljava/lang/String; public final fun getRegex ()Lkotlin/text/Regex; @@ -498,7 +498,7 @@ public final class com/hexagonkt/core/text/Glob { public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/core/text/StringsKt { +public final class com/hexagontk/core/text/StringsKt { public static final fun banner (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; public static synthetic fun banner$default (Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String; public static final fun decodeBase64 (Ljava/lang/String;)[B diff --git a/core/src/main/kotlin/com/hexagonkt/core/Checks.kt b/core/src/main/kotlin/com/hexagonkt/core/Checks.kt index 2970867f4e..38253ec24d 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/Checks.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/Checks.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import kotlin.reflect.KProperty1 diff --git a/core/src/main/kotlin/com/hexagonkt/core/ClasspathHandler.kt b/core/src/main/kotlin/com/hexagonkt/core/ClasspathHandler.kt index 7b6ca9c1b6..c329ec1dfe 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/ClasspathHandler.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/ClasspathHandler.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.core +package com.hexagontk.core -import com.hexagonkt.core.logging.logger +import com.hexagontk.core.logging.logger import java.net.URL import java.net.URLConnection import java.net.URLStreamHandler diff --git a/core/src/main/kotlin/com/hexagonkt/core/ClasspathHandlerProvider.kt b/core/src/main/kotlin/com/hexagonkt/core/ClasspathHandlerProvider.kt index dc62a419b7..df7a2cbb4d 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/ClasspathHandlerProvider.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/ClasspathHandlerProvider.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import java.net.URLStreamHandler import java.net.spi.URLStreamHandlerProvider diff --git a/core/src/main/kotlin/com/hexagonkt/core/CodedException.kt b/core/src/main/kotlin/com/hexagonkt/core/CodedException.kt index f3cf5dbe42..4b48fa7bbf 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/CodedException.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/CodedException.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core /** * Exception with a numeric code. diff --git a/core/src/main/kotlin/com/hexagonkt/core/Data.kt b/core/src/main/kotlin/com/hexagonkt/core/Data.kt index dac385f552..db253b4c2c 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/Data.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/Data.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import kotlin.reflect.KProperty1 diff --git a/core/src/main/kotlin/com/hexagonkt/core/Dates.kt b/core/src/main/kotlin/com/hexagonkt/core/Dates.kt index 637b35a019..8b36c33aae 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/Dates.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/Dates.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import java.time.* import java.util.Date diff --git a/core/src/main/kotlin/com/hexagonkt/core/Exceptions.kt b/core/src/main/kotlin/com/hexagonkt/core/Exceptions.kt index 144674aa95..81024f0758 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/Exceptions.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/Exceptions.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.core +package com.hexagontk.core -import com.hexagonkt.core.text.eol +import com.hexagontk.core.text.eol /** * This flag is true when assertions are enabled in the JVM (`-ea` flag). Assertions are disabled by diff --git a/core/src/main/kotlin/com/hexagonkt/core/Helpers.kt b/core/src/main/kotlin/com/hexagonkt/core/Helpers.kt index 45be286657..6e02facb06 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/Helpers.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/Helpers.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import java.io.BufferedReader import java.io.File @@ -10,7 +10,7 @@ import java.util.concurrent.TimeUnit.SECONDS /** * Load a '*.properties' file from a URL transforming the content into a plain map. If the resource - * can not be found, a [com.hexagonkt.core.ResourceNotFoundException] is thrown. + * can not be found, a [com.hexagontk.core.ResourceNotFoundException] is thrown. * * @param url URL pointing to the file to load. * @return Map containing the properties file data. diff --git a/core/src/main/kotlin/com/hexagonkt/core/I18n.kt b/core/src/main/kotlin/com/hexagonkt/core/I18n.kt index d7c835406d..0682efc4a7 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/I18n.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/I18n.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import java.util.* import kotlin.reflect.KClass diff --git a/core/src/main/kotlin/com/hexagonkt/core/Jvm.kt b/core/src/main/kotlin/com/hexagonkt/core/Jvm.kt index 9864d07776..2759524f92 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/Jvm.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/Jvm.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.core +package com.hexagontk.core -import com.hexagonkt.core.text.SNAKE_CASE -import com.hexagonkt.core.text.parseOrNull +import com.hexagontk.core.text.SNAKE_CASE +import com.hexagontk.core.text.parseOrNull import java.io.Console import java.net.InetAddress import java.nio.charset.Charset diff --git a/core/src/main/kotlin/com/hexagonkt/core/MapResourceBundle.kt b/core/src/main/kotlin/com/hexagonkt/core/MapResourceBundle.kt index edec6b84e0..061cd35199 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/MapResourceBundle.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/MapResourceBundle.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import java.util.* diff --git a/core/src/main/kotlin/com/hexagonkt/core/MultipleException.kt b/core/src/main/kotlin/com/hexagonkt/core/MultipleException.kt index a710700532..d442b5dd69 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/MultipleException.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/MultipleException.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core /** * Exception with a list of causes. Cause is `null` as it can't be told which one of the list is the diff --git a/core/src/main/kotlin/com/hexagonkt/core/Network.kt b/core/src/main/kotlin/com/hexagonkt/core/Network.kt index b64baee0db..1d3c573610 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/Network.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/Network.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import java.io.File import java.net.* diff --git a/core/src/main/kotlin/com/hexagonkt/core/OsKind.kt b/core/src/main/kotlin/com/hexagonkt/core/OsKind.kt index bdcdec0a5c..9f68af5b86 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/OsKind.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/OsKind.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core enum class OsKind { WINDOWS, diff --git a/core/src/main/kotlin/com/hexagonkt/core/ResourceNotFoundException.kt b/core/src/main/kotlin/com/hexagonkt/core/ResourceNotFoundException.kt index dc91ec84ac..4f7f725608 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/ResourceNotFoundException.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/ResourceNotFoundException.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import java.io.IOException diff --git a/core/src/main/kotlin/com/hexagonkt/core/Uuids.kt b/core/src/main/kotlin/com/hexagonkt/core/Uuids.kt index 362145a05f..079c9d96f1 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/Uuids.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/Uuids.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.core +package com.hexagontk.core -import com.hexagonkt.core.text.decodeBase64 -import com.hexagonkt.core.text.encodeToBase64 +import com.hexagontk.core.text.decodeBase64 +import com.hexagontk.core.text.encodeToBase64 import java.nio.ByteBuffer import java.util.* diff --git a/core/src/main/kotlin/com/hexagonkt/core/logging/Logger.kt b/core/src/main/kotlin/com/hexagonkt/core/logging/Logger.kt index eb507deb76..6d932b8eef 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/logging/Logger.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/logging/Logger.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.core.logging +package com.hexagontk.core.logging -import com.hexagonkt.core.text.stripAnsi +import com.hexagontk.core.text.stripAnsi import java.lang.System.Logger.Level import java.lang.System.Logger.Level.* import kotlin.reflect.KClass @@ -9,7 +9,7 @@ import kotlin.reflect.KClass * Logger class with Kotlin usability improvements. It is backed by a [System.Logger] instance. * * @param name Logger name. It is shown in the logs messages and used for log filtering. - * @sample com.hexagonkt.core.logging.LoggerTest.loggerUsage + * @sample com.hexagontk.core.logging.LoggerTest.loggerUsage */ class Logger( val name: String, diff --git a/core/src/main/kotlin/com/hexagonkt/core/logging/Logging.kt b/core/src/main/kotlin/com/hexagonkt/core/logging/Logging.kt index eb5876a1c9..dd78f4120b 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/logging/Logging.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/logging/Logging.kt @@ -1,11 +1,10 @@ -package com.hexagonkt.core.logging +package com.hexagontk.core.logging -import java.lang.System.Logger.Level.* -import com.hexagonkt.core.Jvm +import com.hexagontk.core.Jvm -internal val useColor: Boolean by lazy { Jvm.systemSetting("hexagonkt_logging_color", true) } +internal val useColor: Boolean by lazy { Jvm.systemSetting("hexagontk_logging_color", true) } internal val defaultLoggerName: String by lazy { - Jvm.systemSetting("hexagonkt_logging_logger_name", "com.hexagonkt.core.logging") + Jvm.systemSetting("hexagontk_logging_logger_name", "com.hexagontk.core.logging") } /** Default logger for when you feel too lazy to declare one. */ @@ -14,7 +13,7 @@ val logger: Logger by lazy { Logger(defaultLoggerName) } /** * Use this [T] to log a message with a prefix using [TRACE] level. * - * [com.hexagonkt.core.logging.logger] must have the [TRACE] level enabled. + * [com.hexagontk.core.logging.logger] must have the [TRACE] level enabled. * * @receiver Object which string representation will be logged. * @param T Type of the logged object. @@ -27,7 +26,7 @@ fun T.trace(prefix: String = ""): T = /** * Use this [T] to log a message with a prefix using [DEBUG] level. * - * [com.hexagonkt.core.logging.logger] must have the [DEBUG] level enabled. + * [com.hexagontk.core.logging.logger] must have the [DEBUG] level enabled. * * @receiver Object which string representation will be logged. * @param T Type of the logged object. @@ -40,7 +39,7 @@ fun T.debug(prefix: String = ""): T = /** * Use this [T] to log a message with a prefix using [INFO] level. * - * [com.hexagonkt.core.logging.logger] must have the [INFO] level enabled. + * [com.hexagontk.core.logging.logger] must have the [INFO] level enabled. * * @receiver Object which string representation will be logged. * @param T Type of the logged object. diff --git a/core/src/main/kotlin/com/hexagonkt/core/media/MediaType.kt b/core/src/main/kotlin/com/hexagonkt/core/media/MediaType.kt index b60b79a174..95737edadf 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/media/MediaType.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/media/MediaType.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.core.media +package com.hexagontk.core.media -import com.hexagonkt.core.assertEnabled -import com.hexagonkt.core.media.MediaTypeGroup.ANY +import com.hexagontk.core.assertEnabled +import com.hexagontk.core.media.MediaTypeGroup.ANY /** * Media type (also known as MIME type). diff --git a/core/src/main/kotlin/com/hexagonkt/core/media/MediaTypeGroup.kt b/core/src/main/kotlin/com/hexagonkt/core/media/MediaTypeGroup.kt index ce1807b500..61fc7ad930 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/media/MediaTypeGroup.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/media/MediaTypeGroup.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core.media +package com.hexagontk.core.media enum class MediaTypeGroup { APPLICATION, diff --git a/core/src/main/kotlin/com/hexagonkt/core/media/MediaTypes.kt b/core/src/main/kotlin/com/hexagonkt/core/media/MediaTypes.kt index 8b493182d7..30ff4522ce 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/media/MediaTypes.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/media/MediaTypes.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.core.media +package com.hexagontk.core.media -import com.hexagonkt.core.media.MediaTypeGroup.* +import com.hexagontk.core.media.MediaTypeGroup.* import java.io.File import java.net.URI import java.net.URL diff --git a/core/src/main/kotlin/com/hexagonkt/core/security/Crypto.kt b/core/src/main/kotlin/com/hexagonkt/core/security/Crypto.kt index 229e06ab0d..6b3ad7d090 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/security/Crypto.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/security/Crypto.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core.security +package com.hexagontk.core.security import java.security.MessageDigest import javax.crypto.Mac diff --git a/core/src/main/kotlin/com/hexagonkt/core/security/KeyStores.kt b/core/src/main/kotlin/com/hexagonkt/core/security/KeyStores.kt index 7a7e980fe0..871279b781 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/security/KeyStores.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/security/KeyStores.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core.security +package com.hexagontk.core.security import java.net.URL import java.security.KeyStore diff --git a/core/src/main/kotlin/com/hexagonkt/core/text/Ansi.kt b/core/src/main/kotlin/com/hexagonkt/core/text/Ansi.kt index 02ee2eb3b6..830e78aa0a 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/text/Ansi.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/text/Ansi.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core.text +package com.hexagontk.core.text /** * Constants for console formatting with [ANSI](https://en.wikipedia.org/wiki/ANSI_escape_code) diff --git a/core/src/main/kotlin/com/hexagonkt/core/text/AnsiColor.kt b/core/src/main/kotlin/com/hexagonkt/core/text/AnsiColor.kt index 6278bccd7c..0eb4c29a49 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/text/AnsiColor.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/text/AnsiColor.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.core.text +package com.hexagontk.core.text -import com.hexagonkt.core.text.Ansi.CSI +import com.hexagontk.core.text.Ansi.CSI object AnsiColor { /** Set black as the foreground color. */ diff --git a/core/src/main/kotlin/com/hexagonkt/core/text/AnsiEffect.kt b/core/src/main/kotlin/com/hexagonkt/core/text/AnsiEffect.kt index b97fc17d94..34a9de8ee9 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/text/AnsiEffect.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/text/AnsiEffect.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core.text +package com.hexagontk.core.text object AnsiEffect { /** Enable bold text. */ diff --git a/core/src/main/kotlin/com/hexagonkt/core/text/Cases.kt b/core/src/main/kotlin/com/hexagonkt/core/text/Cases.kt index 7b7af40e2b..f635d16472 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/text/Cases.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/text/Cases.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core.text +package com.hexagontk.core.text val CAMEL_CASE: Regex by lazy { Regex("[a-z]+([A-Z][a-z0-9]+)+") } val PASCAL_CASE: Regex by lazy { Regex("([A-Z][a-z0-9]+)+") } diff --git a/core/src/main/kotlin/com/hexagonkt/core/text/Glob.kt b/core/src/main/kotlin/com/hexagonkt/core/text/Glob.kt index 08d5690a90..63c4b504a1 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/text/Glob.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/text/Glob.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core.text +package com.hexagontk.core.text import kotlin.IllegalArgumentException import java.util.regex.PatternSyntaxException diff --git a/core/src/main/kotlin/com/hexagonkt/core/text/Strings.kt b/core/src/main/kotlin/com/hexagonkt/core/text/Strings.kt index 3da22e2da3..5e86088ace 100644 --- a/core/src/main/kotlin/com/hexagonkt/core/text/Strings.kt +++ b/core/src/main/kotlin/com/hexagonkt/core/text/Strings.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.core.text +package com.hexagontk.core.text -import com.hexagonkt.core.urlOf +import com.hexagontk.core.urlOf import java.io.ByteArrayInputStream import java.io.File import java.io.InputStream @@ -51,7 +51,7 @@ val parsedClasses: Set> by lazy { * * @param parameters The map with the list of key/value tuples. * @return The filtered text or the same string if no values are passed or found in the text. - * @sample com.hexagonkt.core.text.StringsTest.filterVarsExample + * @sample com.hexagontk.core.text.StringsTest.filterVarsExample */ fun String.filterVars(parameters: Map<*, *>): String = this.filter( diff --git a/core/src/main/kotlin/module-info.java b/core/src/main/kotlin/module-info.java index b53c2c3a6d..1e7e128e1b 100644 --- a/core/src/main/kotlin/module-info.java +++ b/core/src/main/kotlin/module-info.java @@ -3,15 +3,15 @@ * documentation for more details. You can find a quick recap of the main features in the sections * below. */ -module com.hexagonkt.core { +module com.hexagontk.core { requires transitive kotlin.stdlib; - exports com.hexagonkt.core; - exports com.hexagonkt.core.logging; - exports com.hexagonkt.core.media; - exports com.hexagonkt.core.security; - exports com.hexagonkt.core.text; + exports com.hexagontk.core; + exports com.hexagontk.core.logging; + exports com.hexagontk.core.media; + exports com.hexagontk.core.security; + exports com.hexagontk.core.text; - provides java.net.spi.URLStreamHandlerProvider with com.hexagonkt.core.ClasspathHandlerProvider; + provides java.net.spi.URLStreamHandlerProvider with com.hexagontk.core.ClasspathHandlerProvider; } diff --git a/core/src/main/resources/META-INF/native-image/com.hexagonkt/core/native-image.properties b/core/src/main/resources/META-INF/native-image/com.hexagonkt/core/native-image.properties index faadd258f9..c3d206b25f 100644 --- a/core/src/main/resources/META-INF/native-image/com.hexagonkt/core/native-image.properties +++ b/core/src/main/resources/META-INF/native-image/com.hexagonkt/core/native-image.properties @@ -3,10 +3,10 @@ Args= \ -H:IncludeResources=hexagon\\.properties \ --strict-image-heap \ --enable-url-protocols=http,https,classpath \ - --initialize-at-run-time=com.hexagonkt.core.NetworkKt \ + --initialize-at-run-time=com.hexagontk.core.NetworkKt \ --initialize-at-build-time=kotlin.Function \ --initialize-at-build-time=kotlin.SynchronizedLazyImpl \ --initialize-at-build-time=kotlin.UNINITIALIZED_VALUE \ --initialize-at-build-time=kotlin.jvm.functions.Function0 \ - --initialize-at-build-time=com.hexagonkt.core.ClasspathHandler \ - --initialize-at-build-time=com.hexagonkt.core.ClasspathHandler$classLoader$2 + --initialize-at-build-time=com.hexagontk.core.ClasspathHandler \ + --initialize-at-build-time=com.hexagontk.core.ClasspathHandler$classLoader$2 diff --git a/core/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider b/core/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider index bbb6ecc524..a67961e973 100644 --- a/core/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider +++ b/core/src/main/resources/META-INF/services/java.net.spi.URLStreamHandlerProvider @@ -1 +1 @@ -com.hexagonkt.core.ClasspathHandlerProvider +com.hexagontk.core.ClasspathHandlerProvider diff --git a/core/src/test/kotlin/com/hexagonkt/core/ChecksTest.kt b/core/src/test/kotlin/com/hexagonkt/core/ChecksTest.kt index 5f75d54579..8b76c12fb6 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/ChecksTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/ChecksTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.Test import kotlin.IllegalArgumentException diff --git a/core/src/test/kotlin/com/hexagonkt/core/ClasspathHandlerProviderTest.kt b/core/src/test/kotlin/com/hexagonkt/core/ClasspathHandlerProviderTest.kt index 75fc882615..f31236437b 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/ClasspathHandlerProviderTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/ClasspathHandlerProviderTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test diff --git a/core/src/test/kotlin/com/hexagonkt/core/CodedExceptionTest.kt b/core/src/test/kotlin/com/hexagonkt/core/CodedExceptionTest.kt index a1e52cbfd0..ec7c8ddd28 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/CodedExceptionTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/CodedExceptionTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.Test diff --git a/core/src/test/kotlin/com/hexagonkt/core/CoreTest.kt b/core/src/test/kotlin/com/hexagonkt/core/CoreTest.kt index c6dd92c08e..9c56397ced 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/CoreTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/CoreTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.Test import kotlin.test.assertContains diff --git a/core/src/test/kotlin/com/hexagonkt/core/DataTest.kt b/core/src/test/kotlin/com/hexagonkt/core/DataTest.kt index 95e8447a82..eab899baa8 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/DataTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/DataTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.Test import kotlin.test.* diff --git a/core/src/test/kotlin/com/hexagonkt/core/DatesTest.kt b/core/src/test/kotlin/com/hexagonkt/core/DatesTest.kt index 250989327c..f6301e477a 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/DatesTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/DatesTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.Test import java.time.* diff --git a/core/src/test/kotlin/com/hexagonkt/core/ExceptionsTest.kt b/core/src/test/kotlin/com/hexagonkt/core/ExceptionsTest.kt index a42d717d59..e921a8e3e1 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/ExceptionsTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/ExceptionsTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.Test import kotlin.test.* @@ -22,8 +22,8 @@ internal class ExceptionsTest { @Test fun `Filtering an exception with a package only returns frames of that package`() { val t = RuntimeException() - t.filterStackTrace("com.hexagonkt.core").forEach { - assert(it.className.startsWith("com.hexagonkt.core")) + t.filterStackTrace("com.hexagontk.core").forEach { + assert(it.className.startsWith("com.hexagontk.core")) } } @@ -39,7 +39,7 @@ internal class ExceptionsTest { assert(trace.startsWith("java.lang.RuntimeException")) assert(trace.contains("\tat ${ExceptionsTest::class.java.name}")) assert(trace.contains("\tat org.junit.platform")) - val filteredTrace = e.toText("com.hexagonkt") + val filteredTrace = e.toText("com.hexagontk") assert(filteredTrace.startsWith("java.lang.RuntimeException")) assert(filteredTrace.contains("\tat ${ExceptionsTest::class.java.name}")) assertFalse(filteredTrace.contains("\tat org.junit.platform")) @@ -52,7 +52,7 @@ internal class ExceptionsTest { assert(trace.contains("invalid state")) assert(trace.contains("\tat ${ExceptionsTest::class.java.name}")) assert(trace.contains("\tat org.junit.platform")) - val filteredTrace = e.toText("com.hexagonkt") + val filteredTrace = e.toText("com.hexagontk") assert(filteredTrace.startsWith("java.lang.RuntimeException")) assert(filteredTrace.contains("invalid state")) assert(filteredTrace.contains("\tat ${ExceptionsTest::class.java.name}")) diff --git a/core/src/test/kotlin/com/hexagonkt/core/HelpersTest.kt b/core/src/test/kotlin/com/hexagonkt/core/HelpersTest.kt index 7b3197bfac..b6a07c823f 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/HelpersTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/HelpersTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.condition.DisabledOnOs import org.junit.jupiter.api.condition.OS.WINDOWS @@ -12,7 +12,7 @@ internal class HelpersTest { assertEquals("hexagon", properties["project"]) assertEquals("core", properties["module"]) assertEquals("1.0.0", properties["version"]) - assertEquals("com.hexagonkt", properties["group"]) + assertEquals("com.hexagontk", properties["group"]) assertEquals("Hexagon Toolkit", properties["description"]) assertEquals("1", properties["number"]) assertNull(properties["invalid"]) diff --git a/core/src/test/kotlin/com/hexagonkt/core/I18nTest.kt b/core/src/test/kotlin/com/hexagonkt/core/I18nTest.kt index 27c6210386..20fea9b094 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/I18nTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/I18nTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.Test import java.util.Currency.getAvailableCurrencies diff --git a/core/src/test/kotlin/com/hexagonkt/core/JvmTest.kt b/core/src/test/kotlin/com/hexagonkt/core/JvmTest.kt index 64c83493e6..f89e986b55 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/JvmTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/JvmTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.Test import kotlin.IllegalArgumentException diff --git a/core/src/test/kotlin/com/hexagonkt/core/MapResourceBundleTest.kt b/core/src/test/kotlin/com/hexagonkt/core/MapResourceBundleTest.kt index 6ba23187d7..f48526253d 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/MapResourceBundleTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/MapResourceBundleTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.condition.DisabledInNativeImage import org.junit.jupiter.api.Test diff --git a/core/src/test/kotlin/com/hexagonkt/core/MultipleExceptionTest.kt b/core/src/test/kotlin/com/hexagonkt/core/MultipleExceptionTest.kt index 7490bb5131..7db8268c72 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/MultipleExceptionTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/MultipleExceptionTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.Test import kotlin.test.assertContentEquals diff --git a/core/src/test/kotlin/com/hexagonkt/core/NetworkTest.kt b/core/src/test/kotlin/com/hexagonkt/core/NetworkTest.kt index 3a58cab177..47cf6b763e 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/NetworkTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/NetworkTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import java.net.ServerSocket import org.junit.jupiter.api.Test diff --git a/core/src/test/kotlin/com/hexagonkt/core/UuidsTest.kt b/core/src/test/kotlin/com/hexagonkt/core/UuidsTest.kt index 4a4dd0e7ff..ad35ba5d12 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/UuidsTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/UuidsTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core +package com.hexagontk.core import org.junit.jupiter.api.Test import java.util.UUID diff --git a/core/src/test/kotlin/com/hexagonkt/core/logging/LoggerTest.kt b/core/src/test/kotlin/com/hexagonkt/core/logging/LoggerTest.kt index a7d18c37ad..1afc09a848 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/logging/LoggerTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/logging/LoggerTest.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.core.logging +package com.hexagontk.core.logging -import com.hexagonkt.core.text.Ansi.RESET -import com.hexagonkt.core.text.AnsiColor.BRIGHT_WHITE -import com.hexagonkt.core.text.AnsiColor.RED_BG -import com.hexagonkt.core.text.AnsiEffect.UNDERLINE -import com.hexagonkt.core.urlOf +import com.hexagontk.core.text.Ansi.RESET +import com.hexagontk.core.text.AnsiColor.BRIGHT_WHITE +import com.hexagontk.core.text.AnsiColor.RED_BG +import com.hexagontk.core.text.AnsiEffect.UNDERLINE +import com.hexagontk.core.urlOf import io.mockk.every import io.mockk.mockk import org.junit.jupiter.api.BeforeAll @@ -36,7 +36,7 @@ internal class LoggerTest { logger.info { """ You can add a quick log without declaring a Logger with - 'com.hexagonkt.core.logging.logger'. It is a default logger created with a custom name + 'com.hexagontk.core.logging.logger'. It is a default logger created with a custom name (same as `Logger(LoggingManager.defaultLoggerName)`). """ } diff --git a/core/src/test/kotlin/com/hexagonkt/core/logging/LoggingTest.kt b/core/src/test/kotlin/com/hexagonkt/core/logging/LoggingTest.kt index 720d677b66..a88d76f969 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/logging/LoggingTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/logging/LoggingTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.core.logging +package com.hexagontk.core.logging -import com.hexagonkt.core.urlOf +import com.hexagontk.core.urlOf import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance diff --git a/core/src/test/kotlin/com/hexagonkt/core/media/MediaTypeTest.kt b/core/src/test/kotlin/com/hexagonkt/core/media/MediaTypeTest.kt index 17a5ed6510..80f3c3bd9e 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/media/MediaTypeTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/media/MediaTypeTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.core.media +package com.hexagontk.core.media -import com.hexagonkt.core.media.MediaTypeGroup.* +import com.hexagontk.core.media.MediaTypeGroup.* import org.junit.jupiter.api.Test import kotlin.IllegalArgumentException import kotlin.test.assertEquals diff --git a/core/src/test/kotlin/com/hexagonkt/core/media/MediaTypesTest.kt b/core/src/test/kotlin/com/hexagonkt/core/media/MediaTypesTest.kt index f3d0fce84c..fc71cfa6f0 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/media/MediaTypesTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/media/MediaTypesTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.core.media +package com.hexagontk.core.media -import com.hexagonkt.core.media.MediaTypeGroup.* -import com.hexagonkt.core.urlOf +import com.hexagontk.core.media.MediaTypeGroup.* +import com.hexagontk.core.urlOf import org.junit.jupiter.api.Test import java.io.File import java.net.URI diff --git a/core/src/test/kotlin/com/hexagonkt/core/security/CryptoTest.kt b/core/src/test/kotlin/com/hexagonkt/core/security/CryptoTest.kt index a2acf924d3..1e4936dcd8 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/security/CryptoTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/security/CryptoTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core.security +package com.hexagontk.core.security import org.junit.jupiter.api.Test diff --git a/core/src/test/kotlin/com/hexagonkt/core/security/KeyStoresTest.kt b/core/src/test/kotlin/com/hexagonkt/core/security/KeyStoresTest.kt index bd05bde56a..31fa0e2797 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/security/KeyStoresTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/security/KeyStoresTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.core.security +package com.hexagontk.core.security -import com.hexagonkt.core.urlOf +import com.hexagontk.core.urlOf import org.junit.jupiter.api.Test import java.io.File import java.security.cert.X509Certificate diff --git a/core/src/test/kotlin/com/hexagonkt/core/text/AnsiTest.kt b/core/src/test/kotlin/com/hexagonkt/core/text/AnsiTest.kt index 26e83f8bc6..61b1a5eb3b 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/text/AnsiTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/text/AnsiTest.kt @@ -1,12 +1,12 @@ -package com.hexagonkt.core.text - -import com.hexagonkt.core.logging.Logger -import com.hexagonkt.core.text.Ansi.OSC -import com.hexagonkt.core.text.Ansi.RESET -import com.hexagonkt.core.text.Ansi.ST -import com.hexagonkt.core.text.AnsiColor.BLACK -import com.hexagonkt.core.text.AnsiColor.BLUE_BG -import com.hexagonkt.core.text.AnsiEffect.UNDERLINE +package com.hexagontk.core.text + +import com.hexagontk.core.logging.Logger +import com.hexagontk.core.text.Ansi.OSC +import com.hexagontk.core.text.Ansi.RESET +import com.hexagontk.core.text.Ansi.ST +import com.hexagontk.core.text.AnsiColor.BLACK +import com.hexagontk.core.text.AnsiColor.BLUE_BG +import com.hexagontk.core.text.AnsiEffect.UNDERLINE import org.junit.jupiter.api.Test import java.lang.IllegalArgumentException import kotlin.test.assertEquals diff --git a/core/src/test/kotlin/com/hexagonkt/core/text/CasesTest.kt b/core/src/test/kotlin/com/hexagonkt/core/text/CasesTest.kt index 0d236ae1c3..783a8ae54f 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/text/CasesTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/text/CasesTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.core.text +package com.hexagontk.core.text -import com.hexagonkt.core.text.CasesTest.Size.X_L +import com.hexagontk.core.text.CasesTest.Size.X_L import org.junit.jupiter.api.Test import kotlin.test.* diff --git a/core/src/test/kotlin/com/hexagonkt/core/text/GlobTest.kt b/core/src/test/kotlin/com/hexagonkt/core/text/GlobTest.kt index dbede36507..0d37b57c5b 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/text/GlobTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/text/GlobTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.core.text +package com.hexagontk.core.text import org.junit.jupiter.api.Test import kotlin.IllegalArgumentException diff --git a/core/src/test/kotlin/com/hexagonkt/core/text/StringsTest.kt b/core/src/test/kotlin/com/hexagonkt/core/text/StringsTest.kt index 5fe16c8a68..98377cd3f4 100644 --- a/core/src/test/kotlin/com/hexagonkt/core/text/StringsTest.kt +++ b/core/src/test/kotlin/com/hexagonkt/core/text/StringsTest.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.core.text +package com.hexagontk.core.text -import com.hexagonkt.core.text.Ansi.RESET -import com.hexagonkt.core.text.AnsiColor.BRIGHT_WHITE -import com.hexagonkt.core.text.AnsiColor.RED_BG -import com.hexagonkt.core.text.AnsiEffect.UNDERLINE +import com.hexagontk.core.text.Ansi.RESET +import com.hexagontk.core.text.AnsiColor.BRIGHT_WHITE +import com.hexagontk.core.text.AnsiColor.RED_BG +import com.hexagontk.core.text.AnsiEffect.UNDERLINE import io.mockk.every import io.mockk.mockk import org.junit.jupiter.api.condition.DisabledInNativeImage @@ -18,7 +18,7 @@ import java.time.LocalTime import org.junit.jupiter.api.Test import kotlin.test.* import kotlin.text.prependIndent -import com.hexagonkt.core.text.StringsTest.Size.* +import com.hexagontk.core.text.StringsTest.Size.* internal class StringsTest { @@ -217,7 +217,7 @@ internal class StringsTest { val e = assertFailsWith { "z".toEnum(Size::valueOf) } val message = e.message ?: "_" - assertContains(message, "No enum constant com.hexagonkt.core.text.StringsTest") + assertContains(message, "No enum constant com.hexagontk.core.text.StringsTest") assertContains(message, "Size.Z") assertEquals(S, "s".toEnumOrNull(Size::valueOf)) diff --git a/core/src/test/resources/build.properties b/core/src/test/resources/build.properties index de91ec10c6..c13330b329 100644 --- a/core/src/test/resources/build.properties +++ b/core/src/test/resources/build.properties @@ -4,5 +4,5 @@ number=1 project=hexagon module=core version=1.0.0 -group=com.hexagonkt +group=com.hexagontk description=Hexagon Toolkit diff --git a/core/src/test/resources/sample.properties b/core/src/test/resources/sample.properties index ac1553aa19..e43bf82564 100644 --- a/core/src/test/resources/sample.properties +++ b/core/src/test/resources/sample.properties @@ -13,4 +13,4 @@ java.util.logging.SimpleFormatter.format=\ .level=INFO -com.hexagonkt.level=ALL +com.hexagontk.level=ALL diff --git a/gradle.properties b/gradle.properties index eb5a67415b..42b6bfb0b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,8 +8,8 @@ org.gradle.warning.mode=all org.gradle.console=plain # Gradle -version=3.6.5 -group=com.hexagonkt +version=4.0.0-A1 +group=com.hexagontk description=The atoms of your platform detektConfigPath=detekt.yml diff --git a/handlers/README.md b/handlers/README.md index 912ebdd352..444f6c549a 100644 --- a/handlers/README.md +++ b/handlers/README.md @@ -15,20 +15,20 @@ application), you can import it with the following code: mavenCentral() } - implementation("com.hexagonkt:handlers:$hexagonVersion") + implementation("com.hexagontk:handlers:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk handlers $hexagonVersion ``` -# Package com.hexagonkt.handlers +# Package com.hexagontk.handlers Provide general utilities to attach many handlers to be applied on events processing. Events can be of any type. diff --git a/handlers/api/handlers.api b/handlers/api/handlers.api index 75ff1c2945..ccf5ac19f5 100644 --- a/handlers/api/handlers.api +++ b/handlers/api/handlers.api @@ -1,53 +1,53 @@ -public final class com/hexagonkt/handlers/AfterHandler : com/hexagonkt/handlers/Handler { +public final class com/hexagontk/handlers/AfterHandler : com/hexagontk/handlers/Handler { public fun (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V public synthetic fun (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Lkotlin/jvm/functions/Function1; public final fun component2 ()Lkotlin/jvm/functions/Function1; - public final fun copy (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/handlers/AfterHandler; - public static synthetic fun copy$default (Lcom/hexagonkt/handlers/AfterHandler;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/handlers/AfterHandler; + public final fun copy (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/handlers/AfterHandler; + public static synthetic fun copy$default (Lcom/hexagontk/handlers/AfterHandler;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/handlers/AfterHandler; public fun equals (Ljava/lang/Object;)Z public final fun getAfterPredicate ()Lkotlin/jvm/functions/Function1; public fun getCallback ()Lkotlin/jvm/functions/Function1; public fun getPredicate ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/handlers/BeforeHandler : com/hexagonkt/handlers/Handler { +public final class com/hexagontk/handlers/BeforeHandler : com/hexagontk/handlers/Handler { public fun (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V public synthetic fun (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Lkotlin/jvm/functions/Function1; public final fun component2 ()Lkotlin/jvm/functions/Function1; - public final fun copy (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/handlers/BeforeHandler; - public static synthetic fun copy$default (Lcom/hexagonkt/handlers/BeforeHandler;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/handlers/BeforeHandler; + public final fun copy (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/handlers/BeforeHandler; + public static synthetic fun copy$default (Lcom/hexagontk/handlers/BeforeHandler;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/handlers/BeforeHandler; public fun equals (Ljava/lang/Object;)Z public fun getCallback ()Lkotlin/jvm/functions/Function1; public fun getPredicate ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/handlers/ChainHandler : com/hexagonkt/handlers/Handler { +public final class com/hexagontk/handlers/ChainHandler : com/hexagontk/handlers/Handler { public fun (Ljava/util/List;Lkotlin/jvm/functions/Function1;)V public synthetic fun (Ljava/util/List;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun (Lkotlin/jvm/functions/Function1;[Lcom/hexagonkt/handlers/Handler;)V - public fun ([Lcom/hexagonkt/handlers/Handler;)V + public fun (Lkotlin/jvm/functions/Function1;[Lcom/hexagontk/handlers/Handler;)V + public fun ([Lcom/hexagontk/handlers/Handler;)V public final fun component1 ()Ljava/util/List; public final fun component2 ()Lkotlin/jvm/functions/Function1; - public final fun copy (Ljava/util/List;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/handlers/ChainHandler; - public static synthetic fun copy$default (Lcom/hexagonkt/handlers/ChainHandler;Ljava/util/List;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/handlers/ChainHandler; + public final fun copy (Ljava/util/List;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/handlers/ChainHandler; + public static synthetic fun copy$default (Lcom/hexagontk/handlers/ChainHandler;Ljava/util/List;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/handlers/ChainHandler; public fun equals (Ljava/lang/Object;)Z public fun getCallback ()Lkotlin/jvm/functions/Function1; public final fun getHandlers ()Ljava/util/List; public fun getPredicate ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; public fun toString ()Ljava/lang/String; } -public abstract interface class com/hexagonkt/handlers/Context { +public abstract interface class com/hexagontk/handlers/Context { public abstract fun getAttributes ()Ljava/util/Map; public abstract fun getEvent ()Ljava/lang/Object; public abstract fun getException ()Ljava/lang/Exception; @@ -55,23 +55,23 @@ public abstract interface class com/hexagonkt/handlers/Context { public abstract fun getNextHandler ()I public abstract fun getNextHandlers ()Ljava/util/List; public abstract fun getPredicate ()Lkotlin/jvm/functions/Function1; - public abstract fun next ()Lcom/hexagonkt/handlers/Context; - public abstract fun with (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;Z)Lcom/hexagonkt/handlers/Context; + public abstract fun next ()Lcom/hexagontk/handlers/Context; + public abstract fun with (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;Z)Lcom/hexagontk/handlers/Context; } -public final class com/hexagonkt/handlers/Context$DefaultImpls { - public static fun next (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; - public static synthetic fun with$default (Lcom/hexagonkt/handlers/Context;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;ZILjava/lang/Object;)Lcom/hexagonkt/handlers/Context; +public final class com/hexagontk/handlers/Context$DefaultImpls { + public static fun next (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; + public static synthetic fun with$default (Lcom/hexagontk/handlers/Context;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;ZILjava/lang/Object;)Lcom/hexagontk/handlers/Context; } -public final class com/hexagonkt/handlers/ExceptionHandler : com/hexagonkt/handlers/Handler { +public final class com/hexagontk/handlers/ExceptionHandler : com/hexagontk/handlers/Handler { public fun (Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;)V public synthetic fun (Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Lkotlin/reflect/KClass; public final fun component2 ()Z public final fun component3 ()Lkotlin/jvm/functions/Function2; - public final fun copy (Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;)Lcom/hexagonkt/handlers/ExceptionHandler; - public static synthetic fun copy$default (Lcom/hexagonkt/handlers/ExceptionHandler;Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/hexagonkt/handlers/ExceptionHandler; + public final fun copy (Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;)Lcom/hexagontk/handlers/ExceptionHandler; + public static synthetic fun copy$default (Lcom/hexagontk/handlers/ExceptionHandler;Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/hexagontk/handlers/ExceptionHandler; public fun equals (Ljava/lang/Object;)Z public fun getCallback ()Lkotlin/jvm/functions/Function1; public final fun getClear ()Z @@ -79,43 +79,43 @@ public final class com/hexagonkt/handlers/ExceptionHandler : com/hexagonkt/handl public final fun getExceptionCallback ()Lkotlin/jvm/functions/Function2; public fun getPredicate ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/handlers/FilterHandler : com/hexagonkt/handlers/Handler { +public final class com/hexagontk/handlers/FilterHandler : com/hexagontk/handlers/Handler { public fun (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V public synthetic fun (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Lkotlin/jvm/functions/Function1; public final fun component2 ()Lkotlin/jvm/functions/Function1; - public final fun copy (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/handlers/FilterHandler; - public static synthetic fun copy$default (Lcom/hexagonkt/handlers/FilterHandler;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/handlers/FilterHandler; + public final fun copy (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/handlers/FilterHandler; + public static synthetic fun copy$default (Lcom/hexagontk/handlers/FilterHandler;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/handlers/FilterHandler; public fun equals (Ljava/lang/Object;)Z public fun getCallback ()Lkotlin/jvm/functions/Function1; public fun getPredicate ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; public fun toString ()Ljava/lang/String; } -public abstract interface class com/hexagonkt/handlers/Handler { +public abstract interface class com/hexagontk/handlers/Handler { public abstract fun getCallback ()Lkotlin/jvm/functions/Function1; public abstract fun getPredicate ()Lkotlin/jvm/functions/Function1; - public abstract fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; + public abstract fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; } -public final class com/hexagonkt/handlers/OnHandler : com/hexagonkt/handlers/Handler { +public final class com/hexagontk/handlers/OnHandler : com/hexagontk/handlers/Handler { public fun (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V public synthetic fun (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Lkotlin/jvm/functions/Function1; public final fun component2 ()Lkotlin/jvm/functions/Function1; - public final fun copy (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/handlers/OnHandler; - public static synthetic fun copy$default (Lcom/hexagonkt/handlers/OnHandler;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/handlers/OnHandler; + public final fun copy (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/handlers/OnHandler; + public static synthetic fun copy$default (Lcom/hexagontk/handlers/OnHandler;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/handlers/OnHandler; public fun equals (Ljava/lang/Object;)Z public fun getCallback ()Lkotlin/jvm/functions/Function1; public fun getPredicate ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; public fun toString ()Ljava/lang/String; } diff --git a/handlers/src/jmh/kotlin/com/hexagonkt/handlers/JmhBenchmark.kt b/handlers/src/jmh/kotlin/com/hexagonkt/handlers/JmhBenchmark.kt index 6667b0c3ba..6a9a85b82d 100644 --- a/handlers/src/jmh/kotlin/com/hexagonkt/handlers/JmhBenchmark.kt +++ b/handlers/src/jmh/kotlin/com/hexagonkt/handlers/JmhBenchmark.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers import org.openjdk.jmh.annotations.Benchmark import org.openjdk.jmh.annotations.Scope diff --git a/handlers/src/main/kotlin/com/hexagonkt/handlers/AfterHandler.kt b/handlers/src/main/kotlin/com/hexagonkt/handlers/AfterHandler.kt index 106f7058ed..edfe1a356e 100644 --- a/handlers/src/main/kotlin/com/hexagonkt/handlers/AfterHandler.kt +++ b/handlers/src/main/kotlin/com/hexagonkt/handlers/AfterHandler.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers /** * After handlers are executed even if a filter don't call next handler (if after was added before diff --git a/handlers/src/main/kotlin/com/hexagonkt/handlers/BeforeHandler.kt b/handlers/src/main/kotlin/com/hexagonkt/handlers/BeforeHandler.kt index d18a8cd448..e5bded95c4 100644 --- a/handlers/src/main/kotlin/com/hexagonkt/handlers/BeforeHandler.kt +++ b/handlers/src/main/kotlin/com/hexagonkt/handlers/BeforeHandler.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers data class BeforeHandler( override val predicate: (Context) -> Boolean = { true }, diff --git a/handlers/src/main/kotlin/com/hexagonkt/handlers/ChainHandler.kt b/handlers/src/main/kotlin/com/hexagonkt/handlers/ChainHandler.kt index 4c44c9c622..ebeab08070 100644 --- a/handlers/src/main/kotlin/com/hexagonkt/handlers/ChainHandler.kt +++ b/handlers/src/main/kotlin/com/hexagonkt/handlers/ChainHandler.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers data class ChainHandler( val handlers: List>, diff --git a/handlers/src/main/kotlin/com/hexagonkt/handlers/Context.kt b/handlers/src/main/kotlin/com/hexagonkt/handlers/Context.kt index 4e1fd69457..e61a403416 100644 --- a/handlers/src/main/kotlin/com/hexagonkt/handlers/Context.kt +++ b/handlers/src/main/kotlin/com/hexagonkt/handlers/Context.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers /** * Context for an event. diff --git a/handlers/src/main/kotlin/com/hexagonkt/handlers/ExceptionHandler.kt b/handlers/src/main/kotlin/com/hexagonkt/handlers/ExceptionHandler.kt index 162a53d445..a1fdb04822 100644 --- a/handlers/src/main/kotlin/com/hexagonkt/handlers/ExceptionHandler.kt +++ b/handlers/src/main/kotlin/com/hexagonkt/handlers/ExceptionHandler.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers import kotlin.reflect.KClass diff --git a/handlers/src/main/kotlin/com/hexagonkt/handlers/FilterHandler.kt b/handlers/src/main/kotlin/com/hexagonkt/handlers/FilterHandler.kt index 758fa67ac4..3c9faefdf6 100644 --- a/handlers/src/main/kotlin/com/hexagonkt/handlers/FilterHandler.kt +++ b/handlers/src/main/kotlin/com/hexagonkt/handlers/FilterHandler.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers data class FilterHandler( override val predicate: (Context) -> Boolean = { true }, diff --git a/handlers/src/main/kotlin/com/hexagonkt/handlers/Handler.kt b/handlers/src/main/kotlin/com/hexagonkt/handlers/Handler.kt index 5fdda657d5..e7eee4fcb2 100644 --- a/handlers/src/main/kotlin/com/hexagonkt/handlers/Handler.kt +++ b/handlers/src/main/kotlin/com/hexagonkt/handlers/Handler.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers /** * Handler for an event. diff --git a/handlers/src/main/kotlin/com/hexagonkt/handlers/Handlers.kt b/handlers/src/main/kotlin/com/hexagonkt/handlers/Handlers.kt index 967b14fc0c..c9aca9a931 100644 --- a/handlers/src/main/kotlin/com/hexagonkt/handlers/Handlers.kt +++ b/handlers/src/main/kotlin/com/hexagonkt/handlers/Handlers.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers import kotlin.reflect.KClass import kotlin.reflect.cast diff --git a/handlers/src/main/kotlin/com/hexagonkt/handlers/OnHandler.kt b/handlers/src/main/kotlin/com/hexagonkt/handlers/OnHandler.kt index 9e63eff2a3..7644d6ee3a 100644 --- a/handlers/src/main/kotlin/com/hexagonkt/handlers/OnHandler.kt +++ b/handlers/src/main/kotlin/com/hexagonkt/handlers/OnHandler.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers data class OnHandler( override val predicate: (Context) -> Boolean = { true }, diff --git a/handlers/src/main/kotlin/module-info.java b/handlers/src/main/kotlin/module-info.java index bd247dd3e4..3c9b923651 100644 --- a/handlers/src/main/kotlin/module-info.java +++ b/handlers/src/main/kotlin/module-info.java @@ -1,9 +1,9 @@ /** * . */ -module com.hexagonkt.handlers { +module com.hexagontk.handlers { requires transitive kotlin.stdlib; - exports com.hexagonkt.handlers; + exports com.hexagontk.handlers; } diff --git a/handlers/src/test/kotlin/com/hexagonkt/handlers/ChainHandlerTest.kt b/handlers/src/test/kotlin/com/hexagonkt/handlers/ChainHandlerTest.kt index c5efd313d6..820dafe8bc 100644 --- a/handlers/src/test/kotlin/com/hexagonkt/handlers/ChainHandlerTest.kt +++ b/handlers/src/test/kotlin/com/hexagonkt/handlers/ChainHandlerTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers import kotlin.IllegalStateException import kotlin.system.measureNanoTime @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertIs import kotlin.test.assertTrue -import com.hexagonkt.handlers.HandlerTest.Companion.process +import com.hexagontk.handlers.HandlerTest.Companion.process internal class ChainHandlerTest { diff --git a/handlers/src/test/kotlin/com/hexagonkt/handlers/EventContext.kt b/handlers/src/test/kotlin/com/hexagonkt/handlers/EventContext.kt index 6b79043b37..c17f2a3cd0 100644 --- a/handlers/src/test/kotlin/com/hexagonkt/handlers/EventContext.kt +++ b/handlers/src/test/kotlin/com/hexagonkt/handlers/EventContext.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers data class EventContext( override val event: T, diff --git a/handlers/src/test/kotlin/com/hexagonkt/handlers/ExceptionHandlerTest.kt b/handlers/src/test/kotlin/com/hexagonkt/handlers/ExceptionHandlerTest.kt index 7738a93ea4..cec18c61a5 100644 --- a/handlers/src/test/kotlin/com/hexagonkt/handlers/ExceptionHandlerTest.kt +++ b/handlers/src/test/kotlin/com/hexagonkt/handlers/ExceptionHandlerTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/handlers/src/test/kotlin/com/hexagonkt/handlers/HandlerTest.kt b/handlers/src/test/kotlin/com/hexagonkt/handlers/HandlerTest.kt index aac11f637e..ee4c4bc877 100644 --- a/handlers/src/test/kotlin/com/hexagonkt/handlers/HandlerTest.kt +++ b/handlers/src/test/kotlin/com/hexagonkt/handlers/HandlerTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers import org.junit.jupiter.api.Test import kotlin.test.* diff --git a/handlers/src/test/kotlin/com/hexagonkt/handlers/HandlersTest.kt b/handlers/src/test/kotlin/com/hexagonkt/handlers/HandlersTest.kt index f466d4142d..3f3e63fecd 100644 --- a/handlers/src/test/kotlin/com/hexagonkt/handlers/HandlersTest.kt +++ b/handlers/src/test/kotlin/com/hexagonkt/handlers/HandlersTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/handlers/src/test/kotlin/com/hexagonkt/handlers/OnHandlerTest.kt b/handlers/src/test/kotlin/com/hexagonkt/handlers/OnHandlerTest.kt index 3ace644e9a..68be5d1091 100644 --- a/handlers/src/test/kotlin/com/hexagonkt/handlers/OnHandlerTest.kt +++ b/handlers/src/test/kotlin/com/hexagonkt/handlers/OnHandlerTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.handlers +package com.hexagontk.handlers -import com.hexagonkt.handlers.HandlerTest.Companion.process +import com.hexagontk.handlers.HandlerTest.Companion.process import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/http/http/README.md b/http/http/README.md index cac523011b..3383e5017c 100644 --- a/http/http/README.md +++ b/http/http/README.md @@ -3,16 +3,16 @@ This module holds HTTP classes and utilities independent of third party libraries and shared among HTTP clients and HTTP servers. -# Package com.hexagonkt.http +# Package com.hexagontk.http HTTP code shared between clients and servers. -# Package com.hexagonkt.http.model +# Package com.hexagontk.http.model TODO -# Package com.hexagonkt.http.model.ws +# Package com.hexagontk.http.model.ws TODO -# Package com.hexagonkt.http.patterns +# Package com.hexagontk.http.patterns TODO > TODO Capabilities enum for client/servers to declare its functionalities (along with protocols) diff --git a/http/http/api/http.api b/http/http/api/http.api index 75e73f26c0..2ebec60da1 100644 --- a/http/http/api/http.api +++ b/http/http/api/http.api @@ -1,18 +1,18 @@ -public final class com/hexagonkt/http/HttpKt { +public final class com/hexagontk/http/HttpKt { public static final fun basicAuth (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; public static synthetic fun basicAuth$default (Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String; - public static final fun checkHeaders (Lcom/hexagonkt/http/model/Headers;)V - public static final fun formatQueryString (Lcom/hexagonkt/http/model/QueryParameters;)Ljava/lang/String; + public static final fun checkHeaders (Lcom/hexagontk/http/model/Headers;)V + public static final fun formatQueryString (Lcom/hexagontk/http/model/QueryParameters;)Ljava/lang/String; public static final fun getCHECKED_HEADERS ()Ljava/util/List; - public static final fun parseContentType (Ljava/lang/String;)Lcom/hexagonkt/http/model/ContentType; - public static final fun parseQueryString (Ljava/lang/String;)Lcom/hexagonkt/http/model/QueryParameters; + public static final fun parseContentType (Ljava/lang/String;)Lcom/hexagontk/http/model/ContentType; + public static final fun parseQueryString (Ljava/lang/String;)Lcom/hexagontk/http/model/QueryParameters; public static final fun toHttpFormat (Ljava/time/Instant;)Ljava/lang/String; public static final fun toHttpFormat (Ljava/time/LocalDateTime;)Ljava/lang/String; public static final fun urlDecode (Ljava/lang/String;)Ljava/lang/String; public static final fun urlEncode (Ljava/lang/String;)Ljava/lang/String; } -public final class com/hexagonkt/http/SslSettings { +public final class com/hexagontk/http/SslSettings { public fun ()V public fun (Ljava/net/URL;Ljava/lang/String;Ljava/net/URL;Ljava/lang/String;Z)V public synthetic fun (Ljava/net/URL;Ljava/lang/String;Ljava/net/URL;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -21,8 +21,8 @@ public final class com/hexagonkt/http/SslSettings { public final fun component3 ()Ljava/net/URL; public final fun component4 ()Ljava/lang/String; public final fun component5 ()Z - public final fun copy (Ljava/net/URL;Ljava/lang/String;Ljava/net/URL;Ljava/lang/String;Z)Lcom/hexagonkt/http/SslSettings; - public static synthetic fun copy$default (Lcom/hexagonkt/http/SslSettings;Ljava/net/URL;Ljava/lang/String;Ljava/net/URL;Ljava/lang/String;ZILjava/lang/Object;)Lcom/hexagonkt/http/SslSettings; + public final fun copy (Ljava/net/URL;Ljava/lang/String;Ljava/net/URL;Ljava/lang/String;Z)Lcom/hexagontk/http/SslSettings; + public static synthetic fun copy$default (Lcom/hexagontk/http/SslSettings;Ljava/net/URL;Ljava/lang/String;Ljava/net/URL;Ljava/lang/String;ZILjava/lang/Object;)Lcom/hexagontk/http/SslSettings; public fun equals (Ljava/lang/Object;)Z public final fun getClientAuth ()Z public final fun getKeyStore ()Ljava/net/URL; @@ -33,12 +33,12 @@ public final class com/hexagonkt/http/SslSettings { public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/model/Authorization { +public final class com/hexagontk/http/model/Authorization { public fun (Ljava/lang/String;Ljava/lang/String;)V public final fun component1 ()Ljava/lang/String; public final fun component2 ()Ljava/lang/String; - public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/hexagonkt/http/model/Authorization; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/Authorization;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/hexagonkt/http/model/Authorization; + public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/hexagontk/http/model/Authorization; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/Authorization;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/hexagontk/http/model/Authorization; public fun equals (Ljava/lang/Object;)Z public final fun getText ()Ljava/lang/String; public final fun getType ()Ljava/lang/String; @@ -47,28 +47,28 @@ public final class com/hexagonkt/http/model/Authorization { public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/model/ContentType { - public fun (Lcom/hexagonkt/core/media/MediaType;Ljava/lang/String;Ljava/nio/charset/Charset;Ljava/lang/Double;)V - public synthetic fun (Lcom/hexagonkt/core/media/MediaType;Ljava/lang/String;Ljava/nio/charset/Charset;Ljava/lang/Double;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun component1 ()Lcom/hexagonkt/core/media/MediaType; +public final class com/hexagontk/http/model/ContentType { + public fun (Lcom/hexagontk/core/media/MediaType;Ljava/lang/String;Ljava/nio/charset/Charset;Ljava/lang/Double;)V + public synthetic fun (Lcom/hexagontk/core/media/MediaType;Ljava/lang/String;Ljava/nio/charset/Charset;Ljava/lang/Double;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Lcom/hexagontk/core/media/MediaType; public final fun component2 ()Ljava/lang/String; public final fun component3 ()Ljava/nio/charset/Charset; public final fun component4 ()Ljava/lang/Double; - public final fun copy (Lcom/hexagonkt/core/media/MediaType;Ljava/lang/String;Ljava/nio/charset/Charset;Ljava/lang/Double;)Lcom/hexagonkt/http/model/ContentType; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/ContentType;Lcom/hexagonkt/core/media/MediaType;Ljava/lang/String;Ljava/nio/charset/Charset;Ljava/lang/Double;ILjava/lang/Object;)Lcom/hexagonkt/http/model/ContentType; + public final fun copy (Lcom/hexagontk/core/media/MediaType;Ljava/lang/String;Ljava/nio/charset/Charset;Ljava/lang/Double;)Lcom/hexagontk/http/model/ContentType; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/ContentType;Lcom/hexagontk/core/media/MediaType;Ljava/lang/String;Ljava/nio/charset/Charset;Ljava/lang/Double;ILjava/lang/Object;)Lcom/hexagontk/http/model/ContentType; public fun equals (Ljava/lang/Object;)Z public final fun getBoundary ()Ljava/lang/String; public final fun getCharset ()Ljava/nio/charset/Charset; - public final fun getMediaType ()Lcom/hexagonkt/core/media/MediaType; + public final fun getMediaType ()Lcom/hexagontk/core/media/MediaType; public final fun getQ ()Ljava/lang/Double; public final fun getText ()Ljava/lang/String; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/model/Cookie { - public fun (Ljava/lang/String;Ljava/lang/String;JZLjava/lang/String;ZLjava/lang/String;Lcom/hexagonkt/http/model/CookieSameSite;Ljava/time/Instant;)V - public synthetic fun (Ljava/lang/String;Ljava/lang/String;JZLjava/lang/String;ZLjava/lang/String;Lcom/hexagonkt/http/model/CookieSameSite;Ljava/time/Instant;ILkotlin/jvm/internal/DefaultConstructorMarker;)V +public final class com/hexagontk/http/model/Cookie { + public fun (Ljava/lang/String;Ljava/lang/String;JZLjava/lang/String;ZLjava/lang/String;Lcom/hexagontk/http/model/CookieSameSite;Ljava/time/Instant;)V + public synthetic fun (Ljava/lang/String;Ljava/lang/String;JZLjava/lang/String;ZLjava/lang/String;Lcom/hexagontk/http/model/CookieSameSite;Ljava/time/Instant;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ljava/lang/String; public final fun component2 ()Ljava/lang/String; public final fun component3 ()J @@ -76,11 +76,11 @@ public final class com/hexagonkt/http/model/Cookie { public final fun component5 ()Ljava/lang/String; public final fun component6 ()Z public final fun component7 ()Ljava/lang/String; - public final fun component8 ()Lcom/hexagonkt/http/model/CookieSameSite; + public final fun component8 ()Lcom/hexagontk/http/model/CookieSameSite; public final fun component9 ()Ljava/time/Instant; - public final fun copy (Ljava/lang/String;Ljava/lang/String;JZLjava/lang/String;ZLjava/lang/String;Lcom/hexagonkt/http/model/CookieSameSite;Ljava/time/Instant;)Lcom/hexagonkt/http/model/Cookie; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/Cookie;Ljava/lang/String;Ljava/lang/String;JZLjava/lang/String;ZLjava/lang/String;Lcom/hexagonkt/http/model/CookieSameSite;Ljava/time/Instant;ILjava/lang/Object;)Lcom/hexagonkt/http/model/Cookie; - public final fun delete ()Lcom/hexagonkt/http/model/Cookie; + public final fun copy (Ljava/lang/String;Ljava/lang/String;JZLjava/lang/String;ZLjava/lang/String;Lcom/hexagontk/http/model/CookieSameSite;Ljava/time/Instant;)Lcom/hexagontk/http/model/Cookie; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/Cookie;Ljava/lang/String;Ljava/lang/String;JZLjava/lang/String;ZLjava/lang/String;Lcom/hexagontk/http/model/CookieSameSite;Ljava/time/Instant;ILjava/lang/Object;)Lcom/hexagontk/http/model/Cookie; + public final fun delete ()Lcom/hexagontk/http/model/Cookie; public fun equals (Ljava/lang/Object;)Z public final fun getDeleted ()Z public final fun getDomain ()Ljava/lang/String; @@ -89,66 +89,66 @@ public final class com/hexagonkt/http/model/Cookie { public final fun getMaxAge ()J public final fun getName ()Ljava/lang/String; public final fun getPath ()Ljava/lang/String; - public final fun getSameSite ()Lcom/hexagonkt/http/model/CookieSameSite; + public final fun getSameSite ()Lcom/hexagontk/http/model/CookieSameSite; public final fun getSecure ()Z public final fun getValue ()Ljava/lang/String; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/model/CookieSameSite : java/lang/Enum { - public static final field LAX Lcom/hexagonkt/http/model/CookieSameSite; - public static final field NONE Lcom/hexagonkt/http/model/CookieSameSite; - public static final field STRICT Lcom/hexagonkt/http/model/CookieSameSite; +public final class com/hexagontk/http/model/CookieSameSite : java/lang/Enum { + public static final field LAX Lcom/hexagontk/http/model/CookieSameSite; + public static final field NONE Lcom/hexagontk/http/model/CookieSameSite; + public static final field STRICT Lcom/hexagontk/http/model/CookieSameSite; public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lcom/hexagonkt/http/model/CookieSameSite; - public static fun values ()[Lcom/hexagonkt/http/model/CookieSameSite; + public static fun valueOf (Ljava/lang/String;)Lcom/hexagontk/http/model/CookieSameSite; + public static fun values ()[Lcom/hexagontk/http/model/CookieSameSite; } -public final class com/hexagonkt/http/model/FormParameter : com/hexagonkt/http/model/HttpField { +public final class com/hexagontk/http/model/FormParameter : com/hexagontk/http/model/HttpField { public fun (Ljava/lang/String;Ljava/util/List;)V public fun (Ljava/lang/String;[Ljava/lang/Object;)V public final fun component1 ()Ljava/lang/String; public final fun component2 ()Ljava/util/List; - public final fun copy (Ljava/lang/String;Ljava/util/List;)Lcom/hexagonkt/http/model/FormParameter; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/FormParameter;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/model/FormParameter; + public final fun copy (Ljava/lang/String;Ljava/util/List;)Lcom/hexagontk/http/model/FormParameter; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/FormParameter;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/model/FormParameter; public fun equals (Ljava/lang/Object;)Z public fun getName ()Ljava/lang/String; public fun getValue ()Ljava/lang/Object; public fun getValues ()Ljava/util/List; public fun hashCode ()I - public fun minus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/FormParameter; - public synthetic fun minus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/HttpField; - public fun plus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/FormParameter; - public synthetic fun plus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/HttpField; + public fun minus (Ljava/lang/Object;)Lcom/hexagontk/http/model/FormParameter; + public synthetic fun minus (Ljava/lang/Object;)Lcom/hexagontk/http/model/HttpField; + public fun plus (Ljava/lang/Object;)Lcom/hexagontk/http/model/FormParameter; + public synthetic fun plus (Ljava/lang/Object;)Lcom/hexagontk/http/model/HttpField; public fun string ()Ljava/lang/String; public fun strings ()Ljava/util/List; public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/model/FormParameters : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker { +public final class com/hexagontk/http/model/FormParameters : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker { public fun (Ljava/util/List;)V public fun (Ljava/util/Map;)V - public fun ([Lcom/hexagonkt/http/model/FormParameter;)V + public fun ([Lcom/hexagontk/http/model/FormParameter;)V public fun clear ()V public final fun component1 ()Ljava/util/Map; public synthetic fun compute (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object; - public fun compute (Ljava/lang/String;Ljava/util/function/BiFunction;)Lcom/hexagonkt/http/model/FormParameter; + public fun compute (Ljava/lang/String;Ljava/util/function/BiFunction;)Lcom/hexagontk/http/model/FormParameter; public synthetic fun computeIfAbsent (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; - public fun computeIfAbsent (Ljava/lang/String;Ljava/util/function/Function;)Lcom/hexagonkt/http/model/FormParameter; + public fun computeIfAbsent (Ljava/lang/String;Ljava/util/function/Function;)Lcom/hexagontk/http/model/FormParameter; public synthetic fun computeIfPresent (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object; - public fun computeIfPresent (Ljava/lang/String;Ljava/util/function/BiFunction;)Lcom/hexagonkt/http/model/FormParameter; + public fun computeIfPresent (Ljava/lang/String;Ljava/util/function/BiFunction;)Lcom/hexagontk/http/model/FormParameter; public final fun containsKey (Ljava/lang/Object;)Z public fun containsKey (Ljava/lang/String;)Z - public fun containsValue (Lcom/hexagonkt/http/model/FormParameter;)Z + public fun containsValue (Lcom/hexagontk/http/model/FormParameter;)Z public final fun containsValue (Ljava/lang/Object;)Z - public final fun copy (Ljava/util/Map;)Lcom/hexagonkt/http/model/FormParameters; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/FormParameters;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/model/FormParameters; + public final fun copy (Ljava/util/Map;)Lcom/hexagontk/http/model/FormParameters; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/FormParameters;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/model/FormParameters; public final fun entrySet ()Ljava/util/Set; public fun equals (Ljava/lang/Object;)Z - public final fun get (Ljava/lang/Object;)Lcom/hexagonkt/http/model/FormParameter; + public final fun get (Ljava/lang/Object;)Lcom/hexagontk/http/model/FormParameter; public final synthetic fun get (Ljava/lang/Object;)Ljava/lang/Object; - public fun get (Ljava/lang/String;)Lcom/hexagonkt/http/model/FormParameter; + public fun get (Ljava/lang/String;)Lcom/hexagontk/http/model/FormParameter; public fun getEntries ()Ljava/util/Set; public final fun getHttpFields ()Ljava/util/Map; public fun getKeys ()Ljava/util/Set; @@ -158,72 +158,72 @@ public final class com/hexagonkt/http/model/FormParameters : java/util/Map, kotl public fun isEmpty ()Z public final fun keySet ()Ljava/util/Set; public synthetic fun merge (Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object; - public fun merge (Ljava/lang/String;Lcom/hexagonkt/http/model/FormParameter;Ljava/util/function/BiFunction;)Lcom/hexagonkt/http/model/FormParameter; - public final fun minus (Ljava/lang/String;)Lcom/hexagonkt/http/model/FormParameters; - public final fun plus (Lcom/hexagonkt/http/model/FormParameter;)Lcom/hexagonkt/http/model/FormParameters; - public final fun plus (Lcom/hexagonkt/http/model/FormParameters;)Lcom/hexagonkt/http/model/FormParameters; + public fun merge (Ljava/lang/String;Lcom/hexagontk/http/model/FormParameter;Ljava/util/function/BiFunction;)Lcom/hexagontk/http/model/FormParameter; + public final fun minus (Ljava/lang/String;)Lcom/hexagontk/http/model/FormParameters; + public final fun plus (Lcom/hexagontk/http/model/FormParameter;)Lcom/hexagontk/http/model/FormParameters; + public final fun plus (Lcom/hexagontk/http/model/FormParameters;)Lcom/hexagontk/http/model/FormParameters; public synthetic fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - public fun put (Ljava/lang/String;Lcom/hexagonkt/http/model/FormParameter;)Lcom/hexagonkt/http/model/FormParameter; + public fun put (Ljava/lang/String;Lcom/hexagontk/http/model/FormParameter;)Lcom/hexagontk/http/model/FormParameter; public fun putAll (Ljava/util/Map;)V public synthetic fun putIfAbsent (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - public fun putIfAbsent (Ljava/lang/String;Lcom/hexagonkt/http/model/FormParameter;)Lcom/hexagonkt/http/model/FormParameter; - public fun remove (Ljava/lang/Object;)Lcom/hexagonkt/http/model/FormParameter; + public fun putIfAbsent (Ljava/lang/String;Lcom/hexagontk/http/model/FormParameter;)Lcom/hexagontk/http/model/FormParameter; + public fun remove (Ljava/lang/Object;)Lcom/hexagontk/http/model/FormParameter; public synthetic fun remove (Ljava/lang/Object;)Ljava/lang/Object; public fun remove (Ljava/lang/Object;Ljava/lang/Object;)Z public synthetic fun replace (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; public synthetic fun replace (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z - public fun replace (Ljava/lang/String;Lcom/hexagonkt/http/model/FormParameter;)Lcom/hexagonkt/http/model/FormParameter; - public fun replace (Ljava/lang/String;Lcom/hexagonkt/http/model/FormParameter;Lcom/hexagonkt/http/model/FormParameter;)Z + public fun replace (Ljava/lang/String;Lcom/hexagontk/http/model/FormParameter;)Lcom/hexagontk/http/model/FormParameter; + public fun replace (Ljava/lang/String;Lcom/hexagontk/http/model/FormParameter;Lcom/hexagontk/http/model/FormParameter;)Z public fun replaceAll (Ljava/util/function/BiFunction;)V public final fun size ()I public fun toString ()Ljava/lang/String; public final fun values ()Ljava/util/Collection; } -public final class com/hexagonkt/http/model/Header : com/hexagonkt/http/model/HttpField { +public final class com/hexagontk/http/model/Header : com/hexagontk/http/model/HttpField { public fun (Ljava/lang/String;Ljava/util/List;)V public fun (Ljava/lang/String;[Ljava/lang/Object;)V public final fun component1 ()Ljava/lang/String; public final fun component2 ()Ljava/util/List; - public final fun copy (Ljava/lang/String;Ljava/util/List;)Lcom/hexagonkt/http/model/Header; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/Header;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/model/Header; + public final fun copy (Ljava/lang/String;Ljava/util/List;)Lcom/hexagontk/http/model/Header; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/Header;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/model/Header; public fun equals (Ljava/lang/Object;)Z public fun getName ()Ljava/lang/String; public fun getValue ()Ljava/lang/Object; public fun getValues ()Ljava/util/List; public fun hashCode ()I - public fun minus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/Header; - public synthetic fun minus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/HttpField; - public fun plus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/Header; - public synthetic fun plus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/HttpField; + public fun minus (Ljava/lang/Object;)Lcom/hexagontk/http/model/Header; + public synthetic fun minus (Ljava/lang/Object;)Lcom/hexagontk/http/model/HttpField; + public fun plus (Ljava/lang/Object;)Lcom/hexagontk/http/model/Header; + public synthetic fun plus (Ljava/lang/Object;)Lcom/hexagontk/http/model/HttpField; public fun string ()Ljava/lang/String; public fun strings ()Ljava/util/List; public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/model/Headers : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker { +public final class com/hexagontk/http/model/Headers : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker { public fun (Ljava/util/List;)V public fun (Ljava/util/Map;)V - public fun ([Lcom/hexagonkt/http/model/Header;)V + public fun ([Lcom/hexagontk/http/model/Header;)V public fun clear ()V public final fun component1 ()Ljava/util/Map; public synthetic fun compute (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object; - public fun compute (Ljava/lang/String;Ljava/util/function/BiFunction;)Lcom/hexagonkt/http/model/Header; + public fun compute (Ljava/lang/String;Ljava/util/function/BiFunction;)Lcom/hexagontk/http/model/Header; public synthetic fun computeIfAbsent (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; - public fun computeIfAbsent (Ljava/lang/String;Ljava/util/function/Function;)Lcom/hexagonkt/http/model/Header; + public fun computeIfAbsent (Ljava/lang/String;Ljava/util/function/Function;)Lcom/hexagontk/http/model/Header; public synthetic fun computeIfPresent (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object; - public fun computeIfPresent (Ljava/lang/String;Ljava/util/function/BiFunction;)Lcom/hexagonkt/http/model/Header; + public fun computeIfPresent (Ljava/lang/String;Ljava/util/function/BiFunction;)Lcom/hexagontk/http/model/Header; public final fun containsKey (Ljava/lang/Object;)Z public fun containsKey (Ljava/lang/String;)Z - public fun containsValue (Lcom/hexagonkt/http/model/Header;)Z + public fun containsValue (Lcom/hexagontk/http/model/Header;)Z public final fun containsValue (Ljava/lang/Object;)Z - public final fun copy (Ljava/util/Map;)Lcom/hexagonkt/http/model/Headers; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/Headers;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/model/Headers; + public final fun copy (Ljava/util/Map;)Lcom/hexagontk/http/model/Headers; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/Headers;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/model/Headers; public final fun entrySet ()Ljava/util/Set; public fun equals (Ljava/lang/Object;)Z - public final fun get (Ljava/lang/Object;)Lcom/hexagonkt/http/model/Header; + public final fun get (Ljava/lang/Object;)Lcom/hexagontk/http/model/Header; public final synthetic fun get (Ljava/lang/Object;)Ljava/lang/Object; - public fun get (Ljava/lang/String;)Lcom/hexagonkt/http/model/Header; + public fun get (Ljava/lang/String;)Lcom/hexagontk/http/model/Header; public fun getEntries ()Ljava/util/Set; public final fun getHttpFields ()Ljava/util/Map; public fun getKeys ()Ljava/util/Set; @@ -233,116 +233,116 @@ public final class com/hexagonkt/http/model/Headers : java/util/Map, kotlin/jvm/ public fun isEmpty ()Z public final fun keySet ()Ljava/util/Set; public synthetic fun merge (Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object; - public fun merge (Ljava/lang/String;Lcom/hexagonkt/http/model/Header;Ljava/util/function/BiFunction;)Lcom/hexagonkt/http/model/Header; - public final fun minus (Ljava/lang/String;)Lcom/hexagonkt/http/model/Headers; - public final fun plus (Lcom/hexagonkt/http/model/Header;)Lcom/hexagonkt/http/model/Headers; - public final fun plus (Lcom/hexagonkt/http/model/Headers;)Lcom/hexagonkt/http/model/Headers; + public fun merge (Ljava/lang/String;Lcom/hexagontk/http/model/Header;Ljava/util/function/BiFunction;)Lcom/hexagontk/http/model/Header; + public final fun minus (Ljava/lang/String;)Lcom/hexagontk/http/model/Headers; + public final fun plus (Lcom/hexagontk/http/model/Header;)Lcom/hexagontk/http/model/Headers; + public final fun plus (Lcom/hexagontk/http/model/Headers;)Lcom/hexagontk/http/model/Headers; public synthetic fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - public fun put (Ljava/lang/String;Lcom/hexagonkt/http/model/Header;)Lcom/hexagonkt/http/model/Header; + public fun put (Ljava/lang/String;Lcom/hexagontk/http/model/Header;)Lcom/hexagontk/http/model/Header; public fun putAll (Ljava/util/Map;)V public synthetic fun putIfAbsent (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - public fun putIfAbsent (Ljava/lang/String;Lcom/hexagonkt/http/model/Header;)Lcom/hexagonkt/http/model/Header; - public fun remove (Ljava/lang/Object;)Lcom/hexagonkt/http/model/Header; + public fun putIfAbsent (Ljava/lang/String;Lcom/hexagontk/http/model/Header;)Lcom/hexagontk/http/model/Header; + public fun remove (Ljava/lang/Object;)Lcom/hexagontk/http/model/Header; public synthetic fun remove (Ljava/lang/Object;)Ljava/lang/Object; public fun remove (Ljava/lang/Object;Ljava/lang/Object;)Z public synthetic fun replace (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; public synthetic fun replace (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z - public fun replace (Ljava/lang/String;Lcom/hexagonkt/http/model/Header;)Lcom/hexagonkt/http/model/Header; - public fun replace (Ljava/lang/String;Lcom/hexagonkt/http/model/Header;Lcom/hexagonkt/http/model/Header;)Z + public fun replace (Ljava/lang/String;Lcom/hexagontk/http/model/Header;)Lcom/hexagontk/http/model/Header; + public fun replace (Ljava/lang/String;Lcom/hexagontk/http/model/Header;Lcom/hexagontk/http/model/Header;)Z public fun replaceAll (Ljava/util/function/BiFunction;)V public final fun size ()I public fun toString ()Ljava/lang/String; public final fun values ()Ljava/util/Collection; } -public abstract interface class com/hexagonkt/http/model/HttpBase { +public abstract interface class com/hexagontk/http/model/HttpBase { public abstract fun bodyString ()Ljava/lang/String; public abstract fun getBody ()Ljava/lang/Object; - public abstract fun getContentType ()Lcom/hexagonkt/http/model/ContentType; - public abstract fun getHeaders ()Lcom/hexagonkt/http/model/Headers; + public abstract fun getContentType ()Lcom/hexagontk/http/model/ContentType; + public abstract fun getHeaders ()Lcom/hexagontk/http/model/Headers; } -public final class com/hexagonkt/http/model/HttpBase$DefaultImpls { - public static fun bodyString (Lcom/hexagonkt/http/model/HttpBase;)Ljava/lang/String; +public final class com/hexagontk/http/model/HttpBase$DefaultImpls { + public static fun bodyString (Lcom/hexagontk/http/model/HttpBase;)Ljava/lang/String; } -public final class com/hexagonkt/http/model/HttpCall { +public final class com/hexagontk/http/model/HttpCall { public fun ()V - public fun (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/HttpResponsePort;)V - public synthetic fun (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/HttpResponsePort;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun component1 ()Lcom/hexagonkt/http/model/HttpRequestPort; - public final fun component2 ()Lcom/hexagonkt/http/model/HttpResponsePort; - public final fun copy (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/HttpResponsePort;)Lcom/hexagonkt/http/model/HttpCall; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/HttpCall;Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/HttpResponsePort;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpCall; + public fun (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/HttpResponsePort;)V + public synthetic fun (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/HttpResponsePort;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Lcom/hexagontk/http/model/HttpRequestPort; + public final fun component2 ()Lcom/hexagontk/http/model/HttpResponsePort; + public final fun copy (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/HttpResponsePort;)Lcom/hexagontk/http/model/HttpCall; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/HttpCall;Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/HttpResponsePort;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpCall; public fun equals (Ljava/lang/Object;)Z - public final fun getRequest ()Lcom/hexagonkt/http/model/HttpRequestPort; - public final fun getResponse ()Lcom/hexagonkt/http/model/HttpResponsePort; + public final fun getRequest ()Lcom/hexagontk/http/model/HttpRequestPort; + public final fun getResponse ()Lcom/hexagontk/http/model/HttpResponsePort; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public abstract interface class com/hexagonkt/http/model/HttpField { +public abstract interface class com/hexagontk/http/model/HttpField { public abstract fun getName ()Ljava/lang/String; public abstract fun getValue ()Ljava/lang/Object; public abstract fun getValues ()Ljava/util/List; - public abstract fun minus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/HttpField; - public abstract fun plus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/HttpField; + public abstract fun minus (Ljava/lang/Object;)Lcom/hexagontk/http/model/HttpField; + public abstract fun plus (Ljava/lang/Object;)Lcom/hexagontk/http/model/HttpField; public abstract fun string ()Ljava/lang/String; public abstract fun strings ()Ljava/util/List; } -public final class com/hexagonkt/http/model/HttpField$DefaultImpls { - public static fun string (Lcom/hexagonkt/http/model/HttpField;)Ljava/lang/String; - public static fun strings (Lcom/hexagonkt/http/model/HttpField;)Ljava/util/List; +public final class com/hexagontk/http/model/HttpField$DefaultImpls { + public static fun string (Lcom/hexagontk/http/model/HttpField;)Ljava/lang/String; + public static fun strings (Lcom/hexagontk/http/model/HttpField;)Ljava/util/List; } -public abstract interface class com/hexagonkt/http/model/HttpMessage : com/hexagonkt/http/model/HttpBase { +public abstract interface class com/hexagontk/http/model/HttpMessage : com/hexagontk/http/model/HttpBase { public abstract fun cookiesMap ()Ljava/util/Map; public abstract fun getCookies ()Ljava/util/List; } -public final class com/hexagonkt/http/model/HttpMessage$DefaultImpls { - public static fun bodyString (Lcom/hexagonkt/http/model/HttpMessage;)Ljava/lang/String; - public static fun cookiesMap (Lcom/hexagonkt/http/model/HttpMessage;)Ljava/util/Map; +public final class com/hexagontk/http/model/HttpMessage$DefaultImpls { + public static fun bodyString (Lcom/hexagontk/http/model/HttpMessage;)Ljava/lang/String; + public static fun cookiesMap (Lcom/hexagontk/http/model/HttpMessage;)Ljava/util/Map; } -public final class com/hexagonkt/http/model/HttpMethod : java/lang/Enum { - public static final field Companion Lcom/hexagonkt/http/model/HttpMethod$Companion; - public static final field DELETE Lcom/hexagonkt/http/model/HttpMethod; - public static final field GET Lcom/hexagonkt/http/model/HttpMethod; - public static final field HEAD Lcom/hexagonkt/http/model/HttpMethod; - public static final field OPTIONS Lcom/hexagonkt/http/model/HttpMethod; - public static final field PATCH Lcom/hexagonkt/http/model/HttpMethod; - public static final field POST Lcom/hexagonkt/http/model/HttpMethod; - public static final field PUT Lcom/hexagonkt/http/model/HttpMethod; - public static final field TRACE Lcom/hexagonkt/http/model/HttpMethod; +public final class com/hexagontk/http/model/HttpMethod : java/lang/Enum { + public static final field Companion Lcom/hexagontk/http/model/HttpMethod$Companion; + public static final field DELETE Lcom/hexagontk/http/model/HttpMethod; + public static final field GET Lcom/hexagontk/http/model/HttpMethod; + public static final field HEAD Lcom/hexagontk/http/model/HttpMethod; + public static final field OPTIONS Lcom/hexagontk/http/model/HttpMethod; + public static final field PATCH Lcom/hexagontk/http/model/HttpMethod; + public static final field POST Lcom/hexagontk/http/model/HttpMethod; + public static final field PUT Lcom/hexagontk/http/model/HttpMethod; + public static final field TRACE Lcom/hexagontk/http/model/HttpMethod; public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lcom/hexagonkt/http/model/HttpMethod; - public static fun values ()[Lcom/hexagonkt/http/model/HttpMethod; + public static fun valueOf (Ljava/lang/String;)Lcom/hexagontk/http/model/HttpMethod; + public static fun values ()[Lcom/hexagontk/http/model/HttpMethod; } -public final class com/hexagonkt/http/model/HttpMethod$Companion { +public final class com/hexagontk/http/model/HttpMethod$Companion { public final fun getALL ()Ljava/util/Set; } -public final class com/hexagonkt/http/model/HttpPart : com/hexagonkt/http/model/HttpBase { - public fun (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;JLjava/lang/String;)V - public synthetic fun (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;JLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V +public final class com/hexagontk/http/model/HttpPart : com/hexagontk/http/model/HttpBase { + public fun (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;JLjava/lang/String;)V + public synthetic fun (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;JLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Ljava/lang/String;Ljava/lang/String;)V public fun (Ljava/lang/String;[BLjava/lang/String;)V public fun bodyString ()Ljava/lang/String; public final fun component1 ()Ljava/lang/String; public final fun component2 ()Ljava/lang/Object; - public final fun component3 ()Lcom/hexagonkt/http/model/Headers; - public final fun component4 ()Lcom/hexagonkt/http/model/ContentType; + public final fun component3 ()Lcom/hexagontk/http/model/Headers; + public final fun component4 ()Lcom/hexagontk/http/model/ContentType; public final fun component5 ()J public final fun component6 ()Ljava/lang/String; - public final fun copy (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;JLjava/lang/String;)Lcom/hexagonkt/http/model/HttpPart; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/HttpPart;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;JLjava/lang/String;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpPart; + public final fun copy (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;JLjava/lang/String;)Lcom/hexagontk/http/model/HttpPart; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/HttpPart;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;JLjava/lang/String;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpPart; public fun equals (Ljava/lang/Object;)Z public fun getBody ()Ljava/lang/Object; - public fun getContentType ()Lcom/hexagonkt/http/model/ContentType; - public fun getHeaders ()Lcom/hexagonkt/http/model/Headers; + public fun getContentType ()Lcom/hexagontk/http/model/ContentType; + public fun getHeaders ()Lcom/hexagontk/http/model/Headers; public final fun getName ()Ljava/lang/String; public final fun getSize ()J public final fun getSubmittedFileName ()Ljava/lang/String; @@ -350,177 +350,177 @@ public final class com/hexagonkt/http/model/HttpPart : com/hexagonkt/http/model/ public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/model/HttpProtocol : java/lang/Enum { - public static final field H2C Lcom/hexagonkt/http/model/HttpProtocol; - public static final field HTTP Lcom/hexagonkt/http/model/HttpProtocol; - public static final field HTTP2 Lcom/hexagonkt/http/model/HttpProtocol; - public static final field HTTPS Lcom/hexagonkt/http/model/HttpProtocol; +public final class com/hexagontk/http/model/HttpProtocol : java/lang/Enum { + public static final field H2C Lcom/hexagontk/http/model/HttpProtocol; + public static final field HTTP Lcom/hexagontk/http/model/HttpProtocol; + public static final field HTTP2 Lcom/hexagontk/http/model/HttpProtocol; + public static final field HTTPS Lcom/hexagontk/http/model/HttpProtocol; public static fun getEntries ()Lkotlin/enums/EnumEntries; public final fun getSchema ()Ljava/lang/String; public final fun getSecure ()Z - public static fun valueOf (Ljava/lang/String;)Lcom/hexagonkt/http/model/HttpProtocol; - public static fun values ()[Lcom/hexagonkt/http/model/HttpProtocol; + public static fun valueOf (Ljava/lang/String;)Lcom/hexagontk/http/model/HttpProtocol; + public static fun values ()[Lcom/hexagontk/http/model/HttpProtocol; } -public final class com/hexagonkt/http/model/HttpRequest : com/hexagonkt/http/model/HttpRequestPort { +public final class com/hexagontk/http/model/HttpRequest : com/hexagontk/http/model/HttpRequestPort { public fun ()V - public fun (Lcom/hexagonkt/http/model/HttpMethod;Lcom/hexagonkt/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagonkt/http/model/QueryParameters;Lcom/hexagonkt/http/model/Headers;Ljava/lang/Object;Ljava/util/List;Lcom/hexagonkt/http/model/FormParameters;Ljava/util/List;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/List;JLcom/hexagonkt/http/model/Authorization;)V - public synthetic fun (Lcom/hexagonkt/http/model/HttpMethod;Lcom/hexagonkt/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagonkt/http/model/QueryParameters;Lcom/hexagonkt/http/model/Headers;Ljava/lang/Object;Ljava/util/List;Lcom/hexagonkt/http/model/FormParameters;Ljava/util/List;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/List;JLcom/hexagonkt/http/model/Authorization;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun authorization ()Lcom/hexagonkt/http/model/Authorization; + public fun (Lcom/hexagontk/http/model/HttpMethod;Lcom/hexagontk/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagontk/http/model/QueryParameters;Lcom/hexagontk/http/model/Headers;Ljava/lang/Object;Ljava/util/List;Lcom/hexagontk/http/model/FormParameters;Ljava/util/List;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/List;JLcom/hexagontk/http/model/Authorization;)V + public synthetic fun (Lcom/hexagontk/http/model/HttpMethod;Lcom/hexagontk/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagontk/http/model/QueryParameters;Lcom/hexagontk/http/model/Headers;Ljava/lang/Object;Ljava/util/List;Lcom/hexagontk/http/model/FormParameters;Ljava/util/List;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/List;JLcom/hexagontk/http/model/Authorization;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun authorization ()Lcom/hexagontk/http/model/Authorization; public fun bodyString ()Ljava/lang/String; public fun certificate ()Ljava/security/cert/X509Certificate; - public final fun component1 ()Lcom/hexagonkt/http/model/HttpMethod; - public final fun component10 ()Lcom/hexagonkt/http/model/FormParameters; + public final fun component1 ()Lcom/hexagontk/http/model/HttpMethod; + public final fun component10 ()Lcom/hexagontk/http/model/FormParameters; public final fun component11 ()Ljava/util/List; - public final fun component12 ()Lcom/hexagonkt/http/model/ContentType; + public final fun component12 ()Lcom/hexagontk/http/model/ContentType; public final fun component13 ()Ljava/util/List; public final fun component14 ()Ljava/util/List; public final fun component15 ()J - public final fun component16 ()Lcom/hexagonkt/http/model/Authorization; - public final fun component2 ()Lcom/hexagonkt/http/model/HttpProtocol; + public final fun component16 ()Lcom/hexagontk/http/model/Authorization; + public final fun component2 ()Lcom/hexagontk/http/model/HttpProtocol; public final fun component3 ()Ljava/lang/String; public final fun component4 ()I public final fun component5 ()Ljava/lang/String; - public final fun component6 ()Lcom/hexagonkt/http/model/QueryParameters; - public final fun component7 ()Lcom/hexagonkt/http/model/Headers; + public final fun component6 ()Lcom/hexagontk/http/model/QueryParameters; + public final fun component7 ()Lcom/hexagontk/http/model/Headers; public final fun component8 ()Ljava/lang/Object; public final fun component9 ()Ljava/util/List; public fun cookiesMap ()Ljava/util/Map; - public final fun copy (Lcom/hexagonkt/http/model/HttpMethod;Lcom/hexagonkt/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagonkt/http/model/QueryParameters;Lcom/hexagonkt/http/model/Headers;Ljava/lang/Object;Ljava/util/List;Lcom/hexagonkt/http/model/FormParameters;Ljava/util/List;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/List;JLcom/hexagonkt/http/model/Authorization;)Lcom/hexagonkt/http/model/HttpRequest; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/HttpRequest;Lcom/hexagonkt/http/model/HttpMethod;Lcom/hexagonkt/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagonkt/http/model/QueryParameters;Lcom/hexagonkt/http/model/Headers;Ljava/lang/Object;Ljava/util/List;Lcom/hexagonkt/http/model/FormParameters;Ljava/util/List;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/List;JLcom/hexagonkt/http/model/Authorization;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpRequest; + public final fun copy (Lcom/hexagontk/http/model/HttpMethod;Lcom/hexagontk/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagontk/http/model/QueryParameters;Lcom/hexagontk/http/model/Headers;Ljava/lang/Object;Ljava/util/List;Lcom/hexagontk/http/model/FormParameters;Ljava/util/List;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/List;JLcom/hexagontk/http/model/Authorization;)Lcom/hexagontk/http/model/HttpRequest; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/HttpRequest;Lcom/hexagontk/http/model/HttpMethod;Lcom/hexagontk/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagontk/http/model/QueryParameters;Lcom/hexagontk/http/model/Headers;Ljava/lang/Object;Ljava/util/List;Lcom/hexagontk/http/model/FormParameters;Ljava/util/List;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/List;JLcom/hexagontk/http/model/Authorization;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpRequest; public fun equals (Ljava/lang/Object;)Z public fun getAccept ()Ljava/util/List; - public fun getAuthorization ()Lcom/hexagonkt/http/model/Authorization; + public fun getAuthorization ()Lcom/hexagontk/http/model/Authorization; public fun getBody ()Ljava/lang/Object; public fun getCertificateChain ()Ljava/util/List; public fun getContentLength ()J - public fun getContentType ()Lcom/hexagonkt/http/model/ContentType; + public fun getContentType ()Lcom/hexagontk/http/model/ContentType; public fun getCookies ()Ljava/util/List; - public fun getFormParameters ()Lcom/hexagonkt/http/model/FormParameters; - public fun getHeaders ()Lcom/hexagonkt/http/model/Headers; + public fun getFormParameters ()Lcom/hexagontk/http/model/FormParameters; + public fun getHeaders ()Lcom/hexagontk/http/model/Headers; public fun getHost ()Ljava/lang/String; - public fun getMethod ()Lcom/hexagonkt/http/model/HttpMethod; + public fun getMethod ()Lcom/hexagontk/http/model/HttpMethod; public fun getParts ()Ljava/util/List; public fun getPath ()Ljava/lang/String; public fun getPort ()I - public fun getProtocol ()Lcom/hexagonkt/http/model/HttpProtocol; - public fun getQueryParameters ()Lcom/hexagonkt/http/model/QueryParameters; + public fun getProtocol ()Lcom/hexagontk/http/model/HttpProtocol; + public fun getQueryParameters ()Lcom/hexagontk/http/model/QueryParameters; public fun hashCode ()I public fun origin ()Ljava/lang/String; public fun partsMap ()Ljava/util/Map; - public fun plus (Lcom/hexagonkt/http/model/Cookie;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/FormParameter;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/FormParameters;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/Header;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/Headers;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/HttpPart;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/QueryParameter;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/QueryParameters;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Ljava/util/List;)Lcom/hexagonkt/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/Cookie;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/FormParameter;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/FormParameters;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/Header;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/Headers;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/HttpPart;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/QueryParameter;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/QueryParameters;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Ljava/util/List;)Lcom/hexagontk/http/model/HttpRequestPort; public fun referer ()Ljava/lang/String; public fun toString ()Ljava/lang/String; public fun url ()Ljava/net/URL; public fun userAgent ()Ljava/lang/String; - public fun with (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Lcom/hexagonkt/http/model/HttpMethod;Lcom/hexagonkt/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagonkt/http/model/QueryParameters;Ljava/util/List;Lcom/hexagonkt/http/model/FormParameters;Ljava/util/List;Ljava/util/List;Lcom/hexagonkt/http/model/Authorization;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpRequestPort; + public fun with (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Lcom/hexagontk/http/model/HttpMethod;Lcom/hexagontk/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagontk/http/model/QueryParameters;Ljava/util/List;Lcom/hexagontk/http/model/FormParameters;Ljava/util/List;Ljava/util/List;Lcom/hexagontk/http/model/Authorization;Ljava/util/List;)Lcom/hexagontk/http/model/HttpRequestPort; } -public abstract interface class com/hexagonkt/http/model/HttpRequestPort : com/hexagonkt/http/model/HttpMessage { - public abstract fun authorization ()Lcom/hexagonkt/http/model/Authorization; +public abstract interface class com/hexagontk/http/model/HttpRequestPort : com/hexagontk/http/model/HttpMessage { + public abstract fun authorization ()Lcom/hexagontk/http/model/Authorization; public abstract fun certificate ()Ljava/security/cert/X509Certificate; public abstract fun getAccept ()Ljava/util/List; - public abstract fun getAuthorization ()Lcom/hexagonkt/http/model/Authorization; + public abstract fun getAuthorization ()Lcom/hexagontk/http/model/Authorization; public abstract fun getCertificateChain ()Ljava/util/List; public abstract fun getContentLength ()J - public abstract fun getFormParameters ()Lcom/hexagonkt/http/model/FormParameters; + public abstract fun getFormParameters ()Lcom/hexagontk/http/model/FormParameters; public abstract fun getHost ()Ljava/lang/String; - public abstract fun getMethod ()Lcom/hexagonkt/http/model/HttpMethod; + public abstract fun getMethod ()Lcom/hexagontk/http/model/HttpMethod; public abstract fun getParts ()Ljava/util/List; public abstract fun getPath ()Ljava/lang/String; public abstract fun getPort ()I - public abstract fun getProtocol ()Lcom/hexagonkt/http/model/HttpProtocol; - public abstract fun getQueryParameters ()Lcom/hexagonkt/http/model/QueryParameters; + public abstract fun getProtocol ()Lcom/hexagontk/http/model/HttpProtocol; + public abstract fun getQueryParameters ()Lcom/hexagontk/http/model/QueryParameters; public abstract fun origin ()Ljava/lang/String; public abstract fun partsMap ()Ljava/util/Map; - public abstract fun plus (Lcom/hexagonkt/http/model/Cookie;)Lcom/hexagonkt/http/model/HttpRequestPort; - public abstract fun plus (Lcom/hexagonkt/http/model/FormParameter;)Lcom/hexagonkt/http/model/HttpRequestPort; - public abstract fun plus (Lcom/hexagonkt/http/model/FormParameters;)Lcom/hexagonkt/http/model/HttpRequestPort; - public abstract fun plus (Lcom/hexagonkt/http/model/Header;)Lcom/hexagonkt/http/model/HttpRequestPort; - public abstract fun plus (Lcom/hexagonkt/http/model/Headers;)Lcom/hexagonkt/http/model/HttpRequestPort; - public abstract fun plus (Lcom/hexagonkt/http/model/HttpPart;)Lcom/hexagonkt/http/model/HttpRequestPort; - public abstract fun plus (Lcom/hexagonkt/http/model/QueryParameter;)Lcom/hexagonkt/http/model/HttpRequestPort; - public abstract fun plus (Lcom/hexagonkt/http/model/QueryParameters;)Lcom/hexagonkt/http/model/HttpRequestPort; - public abstract fun plus (Ljava/util/List;)Lcom/hexagonkt/http/model/HttpRequestPort; + public abstract fun plus (Lcom/hexagontk/http/model/Cookie;)Lcom/hexagontk/http/model/HttpRequestPort; + public abstract fun plus (Lcom/hexagontk/http/model/FormParameter;)Lcom/hexagontk/http/model/HttpRequestPort; + public abstract fun plus (Lcom/hexagontk/http/model/FormParameters;)Lcom/hexagontk/http/model/HttpRequestPort; + public abstract fun plus (Lcom/hexagontk/http/model/Header;)Lcom/hexagontk/http/model/HttpRequestPort; + public abstract fun plus (Lcom/hexagontk/http/model/Headers;)Lcom/hexagontk/http/model/HttpRequestPort; + public abstract fun plus (Lcom/hexagontk/http/model/HttpPart;)Lcom/hexagontk/http/model/HttpRequestPort; + public abstract fun plus (Lcom/hexagontk/http/model/QueryParameter;)Lcom/hexagontk/http/model/HttpRequestPort; + public abstract fun plus (Lcom/hexagontk/http/model/QueryParameters;)Lcom/hexagontk/http/model/HttpRequestPort; + public abstract fun plus (Ljava/util/List;)Lcom/hexagontk/http/model/HttpRequestPort; public abstract fun referer ()Ljava/lang/String; public abstract fun url ()Ljava/net/URL; public abstract fun userAgent ()Ljava/lang/String; - public abstract fun with (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Lcom/hexagonkt/http/model/HttpMethod;Lcom/hexagonkt/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagonkt/http/model/QueryParameters;Ljava/util/List;Lcom/hexagonkt/http/model/FormParameters;Ljava/util/List;Ljava/util/List;Lcom/hexagonkt/http/model/Authorization;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpRequestPort; -} - -public final class com/hexagonkt/http/model/HttpRequestPort$DefaultImpls { - public static fun authorization (Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/model/Authorization; - public static fun bodyString (Lcom/hexagonkt/http/model/HttpRequestPort;)Ljava/lang/String; - public static fun certificate (Lcom/hexagonkt/http/model/HttpRequestPort;)Ljava/security/cert/X509Certificate; - public static fun cookiesMap (Lcom/hexagonkt/http/model/HttpRequestPort;)Ljava/util/Map; - public static fun origin (Lcom/hexagonkt/http/model/HttpRequestPort;)Ljava/lang/String; - public static fun partsMap (Lcom/hexagonkt/http/model/HttpRequestPort;)Ljava/util/Map; - public static fun plus (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/Cookie;)Lcom/hexagonkt/http/model/HttpRequestPort; - public static fun plus (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/FormParameter;)Lcom/hexagonkt/http/model/HttpRequestPort; - public static fun plus (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/FormParameters;)Lcom/hexagonkt/http/model/HttpRequestPort; - public static fun plus (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/Header;)Lcom/hexagonkt/http/model/HttpRequestPort; - public static fun plus (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/Headers;)Lcom/hexagonkt/http/model/HttpRequestPort; - public static fun plus (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/HttpPart;)Lcom/hexagonkt/http/model/HttpRequestPort; - public static fun plus (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/QueryParameter;)Lcom/hexagonkt/http/model/HttpRequestPort; - public static fun plus (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/QueryParameters;)Lcom/hexagonkt/http/model/HttpRequestPort; - public static fun plus (Lcom/hexagonkt/http/model/HttpRequestPort;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpRequestPort; - public static fun referer (Lcom/hexagonkt/http/model/HttpRequestPort;)Ljava/lang/String; - public static fun url (Lcom/hexagonkt/http/model/HttpRequestPort;)Ljava/net/URL; - public static fun userAgent (Lcom/hexagonkt/http/model/HttpRequestPort;)Ljava/lang/String; - public static synthetic fun with$default (Lcom/hexagonkt/http/model/HttpRequestPort;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Lcom/hexagonkt/http/model/HttpMethod;Lcom/hexagonkt/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagonkt/http/model/QueryParameters;Ljava/util/List;Lcom/hexagonkt/http/model/FormParameters;Ljava/util/List;Ljava/util/List;Lcom/hexagonkt/http/model/Authorization;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpRequestPort; -} - -public final class com/hexagonkt/http/model/HttpResponse : com/hexagonkt/http/model/HttpResponsePort { + public abstract fun with (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Lcom/hexagontk/http/model/HttpMethod;Lcom/hexagontk/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagontk/http/model/QueryParameters;Ljava/util/List;Lcom/hexagontk/http/model/FormParameters;Ljava/util/List;Ljava/util/List;Lcom/hexagontk/http/model/Authorization;Ljava/util/List;)Lcom/hexagontk/http/model/HttpRequestPort; +} + +public final class com/hexagontk/http/model/HttpRequestPort$DefaultImpls { + public static fun authorization (Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/model/Authorization; + public static fun bodyString (Lcom/hexagontk/http/model/HttpRequestPort;)Ljava/lang/String; + public static fun certificate (Lcom/hexagontk/http/model/HttpRequestPort;)Ljava/security/cert/X509Certificate; + public static fun cookiesMap (Lcom/hexagontk/http/model/HttpRequestPort;)Ljava/util/Map; + public static fun origin (Lcom/hexagontk/http/model/HttpRequestPort;)Ljava/lang/String; + public static fun partsMap (Lcom/hexagontk/http/model/HttpRequestPort;)Ljava/util/Map; + public static fun plus (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/Cookie;)Lcom/hexagontk/http/model/HttpRequestPort; + public static fun plus (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/FormParameter;)Lcom/hexagontk/http/model/HttpRequestPort; + public static fun plus (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/FormParameters;)Lcom/hexagontk/http/model/HttpRequestPort; + public static fun plus (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/Header;)Lcom/hexagontk/http/model/HttpRequestPort; + public static fun plus (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/Headers;)Lcom/hexagontk/http/model/HttpRequestPort; + public static fun plus (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/HttpPart;)Lcom/hexagontk/http/model/HttpRequestPort; + public static fun plus (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/QueryParameter;)Lcom/hexagontk/http/model/HttpRequestPort; + public static fun plus (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/QueryParameters;)Lcom/hexagontk/http/model/HttpRequestPort; + public static fun plus (Lcom/hexagontk/http/model/HttpRequestPort;Ljava/util/List;)Lcom/hexagontk/http/model/HttpRequestPort; + public static fun referer (Lcom/hexagontk/http/model/HttpRequestPort;)Ljava/lang/String; + public static fun url (Lcom/hexagontk/http/model/HttpRequestPort;)Ljava/net/URL; + public static fun userAgent (Lcom/hexagontk/http/model/HttpRequestPort;)Ljava/lang/String; + public static synthetic fun with$default (Lcom/hexagontk/http/model/HttpRequestPort;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Lcom/hexagontk/http/model/HttpMethod;Lcom/hexagontk/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagontk/http/model/QueryParameters;Ljava/util/List;Lcom/hexagontk/http/model/FormParameters;Ljava/util/List;Ljava/util/List;Lcom/hexagontk/http/model/Authorization;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpRequestPort; +} + +public final class com/hexagontk/http/model/HttpResponse : com/hexagontk/http/model/HttpResponsePort { public fun ()V - public fun (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Lcom/hexagonkt/http/model/HttpStatus;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)V - public synthetic fun (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Lcom/hexagonkt/http/model/HttpStatus;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Lcom/hexagontk/http/model/HttpStatus;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)V + public synthetic fun (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Lcom/hexagontk/http/model/HttpStatus;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun bodyString ()Ljava/lang/String; public final fun component1 ()Ljava/lang/Object; public final fun component10 ()Lkotlin/jvm/functions/Function2; public final fun component11 ()Lkotlin/jvm/functions/Function2; public final fun component12 ()Lkotlin/jvm/functions/Function3; - public final fun component2 ()Lcom/hexagonkt/http/model/Headers; - public final fun component3 ()Lcom/hexagonkt/http/model/ContentType; + public final fun component2 ()Lcom/hexagontk/http/model/Headers; + public final fun component3 ()Lcom/hexagontk/http/model/ContentType; public final fun component4 ()Ljava/util/List; - public final fun component5 ()Lcom/hexagonkt/http/model/HttpStatus; + public final fun component5 ()Lcom/hexagontk/http/model/HttpStatus; public final fun component6 ()J public final fun component7 ()Lkotlin/jvm/functions/Function1; public final fun component8 ()Lkotlin/jvm/functions/Function2; public final fun component9 ()Lkotlin/jvm/functions/Function2; public fun cookiesMap ()Ljava/util/Map; - public final fun copy (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Lcom/hexagonkt/http/model/HttpStatus;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagonkt/http/model/HttpResponse; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/HttpResponse;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Lcom/hexagonkt/http/model/HttpStatus;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpResponse; + public final fun copy (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Lcom/hexagontk/http/model/HttpStatus;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagontk/http/model/HttpResponse; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/HttpResponse;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Lcom/hexagontk/http/model/HttpStatus;JLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpResponse; public fun equals (Ljava/lang/Object;)Z public fun getBody ()Ljava/lang/Object; public fun getContentLength ()J - public fun getContentType ()Lcom/hexagonkt/http/model/ContentType; + public fun getContentType ()Lcom/hexagontk/http/model/ContentType; public fun getCookies ()Ljava/util/List; - public fun getHeaders ()Lcom/hexagonkt/http/model/Headers; + public fun getHeaders ()Lcom/hexagontk/http/model/Headers; public fun getOnBinary ()Lkotlin/jvm/functions/Function2; public fun getOnClose ()Lkotlin/jvm/functions/Function3; public fun getOnConnect ()Lkotlin/jvm/functions/Function1; public fun getOnPing ()Lkotlin/jvm/functions/Function2; public fun getOnPong ()Lkotlin/jvm/functions/Function2; public fun getOnText ()Lkotlin/jvm/functions/Function2; - public fun getStatus ()Lcom/hexagonkt/http/model/HttpStatus; + public fun getStatus ()Lcom/hexagontk/http/model/HttpStatus; public fun hashCode ()I - public fun plus (Lcom/hexagonkt/http/model/Cookie;)Lcom/hexagonkt/http/model/HttpResponsePort; - public fun plus (Lcom/hexagonkt/http/model/Header;)Lcom/hexagonkt/http/model/HttpResponsePort; - public fun plus (Lcom/hexagonkt/http/model/Headers;)Lcom/hexagonkt/http/model/HttpResponsePort; - public fun plus (Ljava/util/List;)Lcom/hexagonkt/http/model/HttpResponsePort; + public fun plus (Lcom/hexagontk/http/model/Cookie;)Lcom/hexagontk/http/model/HttpResponsePort; + public fun plus (Lcom/hexagontk/http/model/Header;)Lcom/hexagontk/http/model/HttpResponsePort; + public fun plus (Lcom/hexagontk/http/model/Headers;)Lcom/hexagontk/http/model/HttpResponsePort; + public fun plus (Ljava/util/List;)Lcom/hexagontk/http/model/HttpResponsePort; public fun toString ()Ljava/lang/String; - public fun with (Lcom/hexagonkt/http/model/HttpStatus;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagonkt/http/model/HttpResponsePort; + public fun with (Lcom/hexagontk/http/model/HttpStatus;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagontk/http/model/HttpResponsePort; } -public abstract interface class com/hexagonkt/http/model/HttpResponsePort : com/hexagonkt/http/model/HttpMessage { +public abstract interface class com/hexagontk/http/model/HttpResponsePort : com/hexagontk/http/model/HttpMessage { public abstract fun getContentLength ()J public abstract fun getOnBinary ()Lkotlin/jvm/functions/Function2; public abstract fun getOnClose ()Lkotlin/jvm/functions/Function3; @@ -528,165 +528,165 @@ public abstract interface class com/hexagonkt/http/model/HttpResponsePort : com/ public abstract fun getOnPing ()Lkotlin/jvm/functions/Function2; public abstract fun getOnPong ()Lkotlin/jvm/functions/Function2; public abstract fun getOnText ()Lkotlin/jvm/functions/Function2; - public abstract fun getStatus ()Lcom/hexagonkt/http/model/HttpStatus; - public abstract fun plus (Lcom/hexagonkt/http/model/Cookie;)Lcom/hexagonkt/http/model/HttpResponsePort; - public abstract fun plus (Lcom/hexagonkt/http/model/Header;)Lcom/hexagonkt/http/model/HttpResponsePort; - public abstract fun plus (Lcom/hexagonkt/http/model/Headers;)Lcom/hexagonkt/http/model/HttpResponsePort; - public abstract fun plus (Ljava/util/List;)Lcom/hexagonkt/http/model/HttpResponsePort; - public abstract fun with (Lcom/hexagonkt/http/model/HttpStatus;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagonkt/http/model/HttpResponsePort; -} - -public final class com/hexagonkt/http/model/HttpResponsePort$DefaultImpls { - public static fun bodyString (Lcom/hexagonkt/http/model/HttpResponsePort;)Ljava/lang/String; - public static fun cookiesMap (Lcom/hexagonkt/http/model/HttpResponsePort;)Ljava/util/Map; - public static fun plus (Lcom/hexagonkt/http/model/HttpResponsePort;Lcom/hexagonkt/http/model/Cookie;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static fun plus (Lcom/hexagonkt/http/model/HttpResponsePort;Lcom/hexagonkt/http/model/Header;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static fun plus (Lcom/hexagonkt/http/model/HttpResponsePort;Lcom/hexagonkt/http/model/Headers;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static fun plus (Lcom/hexagonkt/http/model/HttpResponsePort;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static synthetic fun with$default (Lcom/hexagonkt/http/model/HttpResponsePort;Lcom/hexagonkt/http/model/HttpStatus;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpResponsePort; -} - -public final class com/hexagonkt/http/model/HttpStatus { - public static final field Companion Lcom/hexagonkt/http/model/HttpStatus$Companion; - public fun (ILcom/hexagonkt/http/model/HttpStatusType;)V - public synthetic fun (ILcom/hexagonkt/http/model/HttpStatusType;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public abstract fun getStatus ()Lcom/hexagontk/http/model/HttpStatus; + public abstract fun plus (Lcom/hexagontk/http/model/Cookie;)Lcom/hexagontk/http/model/HttpResponsePort; + public abstract fun plus (Lcom/hexagontk/http/model/Header;)Lcom/hexagontk/http/model/HttpResponsePort; + public abstract fun plus (Lcom/hexagontk/http/model/Headers;)Lcom/hexagontk/http/model/HttpResponsePort; + public abstract fun plus (Ljava/util/List;)Lcom/hexagontk/http/model/HttpResponsePort; + public abstract fun with (Lcom/hexagontk/http/model/HttpStatus;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagontk/http/model/HttpResponsePort; +} + +public final class com/hexagontk/http/model/HttpResponsePort$DefaultImpls { + public static fun bodyString (Lcom/hexagontk/http/model/HttpResponsePort;)Ljava/lang/String; + public static fun cookiesMap (Lcom/hexagontk/http/model/HttpResponsePort;)Ljava/util/Map; + public static fun plus (Lcom/hexagontk/http/model/HttpResponsePort;Lcom/hexagontk/http/model/Cookie;)Lcom/hexagontk/http/model/HttpResponsePort; + public static fun plus (Lcom/hexagontk/http/model/HttpResponsePort;Lcom/hexagontk/http/model/Header;)Lcom/hexagontk/http/model/HttpResponsePort; + public static fun plus (Lcom/hexagontk/http/model/HttpResponsePort;Lcom/hexagontk/http/model/Headers;)Lcom/hexagontk/http/model/HttpResponsePort; + public static fun plus (Lcom/hexagontk/http/model/HttpResponsePort;Ljava/util/List;)Lcom/hexagontk/http/model/HttpResponsePort; + public static synthetic fun with$default (Lcom/hexagontk/http/model/HttpResponsePort;Lcom/hexagontk/http/model/HttpStatus;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpResponsePort; +} + +public final class com/hexagontk/http/model/HttpStatus { + public static final field Companion Lcom/hexagontk/http/model/HttpStatus$Companion; + public fun (ILcom/hexagontk/http/model/HttpStatusType;)V + public synthetic fun (ILcom/hexagontk/http/model/HttpStatusType;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()I - public final fun component2 ()Lcom/hexagonkt/http/model/HttpStatusType; - public final fun copy (ILcom/hexagonkt/http/model/HttpStatusType;)Lcom/hexagonkt/http/model/HttpStatus; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/HttpStatus;ILcom/hexagonkt/http/model/HttpStatusType;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpStatus; + public final fun component2 ()Lcom/hexagontk/http/model/HttpStatusType; + public final fun copy (ILcom/hexagontk/http/model/HttpStatusType;)Lcom/hexagontk/http/model/HttpStatus; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/HttpStatus;ILcom/hexagontk/http/model/HttpStatusType;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpStatus; public fun equals (Ljava/lang/Object;)Z public final fun getCode ()I - public final fun getType ()Lcom/hexagonkt/http/model/HttpStatusType; + public final fun getType ()Lcom/hexagontk/http/model/HttpStatusType; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/model/HttpStatus$Companion { - public final fun get (I)Lcom/hexagonkt/http/model/HttpStatus; +public final class com/hexagontk/http/model/HttpStatus$Companion { + public final fun get (I)Lcom/hexagontk/http/model/HttpStatus; public final fun getCodes ()Ljava/util/Map; } -public final class com/hexagonkt/http/model/HttpStatusType : java/lang/Enum { - public static final field CLIENT_ERROR Lcom/hexagonkt/http/model/HttpStatusType; - public static final field INFORMATION Lcom/hexagonkt/http/model/HttpStatusType; - public static final field REDIRECTION Lcom/hexagonkt/http/model/HttpStatusType; - public static final field SERVER_ERROR Lcom/hexagonkt/http/model/HttpStatusType; - public static final field SUCCESS Lcom/hexagonkt/http/model/HttpStatusType; +public final class com/hexagontk/http/model/HttpStatusType : java/lang/Enum { + public static final field CLIENT_ERROR Lcom/hexagontk/http/model/HttpStatusType; + public static final field INFORMATION Lcom/hexagontk/http/model/HttpStatusType; + public static final field REDIRECTION Lcom/hexagontk/http/model/HttpStatusType; + public static final field SERVER_ERROR Lcom/hexagontk/http/model/HttpStatusType; + public static final field SUCCESS Lcom/hexagontk/http/model/HttpStatusType; public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lcom/hexagonkt/http/model/HttpStatusType; - public static fun values ()[Lcom/hexagonkt/http/model/HttpStatusType; -} - -public final class com/hexagonkt/http/model/HttpStatusesKt { - public static final fun getACCEPTED_202 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getALREADY_REPORTED_208 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getBAD_GATEWAY_502 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getBAD_REQUEST_400 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getCONFLICT_409 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getCONTENT_TOO_LARGE_413 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getCONTINUE_100 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getCREATED_201 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getEARLY_HINTS_103 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getEXPECTATION_FAILED_417 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getFAILED_DEPENDENCY_424 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getFORBIDDEN_403 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getFOUND_302 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getGATEWAY_TIMEOUT_504 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getGONE_410 ()Lcom/hexagonkt/http/model/HttpStatus; + public static fun valueOf (Ljava/lang/String;)Lcom/hexagontk/http/model/HttpStatusType; + public static fun values ()[Lcom/hexagontk/http/model/HttpStatusType; +} + +public final class com/hexagontk/http/model/HttpStatusesKt { + public static final fun getACCEPTED_202 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getALREADY_REPORTED_208 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getBAD_GATEWAY_502 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getBAD_REQUEST_400 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getCONFLICT_409 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getCONTENT_TOO_LARGE_413 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getCONTINUE_100 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getCREATED_201 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getEARLY_HINTS_103 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getEXPECTATION_FAILED_417 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getFAILED_DEPENDENCY_424 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getFORBIDDEN_403 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getFOUND_302 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getGATEWAY_TIMEOUT_504 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getGONE_410 ()Lcom/hexagontk/http/model/HttpStatus; public static final fun getHTTP_STATUSES ()Ljava/util/List; - public static final fun getHTTP_VERSION_NOT_SUPPORTED_505 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getIM_USED_226 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getINSUFFICIENT_STORAGE_507 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getINTERNAL_SERVER_ERROR_500 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getI_AM_A_TEAPOT_418 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getLENGTH_REQUIRED_411 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getLOCKED_423 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getLOOP_DETECTED_508 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getMETHOD_NOT_ALLOWED_405 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getMISDIRECTED_REQUEST_421 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getMOVED_PERMANENTLY_301 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getMULTIPLE_CHOICES_300 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getMULTI_STATUS_207 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getNETWORK_AUTHENTICATION_REQUIRED_511 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getNON_AUTHORITATIVE_INFORMATION_203 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getNOT_ACCEPTABLE_406 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getNOT_EXTENDED_510 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getNOT_FOUND_404 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getNOT_IMPLEMENTED_501 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getNOT_MODIFIED_304 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getNO_CONTENT_204 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getOK_200 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getPARTIAL_CONTENT_206 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getPAYMENT_REQUIRED_402 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getPERMANENT_REDIRECT_308 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getPRECONDITION_FAILED_412 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getPRECONDITION_REQUIRED_428 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getPROCESSING_102 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getPROXY_AUTHENTICATION_REQUIRED_407 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getRANGE_NOT_SATISFIABLE_416 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getREQUEST_HEADER_FIELDS_TOO_LARGE_431 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getREQUEST_TIMEOUT_408 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getRESET_CONTENT_205 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getSEE_OTHER_303 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getSERVICE_UNAVAILABLE_503 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getSWITCHING_PROTOCOLS_101 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getTEMPORARY_REDIRECT_307 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getTOO_EARLY_425 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getTOO_MANY_REQUESTS_429 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getUNAUTHORIZED_401 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getUNAVAILABLE_FOR_LEGAL_REASONS_451 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getUNPROCESSABLE_CONTENT_422 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getUNSUPPORTED_MEDIA_TYPE_415 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getUPGRADE_REQUIRED_426 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getURI_TOO_LONG_414 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getUSE_PROXY_305 ()Lcom/hexagonkt/http/model/HttpStatus; - public static final fun getVARIANT_ALSO_NEGOTIATES_506 ()Lcom/hexagonkt/http/model/HttpStatus; -} - -public final class com/hexagonkt/http/model/QueryParameter : com/hexagonkt/http/model/HttpField { + public static final fun getHTTP_VERSION_NOT_SUPPORTED_505 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getIM_USED_226 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getINSUFFICIENT_STORAGE_507 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getINTERNAL_SERVER_ERROR_500 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getI_AM_A_TEAPOT_418 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getLENGTH_REQUIRED_411 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getLOCKED_423 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getLOOP_DETECTED_508 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getMETHOD_NOT_ALLOWED_405 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getMISDIRECTED_REQUEST_421 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getMOVED_PERMANENTLY_301 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getMULTIPLE_CHOICES_300 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getMULTI_STATUS_207 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getNETWORK_AUTHENTICATION_REQUIRED_511 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getNON_AUTHORITATIVE_INFORMATION_203 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getNOT_ACCEPTABLE_406 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getNOT_EXTENDED_510 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getNOT_FOUND_404 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getNOT_IMPLEMENTED_501 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getNOT_MODIFIED_304 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getNO_CONTENT_204 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getOK_200 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getPARTIAL_CONTENT_206 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getPAYMENT_REQUIRED_402 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getPERMANENT_REDIRECT_308 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getPRECONDITION_FAILED_412 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getPRECONDITION_REQUIRED_428 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getPROCESSING_102 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getPROXY_AUTHENTICATION_REQUIRED_407 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getRANGE_NOT_SATISFIABLE_416 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getREQUEST_HEADER_FIELDS_TOO_LARGE_431 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getREQUEST_TIMEOUT_408 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getRESET_CONTENT_205 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getSEE_OTHER_303 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getSERVICE_UNAVAILABLE_503 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getSWITCHING_PROTOCOLS_101 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getTEMPORARY_REDIRECT_307 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getTOO_EARLY_425 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getTOO_MANY_REQUESTS_429 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getUNAUTHORIZED_401 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getUNAVAILABLE_FOR_LEGAL_REASONS_451 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getUNPROCESSABLE_CONTENT_422 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getUNSUPPORTED_MEDIA_TYPE_415 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getUPGRADE_REQUIRED_426 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getURI_TOO_LONG_414 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getUSE_PROXY_305 ()Lcom/hexagontk/http/model/HttpStatus; + public static final fun getVARIANT_ALSO_NEGOTIATES_506 ()Lcom/hexagontk/http/model/HttpStatus; +} + +public final class com/hexagontk/http/model/QueryParameter : com/hexagontk/http/model/HttpField { public fun (Ljava/lang/String;Ljava/util/List;)V public fun (Ljava/lang/String;[Ljava/lang/Object;)V public final fun component1 ()Ljava/lang/String; public final fun component2 ()Ljava/util/List; - public final fun copy (Ljava/lang/String;Ljava/util/List;)Lcom/hexagonkt/http/model/QueryParameter; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/QueryParameter;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/model/QueryParameter; + public final fun copy (Ljava/lang/String;Ljava/util/List;)Lcom/hexagontk/http/model/QueryParameter; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/QueryParameter;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/model/QueryParameter; public fun equals (Ljava/lang/Object;)Z public fun getName ()Ljava/lang/String; public fun getValue ()Ljava/lang/Object; public fun getValues ()Ljava/util/List; public fun hashCode ()I - public synthetic fun minus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/HttpField; - public fun minus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/QueryParameter; - public synthetic fun plus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/HttpField; - public fun plus (Ljava/lang/Object;)Lcom/hexagonkt/http/model/QueryParameter; + public synthetic fun minus (Ljava/lang/Object;)Lcom/hexagontk/http/model/HttpField; + public fun minus (Ljava/lang/Object;)Lcom/hexagontk/http/model/QueryParameter; + public synthetic fun plus (Ljava/lang/Object;)Lcom/hexagontk/http/model/HttpField; + public fun plus (Ljava/lang/Object;)Lcom/hexagontk/http/model/QueryParameter; public fun string ()Ljava/lang/String; public fun strings ()Ljava/util/List; public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/model/QueryParameters : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker { +public final class com/hexagontk/http/model/QueryParameters : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker { public fun (Ljava/util/List;)V public fun (Ljava/util/Map;)V - public fun ([Lcom/hexagonkt/http/model/QueryParameter;)V + public fun ([Lcom/hexagontk/http/model/QueryParameter;)V public fun clear ()V public final fun component1 ()Ljava/util/Map; public synthetic fun compute (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object; - public fun compute (Ljava/lang/String;Ljava/util/function/BiFunction;)Lcom/hexagonkt/http/model/QueryParameter; + public fun compute (Ljava/lang/String;Ljava/util/function/BiFunction;)Lcom/hexagontk/http/model/QueryParameter; public synthetic fun computeIfAbsent (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; - public fun computeIfAbsent (Ljava/lang/String;Ljava/util/function/Function;)Lcom/hexagonkt/http/model/QueryParameter; + public fun computeIfAbsent (Ljava/lang/String;Ljava/util/function/Function;)Lcom/hexagontk/http/model/QueryParameter; public synthetic fun computeIfPresent (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object; - public fun computeIfPresent (Ljava/lang/String;Ljava/util/function/BiFunction;)Lcom/hexagonkt/http/model/QueryParameter; + public fun computeIfPresent (Ljava/lang/String;Ljava/util/function/BiFunction;)Lcom/hexagontk/http/model/QueryParameter; public final fun containsKey (Ljava/lang/Object;)Z public fun containsKey (Ljava/lang/String;)Z - public fun containsValue (Lcom/hexagonkt/http/model/QueryParameter;)Z + public fun containsValue (Lcom/hexagontk/http/model/QueryParameter;)Z public final fun containsValue (Ljava/lang/Object;)Z - public final fun copy (Ljava/util/Map;)Lcom/hexagonkt/http/model/QueryParameters; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/QueryParameters;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/model/QueryParameters; + public final fun copy (Ljava/util/Map;)Lcom/hexagontk/http/model/QueryParameters; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/QueryParameters;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/model/QueryParameters; public final fun entrySet ()Ljava/util/Set; public fun equals (Ljava/lang/Object;)Z - public final fun get (Ljava/lang/Object;)Lcom/hexagonkt/http/model/QueryParameter; + public final fun get (Ljava/lang/Object;)Lcom/hexagontk/http/model/QueryParameter; public final synthetic fun get (Ljava/lang/Object;)Ljava/lang/Object; - public fun get (Ljava/lang/String;)Lcom/hexagonkt/http/model/QueryParameter; + public fun get (Ljava/lang/String;)Lcom/hexagontk/http/model/QueryParameter; public fun getEntries ()Ljava/util/Set; public final fun getHttpFields ()Ljava/util/Map; public fun getKeys ()Ljava/util/Set; @@ -696,29 +696,29 @@ public final class com/hexagonkt/http/model/QueryParameters : java/util/Map, kot public fun isEmpty ()Z public final fun keySet ()Ljava/util/Set; public synthetic fun merge (Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object; - public fun merge (Ljava/lang/String;Lcom/hexagonkt/http/model/QueryParameter;Ljava/util/function/BiFunction;)Lcom/hexagonkt/http/model/QueryParameter; - public final fun minus (Ljava/lang/String;)Lcom/hexagonkt/http/model/QueryParameters; - public final fun plus (Lcom/hexagonkt/http/model/QueryParameter;)Lcom/hexagonkt/http/model/QueryParameters; - public final fun plus (Lcom/hexagonkt/http/model/QueryParameters;)Lcom/hexagonkt/http/model/QueryParameters; + public fun merge (Ljava/lang/String;Lcom/hexagontk/http/model/QueryParameter;Ljava/util/function/BiFunction;)Lcom/hexagontk/http/model/QueryParameter; + public final fun minus (Ljava/lang/String;)Lcom/hexagontk/http/model/QueryParameters; + public final fun plus (Lcom/hexagontk/http/model/QueryParameter;)Lcom/hexagontk/http/model/QueryParameters; + public final fun plus (Lcom/hexagontk/http/model/QueryParameters;)Lcom/hexagontk/http/model/QueryParameters; public synthetic fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - public fun put (Ljava/lang/String;Lcom/hexagonkt/http/model/QueryParameter;)Lcom/hexagonkt/http/model/QueryParameter; + public fun put (Ljava/lang/String;Lcom/hexagontk/http/model/QueryParameter;)Lcom/hexagontk/http/model/QueryParameter; public fun putAll (Ljava/util/Map;)V public synthetic fun putIfAbsent (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - public fun putIfAbsent (Ljava/lang/String;Lcom/hexagonkt/http/model/QueryParameter;)Lcom/hexagonkt/http/model/QueryParameter; - public fun remove (Ljava/lang/Object;)Lcom/hexagonkt/http/model/QueryParameter; + public fun putIfAbsent (Ljava/lang/String;Lcom/hexagontk/http/model/QueryParameter;)Lcom/hexagontk/http/model/QueryParameter; + public fun remove (Ljava/lang/Object;)Lcom/hexagontk/http/model/QueryParameter; public synthetic fun remove (Ljava/lang/Object;)Ljava/lang/Object; public fun remove (Ljava/lang/Object;Ljava/lang/Object;)Z public synthetic fun replace (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; public synthetic fun replace (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z - public fun replace (Ljava/lang/String;Lcom/hexagonkt/http/model/QueryParameter;)Lcom/hexagonkt/http/model/QueryParameter; - public fun replace (Ljava/lang/String;Lcom/hexagonkt/http/model/QueryParameter;Lcom/hexagonkt/http/model/QueryParameter;)Z + public fun replace (Ljava/lang/String;Lcom/hexagontk/http/model/QueryParameter;)Lcom/hexagontk/http/model/QueryParameter; + public fun replace (Ljava/lang/String;Lcom/hexagontk/http/model/QueryParameter;Lcom/hexagontk/http/model/QueryParameter;)Z public fun replaceAll (Ljava/util/function/BiFunction;)V public final fun size ()I public fun toString ()Ljava/lang/String; public final fun values ()Ljava/util/Collection; } -public final class com/hexagonkt/http/model/ServerEvent { +public final class com/hexagontk/http/model/ServerEvent { public fun ()V public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)V public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -726,8 +726,8 @@ public final class com/hexagonkt/http/model/ServerEvent { public final fun component2 ()Ljava/lang/String; public final fun component3 ()Ljava/lang/String; public final fun component4 ()Ljava/lang/Long; - public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)Lcom/hexagonkt/http/model/ServerEvent; - public static synthetic fun copy$default (Lcom/hexagonkt/http/model/ServerEvent;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)Lcom/hexagonkt/http/model/ServerEvent; + public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)Lcom/hexagontk/http/model/ServerEvent; + public static synthetic fun copy$default (Lcom/hexagontk/http/model/ServerEvent;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)Lcom/hexagontk/http/model/ServerEvent; public fun equals (Ljava/lang/Object;)Z public final fun getData ()Ljava/lang/String; public final fun getEvent ()Ljava/lang/String; @@ -738,7 +738,7 @@ public final class com/hexagonkt/http/model/ServerEvent { public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/model/ws/CloseStatusesKt { +public final class com/hexagontk/http/model/ws/CloseStatusesKt { public static final field ABNORMAL I public static final field BAD_DATA I public static final field BAD_PAYLOAD I @@ -758,12 +758,12 @@ public final class com/hexagonkt/http/model/ws/CloseStatusesKt { public static final field UNDEFINED I } -public abstract interface class com/hexagonkt/http/model/ws/WsSession { +public abstract interface class com/hexagontk/http/model/ws/WsSession { public abstract fun close (ILjava/lang/String;)V public abstract fun getAttributes ()Ljava/util/Map; public abstract fun getException ()Ljava/lang/Exception; public abstract fun getPathParameters ()Ljava/util/Map; - public abstract fun getRequest ()Lcom/hexagonkt/http/model/HttpRequestPort; + public abstract fun getRequest ()Lcom/hexagontk/http/model/HttpRequestPort; public abstract fun getUri ()Ljava/net/URI; public abstract fun ping ([B)V public abstract fun pong ([B)V @@ -771,19 +771,19 @@ public abstract interface class com/hexagonkt/http/model/ws/WsSession { public abstract fun send ([B)V } -public final class com/hexagonkt/http/model/ws/WsSession$DefaultImpls { - public static synthetic fun close$default (Lcom/hexagonkt/http/model/ws/WsSession;ILjava/lang/String;ILjava/lang/Object;)V +public final class com/hexagontk/http/model/ws/WsSession$DefaultImpls { + public static synthetic fun close$default (Lcom/hexagontk/http/model/ws/WsSession;ILjava/lang/String;ILjava/lang/Object;)V } -public final class com/hexagonkt/http/patterns/LiteralPathPattern : com/hexagonkt/http/patterns/PathPattern { +public final class com/hexagontk/http/patterns/LiteralPathPattern : com/hexagontk/http/patterns/PathPattern { public fun ()V public fun (Ljava/lang/String;Z)V public synthetic fun (Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/patterns/PathPattern; + public fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/patterns/PathPattern; public final fun component1 ()Ljava/lang/String; public final fun component2 ()Z - public final fun copy (Ljava/lang/String;Z)Lcom/hexagonkt/http/patterns/LiteralPathPattern; - public static synthetic fun copy$default (Lcom/hexagonkt/http/patterns/LiteralPathPattern;Ljava/lang/String;ZILjava/lang/Object;)Lcom/hexagonkt/http/patterns/LiteralPathPattern; + public final fun copy (Ljava/lang/String;Z)Lcom/hexagontk/http/patterns/LiteralPathPattern; + public static synthetic fun copy$default (Lcom/hexagontk/http/patterns/LiteralPathPattern;Ljava/lang/String;ZILjava/lang/Object;)Lcom/hexagontk/http/patterns/LiteralPathPattern; public fun describe ()Ljava/lang/String; public fun equals (Ljava/lang/Object;)Z public fun extractParameters (Ljava/lang/String;)Ljava/util/Map; @@ -795,8 +795,8 @@ public final class com/hexagonkt/http/patterns/LiteralPathPattern : com/hexagonk public fun toString ()Ljava/lang/String; } -public abstract interface class com/hexagonkt/http/patterns/PathPattern { - public abstract fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/patterns/PathPattern; +public abstract interface class com/hexagontk/http/patterns/PathPattern { + public abstract fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/patterns/PathPattern; public abstract fun describe ()Ljava/lang/String; public abstract fun extractParameters (Ljava/lang/String;)Ljava/util/Map; public abstract fun getPattern ()Ljava/lang/String; @@ -805,23 +805,23 @@ public abstract interface class com/hexagonkt/http/patterns/PathPattern { public abstract fun matches (Ljava/lang/String;)Z } -public final class com/hexagonkt/http/patterns/PathPattern$DefaultImpls { - public static fun describe (Lcom/hexagonkt/http/patterns/PathPattern;)Ljava/lang/String; - public static fun insertParameters (Lcom/hexagonkt/http/patterns/PathPattern;Ljava/util/Map;)Ljava/lang/String; +public final class com/hexagontk/http/patterns/PathPattern$DefaultImpls { + public static fun describe (Lcom/hexagontk/http/patterns/PathPattern;)Ljava/lang/String; + public static fun insertParameters (Lcom/hexagontk/http/patterns/PathPattern;Ljava/util/Map;)Ljava/lang/String; } -public final class com/hexagonkt/http/patterns/PathPatternsKt { - public static final fun createPathPattern (Ljava/lang/String;Z)Lcom/hexagonkt/http/patterns/PathPattern; +public final class com/hexagontk/http/patterns/PathPatternsKt { + public static final fun createPathPattern (Ljava/lang/String;Z)Lcom/hexagontk/http/patterns/PathPattern; } -public final class com/hexagonkt/http/patterns/RegexPathPattern : com/hexagonkt/http/patterns/PathPattern { +public final class com/hexagontk/http/patterns/RegexPathPattern : com/hexagontk/http/patterns/PathPattern { public static final field PARAMETER_PREFIX Ljava/lang/String; public static final field PARAMETER_SUFFIX Ljava/lang/String; public fun (Lkotlin/text/Regex;)V - public fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/patterns/PathPattern; + public fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/patterns/PathPattern; public final fun component1 ()Lkotlin/text/Regex; - public final fun copy (Lkotlin/text/Regex;)Lcom/hexagonkt/http/patterns/RegexPathPattern; - public static synthetic fun copy$default (Lcom/hexagonkt/http/patterns/RegexPathPattern;Lkotlin/text/Regex;ILjava/lang/Object;)Lcom/hexagonkt/http/patterns/RegexPathPattern; + public final fun copy (Lkotlin/text/Regex;)Lcom/hexagontk/http/patterns/RegexPathPattern; + public static synthetic fun copy$default (Lcom/hexagontk/http/patterns/RegexPathPattern;Lkotlin/text/Regex;ILjava/lang/Object;)Lcom/hexagontk/http/patterns/RegexPathPattern; public fun describe ()Ljava/lang/String; public fun equals (Ljava/lang/Object;)Z public fun extractParameters (Ljava/lang/String;)Ljava/util/Map; @@ -835,15 +835,15 @@ public final class com/hexagonkt/http/patterns/RegexPathPattern : com/hexagonkt/ public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/patterns/TemplatePathPattern : com/hexagonkt/http/patterns/PathPattern { +public final class com/hexagontk/http/patterns/TemplatePathPattern : com/hexagontk/http/patterns/PathPattern { public static final field VARIABLE_PATTERN Ljava/lang/String; public fun (Ljava/lang/String;Z)V public synthetic fun (Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/patterns/PathPattern; + public fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/patterns/PathPattern; public final fun component1 ()Ljava/lang/String; public final fun component2 ()Z - public final fun copy (Ljava/lang/String;Z)Lcom/hexagonkt/http/patterns/TemplatePathPattern; - public static synthetic fun copy$default (Lcom/hexagonkt/http/patterns/TemplatePathPattern;Ljava/lang/String;ZILjava/lang/Object;)Lcom/hexagonkt/http/patterns/TemplatePathPattern; + public final fun copy (Ljava/lang/String;Z)Lcom/hexagontk/http/patterns/TemplatePathPattern; + public static synthetic fun copy$default (Lcom/hexagontk/http/patterns/TemplatePathPattern;Ljava/lang/String;ZILjava/lang/Object;)Lcom/hexagontk/http/patterns/TemplatePathPattern; public fun describe ()Ljava/lang/String; public fun equals (Ljava/lang/Object;)Z public fun extractParameters (Ljava/lang/String;)Ljava/util/Map; @@ -856,14 +856,14 @@ public final class com/hexagonkt/http/patterns/TemplatePathPattern : com/hexagon public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/patterns/WildcardPathPattern : com/hexagonkt/http/patterns/PathPattern { +public final class com/hexagontk/http/patterns/WildcardPathPattern : com/hexagontk/http/patterns/PathPattern { public fun ()V public fun (Z)V public synthetic fun (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/patterns/PathPattern; + public fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/patterns/PathPattern; public final fun component1 ()Z - public final fun copy (Z)Lcom/hexagonkt/http/patterns/WildcardPathPattern; - public static synthetic fun copy$default (Lcom/hexagonkt/http/patterns/WildcardPathPattern;ZILjava/lang/Object;)Lcom/hexagonkt/http/patterns/WildcardPathPattern; + public final fun copy (Z)Lcom/hexagontk/http/patterns/WildcardPathPattern; + public static synthetic fun copy$default (Lcom/hexagontk/http/patterns/WildcardPathPattern;ZILjava/lang/Object;)Lcom/hexagontk/http/patterns/WildcardPathPattern; public fun describe ()Ljava/lang/String; public fun equals (Ljava/lang/Object;)Z public fun extractParameters (Ljava/lang/String;)Ljava/util/Map; diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/Http.kt b/http/http/src/main/kotlin/com/hexagonkt/http/Http.kt index 1b7c98db46..b86fbb422d 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/Http.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/Http.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.http - -import com.hexagonkt.core.GMT_ZONE -import com.hexagonkt.core.assertEnabled -import com.hexagonkt.core.Jvm -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.core.text.encodeToBase64 -import com.hexagonkt.http.model.* +package com.hexagontk.http + +import com.hexagontk.core.GMT_ZONE +import com.hexagontk.core.assertEnabled +import com.hexagontk.core.Jvm +import com.hexagontk.core.media.MediaType +import com.hexagontk.core.text.encodeToBase64 +import com.hexagontk.http.model.* import java.net.URLDecoder import java.net.URLEncoder import java.nio.charset.Charset diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/SslSettings.kt b/http/http/src/main/kotlin/com/hexagonkt/http/SslSettings.kt index 8ea5c61ec6..8d1dc36ec9 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/SslSettings.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/SslSettings.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http +package com.hexagontk.http import java.net.URL diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/Authorization.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/Authorization.kt index a006747d47..5d316b0a6b 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/Authorization.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/Authorization.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model data class Authorization( val type: String, diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/ContentType.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/ContentType.kt index 65f2ba331f..181cbbb627 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/ContentType.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/ContentType.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.core.assertEnabled +import com.hexagontk.core.media.MediaType +import com.hexagontk.core.assertEnabled import java.nio.charset.Charset data class ContentType( diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/Cookie.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/Cookie.kt index fa2036fbe4..b066cb2e28 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/Cookie.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/Cookie.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model import java.time.Instant diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/CookieSameSite.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/CookieSameSite.kt index 78c49d3111..533362ae2c 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/CookieSameSite.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/CookieSameSite.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model enum class CookieSameSite { STRICT, diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/FormParameter.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/FormParameter.kt index 4939867a3f..f950081aa6 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/FormParameter.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/FormParameter.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model data class FormParameter( override val name: String, diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/FormParameters.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/FormParameters.kt index d54165fe0f..6ebadcf419 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/FormParameters.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/FormParameters.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model data class FormParameters( val httpFields: Map diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/Header.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/Header.kt index a38d27e25e..87aa7a6b06 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/Header.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/Header.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model data class Header( override val name: String, diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/Headers.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/Headers.kt index 56f78f918b..d4dc06e35f 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/Headers.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/Headers.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model data class Headers( val httpFields: Map diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpBase.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpBase.kt index 786182ba97..012d6baa10 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpBase.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpBase.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model interface HttpBase { val body: Any diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpCall.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpCall.kt index 3472dc8719..4e18b3ec21 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpCall.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpCall.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model data class HttpCall( val request: HttpRequestPort = HttpRequest(), diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpField.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpField.kt index 09d8db9bf9..6a1d7855cc 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpField.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpField.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model /** * HTTP multi-value field. Used in headers, query parameters and form parameters. diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpMessage.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpMessage.kt index fa92b0a28c..2e71cdae9d 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpMessage.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpMessage.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model interface HttpMessage : HttpBase { val cookies: List // hash of browser cookies diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpMethod.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpMethod.kt index cc204b004c..9e62879d24 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpMethod.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpMethod.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model /** * Supported HTTP methods. diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpPart.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpPart.kt index bfbb24d6e6..985aa51780 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpPart.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpPart.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model data class HttpPart ( val name: String, diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpProtocol.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpProtocol.kt index f8f7f8139b..38e15e6d1c 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpProtocol.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpProtocol.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model /** * Supported HTTP protocols. diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpRequest.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpRequest.kt index c5171bff53..290bcbe1db 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpRequest.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpRequest.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.http.* -import com.hexagonkt.http.model.HttpMethod.GET -import com.hexagonkt.http.model.HttpProtocol.HTTP +import com.hexagontk.http.* +import com.hexagontk.http.model.HttpMethod.GET +import com.hexagontk.http.model.HttpProtocol.HTTP import java.security.cert.X509Certificate data class HttpRequest( diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpRequestPort.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpRequestPort.kt index 622fc0355c..73e202d68b 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpRequestPort.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpRequestPort.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.formatQueryString +import com.hexagontk.core.urlOf +import com.hexagontk.http.formatQueryString import java.net.URL import java.security.cert.X509Certificate diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpResponse.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpResponse.kt index c8caeee1c7..5086ca28db 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpResponse.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpResponse.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.http.checkHeaders -import com.hexagonkt.http.model.ws.WsSession +import com.hexagontk.http.checkHeaders +import com.hexagontk.http.model.ws.WsSession data class HttpResponse( override val body: Any = "", diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpResponsePort.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpResponsePort.kt index b93854e186..f203f143eb 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpResponsePort.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpResponsePort.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.http.model.ws.WsSession +import com.hexagontk.http.model.ws.WsSession interface HttpResponsePort : HttpMessage { val status: HttpStatus diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpStatus.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpStatus.kt index af4f996315..f67e9e8df8 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpStatus.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpStatus.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.core.assertEnabled -import com.hexagonkt.http.model.HttpStatusType.* +import com.hexagontk.core.assertEnabled +import com.hexagontk.http.model.HttpStatusType.* import kotlin.IllegalArgumentException data class HttpStatus( diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpStatusType.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpStatusType.kt index 486601080c..b886b33188 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpStatusType.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpStatusType.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model enum class HttpStatusType { INFORMATION, diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpStatuses.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpStatuses.kt index 2e96d8ba45..217018caf5 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpStatuses.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/HttpStatuses.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.http.model.HttpStatusType.* +import com.hexagontk.http.model.HttpStatusType.* val CONTINUE_100: HttpStatus = HttpStatus(100, INFORMATION) val SWITCHING_PROTOCOLS_101: HttpStatus = HttpStatus(101, INFORMATION) diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/QueryParameter.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/QueryParameter.kt index 6057fd3ba8..92c2a9880b 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/QueryParameter.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/QueryParameter.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model data class QueryParameter( override val name: String, diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/QueryParameters.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/QueryParameters.kt index 35814875b2..9327d19596 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/QueryParameters.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/QueryParameters.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model data class QueryParameters( val httpFields: Map diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/ServerEvent.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/ServerEvent.kt index 6e20b6ea35..f5f5912bfe 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/ServerEvent.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/ServerEvent.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model data class ServerEvent( val event: String? = null, diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/ws/CloseStatuses.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/ws/CloseStatuses.kt index 44328e6137..b45020897d 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/ws/CloseStatuses.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/ws/CloseStatuses.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model.ws +package com.hexagontk.http.model.ws /** * 1000 indicates a normal closure, meaning that the purpose for which the connection was diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/model/ws/WsSession.kt b/http/http/src/main/kotlin/com/hexagonkt/http/model/ws/WsSession.kt index 8befc5f816..01dfc5938c 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/model/ws/WsSession.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/model/ws/WsSession.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.model.ws +package com.hexagontk.http.model.ws -import com.hexagonkt.http.model.HttpRequestPort +import com.hexagontk.http.model.HttpRequestPort import java.net.URI interface WsSession { diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/patterns/LiteralPathPattern.kt b/http/http/src/main/kotlin/com/hexagonkt/http/patterns/LiteralPathPattern.kt index 33a205546b..246e794647 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/patterns/LiteralPathPattern.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/patterns/LiteralPathPattern.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.patterns +package com.hexagontk.http.patterns data class LiteralPathPattern( override val pattern: String = "", diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/patterns/PathPattern.kt b/http/http/src/main/kotlin/com/hexagonkt/http/patterns/PathPattern.kt index d6564df81d..4b0567d382 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/patterns/PathPattern.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/patterns/PathPattern.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.patterns +package com.hexagontk.http.patterns interface PathPattern { diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/patterns/PathPatterns.kt b/http/http/src/main/kotlin/com/hexagonkt/http/patterns/PathPatterns.kt index 1461151f8c..7339a0c814 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/patterns/PathPatterns.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/patterns/PathPatterns.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.patterns +package com.hexagontk.http.patterns -import com.hexagonkt.core.assertEnabled -import com.hexagonkt.http.patterns.TemplatePathPattern.Companion.WILDCARD +import com.hexagontk.core.assertEnabled +import com.hexagontk.http.patterns.TemplatePathPattern.Companion.WILDCARD fun createPathPattern(pattern: String, prefix: Boolean): PathPattern = when { diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/patterns/RegexPathPattern.kt b/http/http/src/main/kotlin/com/hexagonkt/http/patterns/RegexPathPattern.kt index a20fc9270a..04c6b5d7c0 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/patterns/RegexPathPattern.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/patterns/RegexPathPattern.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.patterns +package com.hexagontk.http.patterns -import com.hexagonkt.core.text.filter -import com.hexagonkt.http.patterns.TemplatePathPattern.Companion.VARIABLE_PATTERN -import com.hexagonkt.http.patterns.TemplatePathPattern.Companion.patternToRegex +import com.hexagontk.core.text.filter +import com.hexagontk.http.patterns.TemplatePathPattern.Companion.VARIABLE_PATTERN +import com.hexagontk.http.patterns.TemplatePathPattern.Companion.patternToRegex data class RegexPathPattern(val regex: Regex) : PathPattern { diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/patterns/TemplatePathPattern.kt b/http/http/src/main/kotlin/com/hexagonkt/http/patterns/TemplatePathPattern.kt index c32cbba95d..077e656a16 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/patterns/TemplatePathPattern.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/patterns/TemplatePathPattern.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.patterns +package com.hexagontk.http.patterns /** * A path definition. It parses path patterns and extract values for parameters. diff --git a/http/http/src/main/kotlin/com/hexagonkt/http/patterns/WildcardPathPattern.kt b/http/http/src/main/kotlin/com/hexagonkt/http/patterns/WildcardPathPattern.kt index 5f19f804ea..90f7ae6e49 100644 --- a/http/http/src/main/kotlin/com/hexagonkt/http/patterns/WildcardPathPattern.kt +++ b/http/http/src/main/kotlin/com/hexagonkt/http/patterns/WildcardPathPattern.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.patterns +package com.hexagontk.http.patterns -import com.hexagonkt.http.patterns.TemplatePathPattern.Companion.WILDCARD +import com.hexagontk.http.patterns.TemplatePathPattern.Companion.WILDCARD data class WildcardPathPattern(override val prefix: Boolean = false) : PathPattern { diff --git a/http/http/src/main/kotlin/module-info.java b/http/http/src/main/kotlin/module-info.java index b6396ef9e9..b3d51b4da6 100644 --- a/http/http/src/main/kotlin/module-info.java +++ b/http/http/src/main/kotlin/module-info.java @@ -1,10 +1,10 @@ -module com.hexagonkt.http { +module com.hexagontk.http { - requires transitive com.hexagonkt.core; + requires transitive com.hexagontk.core; - exports com.hexagonkt.http; - exports com.hexagonkt.http.model; - exports com.hexagonkt.http.model.ws; - exports com.hexagonkt.http.patterns; + exports com.hexagontk.http; + exports com.hexagontk.http.model; + exports com.hexagontk.http.model.ws; + exports com.hexagontk.http.patterns; } diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/HttpTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/HttpTest.kt index 15e6f61669..5b168b7045 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/HttpTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/HttpTest.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.http - -import com.hexagonkt.core.GMT_ZONE -import com.hexagonkt.core.Jvm -import com.hexagonkt.http.model.Header -import com.hexagonkt.http.model.QueryParameters -import com.hexagonkt.http.model.Headers -import com.hexagonkt.http.model.QueryParameter +package com.hexagontk.http + +import com.hexagontk.core.GMT_ZONE +import com.hexagontk.core.Jvm +import com.hexagontk.http.model.Header +import com.hexagontk.http.model.QueryParameters +import com.hexagontk.http.model.Headers +import com.hexagontk.http.model.QueryParameter import org.junit.jupiter.api.Test import java.time.* import kotlin.test.assertEquals diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/SslSettingsTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/SslSettingsTest.kt index a69593a95e..9fedeee8cf 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/SslSettingsTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/SslSettingsTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http +package com.hexagontk.http import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/ContentTypeTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/ContentTypeTest.kt index 32021e141e..12446139fb 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/ContentTypeTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/ContentTypeTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.http.parseContentType +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.http.parseContentType import org.junit.jupiter.api.Test import kotlin.IllegalStateException import java.nio.charset.Charset diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/CookieTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/CookieTest.kt index 213285dc0f..e94cd86593 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/CookieTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/CookieTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.http.model.CookieSameSite.* +import com.hexagontk.http.model.CookieSameSite.* import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Test import kotlin.IllegalArgumentException diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/FormParametersTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/FormParametersTest.kt index ebe1ca983e..03023271d6 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/FormParametersTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/FormParametersTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.core.require +import com.hexagontk.core.require import org.junit.jupiter.api.Test import kotlin.test.* diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HeadersTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HeadersTest.kt index 5ec27e0429..980f47d425 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/HeadersTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/HeadersTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.core.require +import com.hexagontk.core.require import org.junit.jupiter.api.Test import kotlin.test.* diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpCallTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpCallTest.kt index 7e9ee6eb6b..c045a1fc2c 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpCallTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpCallTest.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.core.media.TEXT_HTML -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.http.model.HttpProtocol.HTTPS +import com.hexagontk.core.media.TEXT_HTML +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.http.model.HttpProtocol.HTTPS import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpFieldTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpFieldTest.kt index b9046ce1d6..e51a897b0b 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpFieldTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpFieldTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpMethodTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpMethodTest.kt index 46f100f152..dcff4856eb 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpMethodTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpMethodTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpPartTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpPartTest.kt index 7de95250d8..a73e299c2a 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpPartTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpPartTest.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.core.media.MediaTypeGroup.TEXT -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.core.media.TEXT_HTML +import com.hexagontk.core.media.MediaTypeGroup.TEXT +import com.hexagontk.core.media.MediaType +import com.hexagontk.core.media.TEXT_HTML import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpProtocolTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpProtocolTest.kt index 5e1592ccf5..f8eebc2683 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpProtocolTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpProtocolTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.http.model.HttpProtocol.* +import com.hexagontk.http.model.HttpProtocol.* import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpRequestTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpRequestTest.kt index 8555cb90ac..80327e3e85 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpRequestTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpRequestTest.kt @@ -1,15 +1,15 @@ -package com.hexagonkt.http.model - -import com.hexagonkt.core.fail -import com.hexagonkt.core.media.TEXT_CSS -import com.hexagonkt.core.media.TEXT_HTML -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.core.media.TEXT_RICHTEXT -import com.hexagonkt.core.security.loadKeyStore -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.model.HttpMethod.POST -import com.hexagonkt.http.model.HttpMethod.PUT -import com.hexagonkt.http.model.HttpProtocol.* +package com.hexagontk.http.model + +import com.hexagontk.core.fail +import com.hexagontk.core.media.TEXT_CSS +import com.hexagontk.core.media.TEXT_HTML +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.core.media.TEXT_RICHTEXT +import com.hexagontk.core.security.loadKeyStore +import com.hexagontk.core.urlOf +import com.hexagontk.http.model.HttpMethod.POST +import com.hexagontk.http.model.HttpMethod.PUT +import com.hexagontk.http.model.HttpProtocol.* import java.security.cert.X509Certificate import org.junit.jupiter.api.Test import kotlin.test.* diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpResponseTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpResponseTest.kt index 26e4544833..88317ca83f 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpResponseTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpResponseTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.core.media.TEXT_HTML -import com.hexagonkt.core.media.TEXT_RICHTEXT +import com.hexagontk.core.media.TEXT_HTML +import com.hexagontk.core.media.TEXT_RICHTEXT import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpStatusTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpStatusTest.kt index 2a9d72cc3b..b23c756636 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpStatusTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpStatusTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.http.model.HttpStatusType.* +import com.hexagontk.http.model.HttpStatusType.* import org.junit.jupiter.api.Test import kotlin.IllegalArgumentException import kotlin.test.assertEquals diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpStatusesTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpStatusesTest.kt index a2c90f4645..4ffabc1d07 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpStatusesTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/HttpStatusesTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.http.model.HttpStatusType.* +import com.hexagontk.http.model.HttpStatusType.* import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/QueryParametersTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/QueryParametersTest.kt index f2f5e3c482..28919dd0b8 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/QueryParametersTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/QueryParametersTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model -import com.hexagonkt.core.require +import com.hexagontk.core.require import org.junit.jupiter.api.Test import kotlin.test.* diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/ServerEventTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/ServerEventTest.kt index 65c81aa1c0..09aac4ba4b 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/ServerEventTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/ServerEventTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.model +package com.hexagontk.http.model import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/model/ws/WebSocketModelTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/model/ws/WebSocketModelTest.kt index cc70d4129b..abe8d5c9f8 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/model/ws/WebSocketModelTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/model/ws/WebSocketModelTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.model.ws +package com.hexagontk.http.model.ws -import com.hexagonkt.core.fail -import com.hexagonkt.http.model.HttpRequestPort +import com.hexagontk.core.fail +import com.hexagontk.http.model.HttpRequestPort import java.net.URI import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/patterns/LiteralPathPatternTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/patterns/LiteralPathPatternTest.kt index 11726f9674..c4aa7831fd 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/patterns/LiteralPathPatternTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/patterns/LiteralPathPatternTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.patterns +package com.hexagontk.http.patterns import org.junit.jupiter.api.Test import kotlin.test.* diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/patterns/PathPatternsTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/patterns/PathPatternsTest.kt index d20c9f3054..cb63523ab4 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/patterns/PathPatternsTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/patterns/PathPatternsTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.patterns +package com.hexagontk.http.patterns import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/patterns/RegexPathPatternTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/patterns/RegexPathPatternTest.kt index 65b200763a..88919c0373 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/patterns/RegexPathPatternTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/patterns/RegexPathPatternTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.patterns +package com.hexagontk.http.patterns -import com.hexagonkt.http.patterns.TemplatePathPattern.Companion.VARIABLE_PATTERN as VP +import com.hexagontk.http.patterns.TemplatePathPattern.Companion.VARIABLE_PATTERN as VP import org.junit.jupiter.api.Test import kotlin.test.* diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/patterns/TemplatePathPatternTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/patterns/TemplatePathPatternTest.kt index c6dde443b2..4dff02dc04 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/patterns/TemplatePathPatternTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/patterns/TemplatePathPatternTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.patterns +package com.hexagontk.http.patterns import org.junit.jupiter.api.Test import kotlin.test.* diff --git a/http/http/src/test/kotlin/com/hexagonkt/http/patterns/WildcardPathPatternTest.kt b/http/http/src/test/kotlin/com/hexagonkt/http/patterns/WildcardPathPatternTest.kt index 90e58731e0..5cbe3e992f 100644 --- a/http/http/src/test/kotlin/com/hexagonkt/http/patterns/WildcardPathPatternTest.kt +++ b/http/http/src/test/kotlin/com/hexagonkt/http/patterns/WildcardPathPatternTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.patterns +package com.hexagontk.http.patterns import org.junit.jupiter.api.Test import kotlin.test.* diff --git a/http/http_client/README.md b/http/http_client/README.md index 0943450b1f..2b2e3c43a9 100644 --- a/http/http_client/README.md +++ b/http/http_client/README.md @@ -25,12 +25,12 @@ feature (as [http_client_jetty]) in order to create HTTP clients. # Create an HTTP client You create an HTTP Client instance with default options as follows: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt?clientCreation +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt?clientCreation ## Settings If you want to configure options for the client, you can create it with the following code: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt?clientSettingsCreation +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt?clientSettingsCreation # Send generic requests The most common use case is to send a request and get a response. For details about how to @@ -38,48 +38,48 @@ use requests and responses, refer to the [Request] and the [Response] API. Check this code snippet to get a glimpse on how to send the most general requests: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt?genericRequest +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt?genericRequest -[Request]: /api/http/http/com.hexagonkt.http.model/-http-request -[Response]: /api/http/http/com.hexagonkt.http.model/-http-response +[Request]: /api/http/http/com.hexagontk.http.model/-http-request +[Response]: /api/http/http/com.hexagontk.http.model/-http-response # Simple requests shortcuts There are utility methods to make the most common request in an easy way. ## Without body -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt?withoutBodyRequest +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt?withoutBodyRequest ## With body -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt?bodyRequest +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt?bodyRequest ## With body and content type -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt?bodyAndContentTypeRequest +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt?bodyAndContentTypeRequest # Cookies The HTTP client support setting cookies from client side and updates them after any server request. Check the details in the following code fragment: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CookiesTest.kt?clientCookies +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/CookiesTest.kt?clientCookies You can also check the [full test] for more details. -[full test]: https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CookiesTest.kt +[full test]: https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/CookiesTest.kt # Multipart (forms and files) Using the HTTP client you can send MIME multipart parts to the server. You can use it to post forms or files. ## Forms -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FilesTest.kt?clientForm +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/FilesTest.kt?clientForm ## Files -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FilesTest.kt?clientFile +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/FilesTest.kt?clientFile # WebSockets Web Sockets connections can be opened with the `ws` method on the HTTP client. It creates a WS session that can be used to send data and listen to events through callbacks. -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/WebSocketsTest.kt?ws_client +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/WebSocketsTest.kt?ws_client # TLS The HTTP client supports server certificates (to use HTTPS and HTTP/2) and also client certificates @@ -89,30 +89,30 @@ format. To set up client/server certificates, you need to include [SslSettings] in your [ClientSettings]. In the sections below you can see how to configure these parameters. -[SslSettings]: /api/http/http/com.hexagonkt.http/-ssl-settings -[ClientSettings]: /api/http/http_client/com.hexagonkt.http.client/-http-client-settings +[SslSettings]: /api/http/http/com.hexagontk.http/-ssl-settings +[ClientSettings]: /api/http/http_client/com.hexagontk.http.client/-http-client-settings ## Key Store This store holds the identity certificate, this certificate is presented to the server by the client in the handshake for the server to authorize or deny the connection. The following code: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt?keyStoreSettings +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/HttpsTest.kt?keyStoreSettings ## Trust Store This key store should include all the trusted certificates. Any certificate added as CA (certificate authority) makes the client trust any other certificate signed by them. However, you can also add standalone server certificates. -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt?trustStoreSettings +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/HttpsTest.kt?trustStoreSettings ## Mutual TLS If you set up the identity (service's own certificate) and the trust store (CAs and servers trusted by the client), you will achieve double ended authentication (server authenticated by the client, and client authenticated by the server). You can see a complete example below: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt?https +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/HttpsTest.kt?https -# Package com.hexagonkt.http.client +# Package com.hexagontk.http.client This package holds the classes that define the HTTP client and its configuration settings. [http]: /http diff --git a/http/http_client/api/http_client.api b/http/http_client/api/http_client.api index ce12764cf8..9ab514bedc 100644 --- a/http/http_client/api/http_client.api +++ b/http/http_client/api/http_client.api @@ -1,77 +1,77 @@ -public final class com/hexagonkt/http/client/HttpClient : java/io/Closeable { - public fun (Lcom/hexagonkt/http/client/HttpClientPort;Lcom/hexagonkt/http/client/HttpClientSettings;Lcom/hexagonkt/http/handlers/HttpHandler;)V - public synthetic fun (Lcom/hexagonkt/http/client/HttpClientPort;Lcom/hexagonkt/http/client/HttpClientSettings;Lcom/hexagonkt/http/handlers/HttpHandler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V +public final class com/hexagontk/http/client/HttpClient : java/io/Closeable { + public fun (Lcom/hexagontk/http/client/HttpClientPort;Lcom/hexagontk/http/client/HttpClientSettings;Lcom/hexagontk/http/handlers/HttpHandler;)V + public synthetic fun (Lcom/hexagontk/http/client/HttpClientPort;Lcom/hexagontk/http/client/HttpClientSettings;Lcom/hexagontk/http/handlers/HttpHandler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun close ()V public final fun cookiesMap ()Ljava/util/Map; - public final fun delete (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static synthetic fun delete$default (Lcom/hexagonkt/http/client/HttpClient;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpResponsePort; - public final fun get (Ljava/lang/String;Lcom/hexagonkt/http/model/Headers;Ljava/lang/Object;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static synthetic fun get$default (Lcom/hexagonkt/http/client/HttpClient;Ljava/lang/String;Lcom/hexagonkt/http/model/Headers;Ljava/lang/Object;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpResponsePort; + public final fun delete (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;)Lcom/hexagontk/http/model/HttpResponsePort; + public static synthetic fun delete$default (Lcom/hexagontk/http/client/HttpClient;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpResponsePort; + public final fun get (Ljava/lang/String;Lcom/hexagontk/http/model/Headers;Ljava/lang/Object;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;)Lcom/hexagontk/http/model/HttpResponsePort; + public static synthetic fun get$default (Lcom/hexagontk/http/client/HttpClient;Ljava/lang/String;Lcom/hexagontk/http/model/Headers;Ljava/lang/Object;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpResponsePort; public final fun getCookies ()Ljava/util/List; - public final fun getHandler ()Lcom/hexagonkt/http/handlers/HttpHandler; - public final fun getSettings ()Lcom/hexagonkt/http/client/HttpClientSettings; - public final fun head (Ljava/lang/String;Lcom/hexagonkt/http/model/Headers;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static synthetic fun head$default (Lcom/hexagonkt/http/client/HttpClient;Ljava/lang/String;Lcom/hexagonkt/http/model/Headers;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpResponsePort; - public final fun options (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static synthetic fun options$default (Lcom/hexagonkt/http/client/HttpClient;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpResponsePort; - public final fun patch (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static synthetic fun patch$default (Lcom/hexagonkt/http/client/HttpClient;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpResponsePort; - public final fun post (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static synthetic fun post$default (Lcom/hexagonkt/http/client/HttpClient;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpResponsePort; - public final fun put (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static synthetic fun put$default (Lcom/hexagonkt/http/client/HttpClient;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpResponsePort; + public final fun getHandler ()Lcom/hexagontk/http/handlers/HttpHandler; + public final fun getSettings ()Lcom/hexagontk/http/client/HttpClientSettings; + public final fun head (Ljava/lang/String;Lcom/hexagontk/http/model/Headers;)Lcom/hexagontk/http/model/HttpResponsePort; + public static synthetic fun head$default (Lcom/hexagontk/http/client/HttpClient;Ljava/lang/String;Lcom/hexagontk/http/model/Headers;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpResponsePort; + public final fun options (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;)Lcom/hexagontk/http/model/HttpResponsePort; + public static synthetic fun options$default (Lcom/hexagontk/http/client/HttpClient;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpResponsePort; + public final fun patch (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;)Lcom/hexagontk/http/model/HttpResponsePort; + public static synthetic fun patch$default (Lcom/hexagontk/http/client/HttpClient;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpResponsePort; + public final fun post (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;)Lcom/hexagontk/http/model/HttpResponsePort; + public static synthetic fun post$default (Lcom/hexagontk/http/client/HttpClient;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpResponsePort; + public final fun put (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;)Lcom/hexagontk/http/model/HttpResponsePort; + public static synthetic fun put$default (Lcom/hexagontk/http/client/HttpClient;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpResponsePort; public final fun request (Lkotlin/jvm/functions/Function1;)V - public final fun send (Lcom/hexagonkt/http/model/HttpRequest;Ljava/util/Map;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static synthetic fun send$default (Lcom/hexagonkt/http/client/HttpClient;Lcom/hexagonkt/http/model/HttpRequest;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpResponsePort; + public final fun send (Lcom/hexagontk/http/model/HttpRequest;Ljava/util/Map;)Lcom/hexagontk/http/model/HttpResponsePort; + public static synthetic fun send$default (Lcom/hexagontk/http/client/HttpClient;Lcom/hexagontk/http/model/HttpRequest;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpResponsePort; public final fun setCookies (Ljava/util/List;)V - public final fun sse (Lcom/hexagonkt/http/model/HttpRequest;)Ljava/util/concurrent/Flow$Publisher; + public final fun sse (Lcom/hexagontk/http/model/HttpRequest;)Ljava/util/concurrent/Flow$Publisher; public final fun sse (Ljava/lang/String;)Ljava/util/concurrent/Flow$Publisher; public final fun start ()V public final fun started ()Z public final fun stop ()V - public final fun trace (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpResponsePort; - public static synthetic fun trace$default (Lcom/hexagonkt/http/client/HttpClient;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/model/HttpResponsePort; - public final fun ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagonkt/http/model/ws/WsSession; - public static synthetic fun ws$default (Lcom/hexagonkt/http/client/HttpClient;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/hexagonkt/http/model/ws/WsSession; + public final fun trace (Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;)Lcom/hexagontk/http/model/HttpResponsePort; + public static synthetic fun trace$default (Lcom/hexagontk/http/client/HttpClient;Ljava/lang/String;Ljava/lang/Object;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/model/HttpResponsePort; + public final fun ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagontk/http/model/ws/WsSession; + public static synthetic fun ws$default (Lcom/hexagontk/http/client/HttpClient;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/hexagontk/http/model/ws/WsSession; } -public abstract interface class com/hexagonkt/http/client/HttpClientPort { - public abstract fun send (Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/model/HttpResponsePort; +public abstract interface class com/hexagontk/http/client/HttpClientPort { + public abstract fun send (Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/model/HttpResponsePort; public abstract fun shutDown ()V - public abstract fun sse (Lcom/hexagonkt/http/model/HttpRequestPort;)Ljava/util/concurrent/Flow$Publisher; - public abstract fun startUp (Lcom/hexagonkt/http/client/HttpClient;)V + public abstract fun sse (Lcom/hexagontk/http/model/HttpRequestPort;)Ljava/util/concurrent/Flow$Publisher; + public abstract fun startUp (Lcom/hexagontk/http/client/HttpClient;)V public abstract fun started ()Z - public abstract fun ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagonkt/http/model/ws/WsSession; + public abstract fun ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagontk/http/model/ws/WsSession; } -public final class com/hexagonkt/http/client/HttpClientPort$DefaultImpls { - public static synthetic fun ws$default (Lcom/hexagonkt/http/client/HttpClientPort;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/hexagonkt/http/model/ws/WsSession; +public final class com/hexagontk/http/client/HttpClientPort$DefaultImpls { + public static synthetic fun ws$default (Lcom/hexagontk/http/client/HttpClientPort;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/hexagontk/http/model/ws/WsSession; } -public final class com/hexagonkt/http/client/HttpClientSettings { +public final class com/hexagontk/http/client/HttpClientSettings { public fun ()V - public fun (Ljava/net/URL;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;ZLcom/hexagonkt/http/model/Headers;ZLcom/hexagonkt/http/SslSettings;Lcom/hexagonkt/http/model/Authorization;Z)V - public synthetic fun (Ljava/net/URL;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;ZLcom/hexagonkt/http/model/Headers;ZLcom/hexagonkt/http/SslSettings;Lcom/hexagonkt/http/model/Authorization;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Ljava/net/URL;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;ZLcom/hexagontk/http/model/Headers;ZLcom/hexagontk/http/SslSettings;Lcom/hexagontk/http/model/Authorization;Z)V + public synthetic fun (Ljava/net/URL;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;ZLcom/hexagontk/http/model/Headers;ZLcom/hexagontk/http/SslSettings;Lcom/hexagontk/http/model/Authorization;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ljava/net/URL; - public final fun component2 ()Lcom/hexagonkt/http/model/ContentType; + public final fun component2 ()Lcom/hexagontk/http/model/ContentType; public final fun component3 ()Ljava/util/List; public final fun component4 ()Z - public final fun component5 ()Lcom/hexagonkt/http/model/Headers; + public final fun component5 ()Lcom/hexagontk/http/model/Headers; public final fun component6 ()Z - public final fun component7 ()Lcom/hexagonkt/http/SslSettings; - public final fun component8 ()Lcom/hexagonkt/http/model/Authorization; + public final fun component7 ()Lcom/hexagontk/http/SslSettings; + public final fun component8 ()Lcom/hexagontk/http/model/Authorization; public final fun component9 ()Z - public final fun copy (Ljava/net/URL;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;ZLcom/hexagonkt/http/model/Headers;ZLcom/hexagonkt/http/SslSettings;Lcom/hexagonkt/http/model/Authorization;Z)Lcom/hexagonkt/http/client/HttpClientSettings; - public static synthetic fun copy$default (Lcom/hexagonkt/http/client/HttpClientSettings;Ljava/net/URL;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;ZLcom/hexagonkt/http/model/Headers;ZLcom/hexagonkt/http/SslSettings;Lcom/hexagonkt/http/model/Authorization;ZILjava/lang/Object;)Lcom/hexagonkt/http/client/HttpClientSettings; + public final fun copy (Ljava/net/URL;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;ZLcom/hexagontk/http/model/Headers;ZLcom/hexagontk/http/SslSettings;Lcom/hexagontk/http/model/Authorization;Z)Lcom/hexagontk/http/client/HttpClientSettings; + public static synthetic fun copy$default (Lcom/hexagontk/http/client/HttpClientSettings;Ljava/net/URL;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;ZLcom/hexagontk/http/model/Headers;ZLcom/hexagontk/http/SslSettings;Lcom/hexagontk/http/model/Authorization;ZILjava/lang/Object;)Lcom/hexagontk/http/client/HttpClientSettings; public fun equals (Ljava/lang/Object;)Z public final fun getAccept ()Ljava/util/List; - public final fun getAuthorization ()Lcom/hexagonkt/http/model/Authorization; + public final fun getAuthorization ()Lcom/hexagontk/http/model/Authorization; public final fun getBaseUrl ()Ljava/net/URL; - public final fun getContentType ()Lcom/hexagonkt/http/model/ContentType; + public final fun getContentType ()Lcom/hexagontk/http/model/ContentType; public final fun getFollowRedirects ()Z - public final fun getHeaders ()Lcom/hexagonkt/http/model/Headers; + public final fun getHeaders ()Lcom/hexagontk/http/model/Headers; public final fun getInsecure ()Z - public final fun getSslSettings ()Lcom/hexagonkt/http/SslSettings; + public final fun getSslSettings ()Lcom/hexagontk/http/SslSettings; public final fun getUseCookies ()Z public fun hashCode ()I public fun toString ()Ljava/lang/String; diff --git a/http/http_client/src/main/kotlin/com/hexagonkt/http/client/HttpClient.kt b/http/http_client/src/main/kotlin/com/hexagonkt/http/client/HttpClient.kt index 6af68819fe..09a7aa118a 100644 --- a/http/http_client/src/main/kotlin/com/hexagonkt/http/client/HttpClient.kt +++ b/http/http_client/src/main/kotlin/com/hexagonkt/http/client/HttpClient.kt @@ -1,14 +1,14 @@ -package com.hexagonkt.http.client - -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.OnHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.model.HttpResponsePort -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.http.model.ws.WsSession +package com.hexagontk.http.client + +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.OnHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.model.HttpResponsePort +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.http.model.ws.WsSession import java.io.Closeable import java.util.concurrent.Flow.Publisher diff --git a/http/http_client/src/main/kotlin/com/hexagonkt/http/client/HttpClientPort.kt b/http/http_client/src/main/kotlin/com/hexagonkt/http/client/HttpClientPort.kt index 5841b6c752..50a4f50bdf 100644 --- a/http/http_client/src/main/kotlin/com/hexagonkt/http/client/HttpClientPort.kt +++ b/http/http_client/src/main/kotlin/com/hexagonkt/http/client/HttpClientPort.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.http.client +package com.hexagontk.http.client -import com.hexagonkt.http.model.HttpRequestPort -import com.hexagonkt.http.model.HttpResponsePort -import com.hexagonkt.http.model.ServerEvent -import com.hexagonkt.http.model.ws.WsSession +import com.hexagontk.http.model.HttpRequestPort +import com.hexagontk.http.model.HttpResponsePort +import com.hexagontk.http.model.ServerEvent +import com.hexagontk.http.model.ws.WsSession import java.util.concurrent.Flow.Publisher interface HttpClientPort { diff --git a/http/http_client/src/main/kotlin/com/hexagonkt/http/client/HttpClientSettings.kt b/http/http_client/src/main/kotlin/com/hexagonkt/http/client/HttpClientSettings.kt index d8d31c0866..225c6c23e9 100644 --- a/http/http_client/src/main/kotlin/com/hexagonkt/http/client/HttpClientSettings.kt +++ b/http/http_client/src/main/kotlin/com/hexagonkt/http/client/HttpClientSettings.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.client +package com.hexagontk.http.client -import com.hexagonkt.http.SslSettings -import com.hexagonkt.http.model.* +import com.hexagontk.http.SslSettings +import com.hexagontk.http.model.* import java.net.URL // TODO Add proxy configuration and timeouts diff --git a/http/http_client/src/main/kotlin/module-info.java b/http/http_client/src/main/kotlin/module-info.java index 1fd11a5fb3..3dc2941546 100644 --- a/http/http_client/src/main/kotlin/module-info.java +++ b/http/http_client/src/main/kotlin/module-info.java @@ -1,8 +1,8 @@ -module com.hexagonkt.http_client { +module com.hexagontk.http_client { requires transitive kotlin.stdlib; - requires transitive com.hexagonkt.http_handlers; + requires transitive com.hexagontk.http_handlers; - exports com.hexagonkt.http.client; + exports com.hexagontk.http.client; } diff --git a/http/http_client/src/test/kotlin/com/hexagonkt/http/client/CheatSheetTest.kt b/http/http_client/src/test/kotlin/com/hexagonkt/http/client/CheatSheetTest.kt index 0b8106e75a..dcb516863d 100644 --- a/http/http_client/src/test/kotlin/com/hexagonkt/http/client/CheatSheetTest.kt +++ b/http/http_client/src/test/kotlin/com/hexagonkt/http/client/CheatSheetTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.client +package com.hexagontk.http.client import org.junit.jupiter.api.Test diff --git a/http/http_client/src/test/kotlin/com/hexagonkt/http/client/HttpClientSettingsTest.kt b/http/http_client/src/test/kotlin/com/hexagonkt/http/client/HttpClientSettingsTest.kt index d4f5d28051..674622e70e 100644 --- a/http/http_client/src/test/kotlin/com/hexagonkt/http/client/HttpClientSettingsTest.kt +++ b/http/http_client/src/test/kotlin/com/hexagonkt/http/client/HttpClientSettingsTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.client +package com.hexagontk.http.client -import com.hexagonkt.http.model.Headers +import com.hexagontk.http.model.Headers import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/http/http_client/src/test/kotlin/com/hexagonkt/http/client/HttpClientTest.kt b/http/http_client/src/test/kotlin/com/hexagonkt/http/client/HttpClientTest.kt index 3de8f223c9..641d6c510b 100644 --- a/http/http_client/src/test/kotlin/com/hexagonkt/http/client/HttpClientTest.kt +++ b/http/http_client/src/test/kotlin/com/hexagonkt/http/client/HttpClientTest.kt @@ -1,13 +1,13 @@ -package com.hexagonkt.http.client - -import com.hexagonkt.core.media.TEXT_CSV -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.handlers.FilterHandler -import com.hexagonkt.http.handlers.HttpPredicate -import com.hexagonkt.http.model.HttpResponsePort -import com.hexagonkt.http.model.* -import com.hexagonkt.http.patterns.LiteralPathPattern +package com.hexagontk.http.client + +import com.hexagontk.core.media.TEXT_CSV +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.core.urlOf +import com.hexagontk.http.handlers.FilterHandler +import com.hexagontk.http.handlers.HttpPredicate +import com.hexagontk.http.model.HttpResponsePort +import com.hexagontk.http.model.* +import com.hexagontk.http.patterns.LiteralPathPattern import java.lang.StringBuilder import java.util.concurrent.Flow import java.util.concurrent.Flow.Subscription diff --git a/http/http_client/src/test/kotlin/com/hexagonkt/http/client/VoidAdapter.kt b/http/http_client/src/test/kotlin/com/hexagonkt/http/client/VoidAdapter.kt index 85dc7c1a78..6688194f34 100644 --- a/http/http_client/src/test/kotlin/com/hexagonkt/http/client/VoidAdapter.kt +++ b/http/http_client/src/test/kotlin/com/hexagonkt/http/client/VoidAdapter.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.client +package com.hexagontk.http.client -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.ws.WsSession +import com.hexagontk.http.model.* +import com.hexagontk.http.model.ws.WsSession import java.net.URI import java.util.concurrent.Flow.Publisher import java.util.concurrent.SubmissionPublisher diff --git a/http/http_client_java/README.md b/http/http_client_java/README.md index 05c7d3e0cb..910f138ae5 100644 --- a/http/http_client_java/README.md +++ b/http/http_client_java/README.md @@ -14,18 +14,18 @@ mavenCentral() } - implementation("com.hexagonkt:http_client_java:$hexagonVersion") + implementation("com.hexagontk:http_client_java:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk http_client_java $hexagonVersion ``` -# Package com.hexagonkt.http.client.java +# Package com.hexagontk.http.client.java Java HTTP client implementation classes. diff --git a/http/http_client_java/api/http_client_java.api b/http/http_client_java/api/http_client_java.api index c963f83b19..434da1c995 100644 --- a/http/http_client_java/api/http_client_java.api +++ b/http/http_client_java/api/http_client_java.api @@ -1,12 +1,12 @@ -public final class com/hexagonkt/http/client/java/JavaClientAdapter : com/hexagonkt/http/client/HttpClientPort { +public final class com/hexagontk/http/client/java/JavaClientAdapter : com/hexagontk/http/client/HttpClientPort { public fun ()V - public fun (Lcom/hexagonkt/http/model/HttpProtocol;Ljava/util/concurrent/Executor;)V - public synthetic fun (Lcom/hexagonkt/http/model/HttpProtocol;Ljava/util/concurrent/Executor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun send (Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/model/HttpResponsePort; + public fun (Lcom/hexagontk/http/model/HttpProtocol;Ljava/util/concurrent/Executor;)V + public synthetic fun (Lcom/hexagontk/http/model/HttpProtocol;Ljava/util/concurrent/Executor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun send (Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/model/HttpResponsePort; public fun shutDown ()V - public fun sse (Lcom/hexagonkt/http/model/HttpRequestPort;)Ljava/util/concurrent/Flow$Publisher; - public fun startUp (Lcom/hexagonkt/http/client/HttpClient;)V + public fun sse (Lcom/hexagontk/http/model/HttpRequestPort;)Ljava/util/concurrent/Flow$Publisher; + public fun startUp (Lcom/hexagontk/http/client/HttpClient;)V public fun started ()Z - public fun ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagonkt/http/model/ws/WsSession; + public fun ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagontk/http/model/ws/WsSession; } diff --git a/http/http_client_java/src/main/kotlin/com/hexagonkt/http/client/java/JavaClientAdapter.kt b/http/http_client_java/src/main/kotlin/com/hexagonkt/http/client/java/JavaClientAdapter.kt index feedd53721..f22e150029 100644 --- a/http/http_client_java/src/main/kotlin/com/hexagonkt/http/client/java/JavaClientAdapter.kt +++ b/http/http_client_java/src/main/kotlin/com/hexagonkt/http/client/java/JavaClientAdapter.kt @@ -1,20 +1,20 @@ -package com.hexagonkt.http.client.java - -import com.hexagonkt.core.security.createKeyManagerFactory -import com.hexagonkt.core.security.createTrustManagerFactory -import com.hexagonkt.http.CHECKED_HEADERS -import com.hexagonkt.http.SslSettings -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.formatQueryString -import com.hexagonkt.http.handlers.bodyToBytes -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpProtocol.H2C -import com.hexagonkt.http.model.HttpProtocol.HTTP2 -import com.hexagonkt.http.model.HttpResponse -import com.hexagonkt.http.model.ws.WsSession -import com.hexagonkt.http.parseContentType +package com.hexagontk.http.client.java + +import com.hexagontk.core.security.createKeyManagerFactory +import com.hexagontk.core.security.createTrustManagerFactory +import com.hexagontk.http.CHECKED_HEADERS +import com.hexagontk.http.SslSettings +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.formatQueryString +import com.hexagontk.http.handlers.bodyToBytes +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpProtocol.H2C +import com.hexagontk.http.model.HttpProtocol.HTTP2 +import com.hexagontk.http.model.HttpResponse +import com.hexagontk.http.model.ws.WsSession +import com.hexagontk.http.parseContentType import java.net.CookieManager import java.net.HttpCookie import java.net.URI diff --git a/http/http_client_java/src/main/kotlin/module-info.java b/http/http_client_java/src/main/kotlin/module-info.java index 3054baedd2..ca80f5e7f1 100644 --- a/http/http_client_java/src/main/kotlin/module-info.java +++ b/http/http_client_java/src/main/kotlin/module-info.java @@ -1,9 +1,9 @@ -module com.hexagonkt.http_client_java { +module com.hexagontk.http_client_java { - requires transitive com.hexagonkt.http; - requires transitive com.hexagonkt.http_client; + requires transitive com.hexagontk.http; + requires transitive com.hexagontk.http_client; requires transitive java.net.http; - exports com.hexagonkt.http.client.java; + exports com.hexagontk.http.client.java; } diff --git a/http/http_client_java/src/test/kotlin/com/hexagonkt/http/client/java/AdapterExamplesTest.kt b/http/http_client_java/src/test/kotlin/com/hexagonkt/http/client/java/AdapterExamplesTest.kt index c3247702ec..2e814afe87 100644 --- a/http/http_client_java/src/test/kotlin/com/hexagonkt/http/client/java/AdapterExamplesTest.kt +++ b/http/http_client_java/src/test/kotlin/com/hexagonkt/http/client/java/AdapterExamplesTest.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.client.java +package com.hexagontk.http.client.java -import com.hexagonkt.http.server.jetty.JettyServletAdapter -import com.hexagonkt.http.test.examples.* -import com.hexagonkt.serialization.jackson.JacksonTextFormat -import com.hexagonkt.serialization.jackson.json.Json -import com.hexagonkt.serialization.jackson.yaml.Yaml +import com.hexagontk.http.server.jetty.JettyServletAdapter +import com.hexagontk.http.test.examples.* +import com.hexagontk.serialization.jackson.JacksonTextFormat +import com.hexagontk.serialization.jackson.json.Json +import com.hexagontk.serialization.jackson.yaml.Yaml val clientAdapter: () -> JavaClientAdapter = ::JavaClientAdapter val serverAdapter: () -> JettyServletAdapter = ::JettyServletAdapter diff --git a/http/http_client_java/src/test/kotlin/com/hexagonkt/http/client/java/JavaClientAdapterTest.kt b/http/http_client_java/src/test/kotlin/com/hexagonkt/http/client/java/JavaClientAdapterTest.kt index 0dea716431..3c53307751 100644 --- a/http/http_client_java/src/test/kotlin/com/hexagonkt/http/client/java/JavaClientAdapterTest.kt +++ b/http/http_client_java/src/test/kotlin/com/hexagonkt/http/client/java/JavaClientAdapterTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.client.java +package com.hexagontk.http.client.java -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.model.HttpRequest +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.model.HttpRequest import org.junit.jupiter.api.Test import kotlin.IllegalStateException import kotlin.test.assertEquals diff --git a/http/http_client_jetty/README.md b/http/http_client_jetty/README.md index b47782be54..003fb06df8 100644 --- a/http/http_client_jetty/README.md +++ b/http/http_client_jetty/README.md @@ -14,18 +14,18 @@ mavenCentral() } - implementation("com.hexagonkt:http_client_jetty:$hexagonVersion") + implementation("com.hexagontk:http_client_jetty:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk http_client_jetty $hexagonVersion ``` -# Package com.hexagonkt.http.client.jetty +# Package com.hexagontk.http.client.jetty Jetty HTTP client implementation classes. diff --git a/http/http_client_jetty/api/http_client_jetty.api b/http/http_client_jetty/api/http_client_jetty.api index dd6115d01d..e4020568d5 100644 --- a/http/http_client_jetty/api/http_client_jetty.api +++ b/http/http_client_jetty/api/http_client_jetty.api @@ -1,16 +1,16 @@ -public class com/hexagonkt/http/client/jetty/JettyClientAdapter : com/hexagonkt/http/client/HttpClientPort { - protected field httpClient Lcom/hexagonkt/http/client/HttpClient; +public class com/hexagontk/http/client/jetty/JettyClientAdapter : com/hexagontk/http/client/HttpClientPort { + protected field httpClient Lcom/hexagontk/http/client/HttpClient; protected field jettyClient Lorg/eclipse/jetty/client/HttpClient; public fun ()V - protected final fun getHttpClient ()Lcom/hexagonkt/http/client/HttpClient; + protected final fun getHttpClient ()Lcom/hexagontk/http/client/HttpClient; protected final fun getJettyClient ()Lorg/eclipse/jetty/client/HttpClient; - public fun send (Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/model/HttpResponsePort; - protected final fun setHttpClient (Lcom/hexagonkt/http/client/HttpClient;)V + public fun send (Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/model/HttpResponsePort; + protected final fun setHttpClient (Lcom/hexagontk/http/client/HttpClient;)V protected final fun setJettyClient (Lorg/eclipse/jetty/client/HttpClient;)V public fun shutDown ()V - public fun sse (Lcom/hexagonkt/http/model/HttpRequestPort;)Ljava/util/concurrent/Flow$Publisher; - public fun startUp (Lcom/hexagonkt/http/client/HttpClient;)V + public fun sse (Lcom/hexagontk/http/model/HttpRequestPort;)Ljava/util/concurrent/Flow$Publisher; + public fun startUp (Lcom/hexagontk/http/client/HttpClient;)V public fun started ()Z - public fun ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagonkt/http/model/ws/WsSession; + public fun ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagontk/http/model/ws/WsSession; } diff --git a/http/http_client_jetty/src/main/kotlin/com/hexagonkt/http/client/jetty/JettyClientAdapter.kt b/http/http_client_jetty/src/main/kotlin/com/hexagonkt/http/client/jetty/JettyClientAdapter.kt index 894a971997..c548c26711 100644 --- a/http/http_client_jetty/src/main/kotlin/com/hexagonkt/http/client/jetty/JettyClientAdapter.kt +++ b/http/http_client_jetty/src/main/kotlin/com/hexagonkt/http/client/jetty/JettyClientAdapter.kt @@ -1,17 +1,17 @@ -package com.hexagonkt.http.client.jetty - -import com.hexagonkt.core.media.TEXT_EVENT_STREAM -import com.hexagonkt.core.security.loadKeyStore -import com.hexagonkt.http.handlers.bodyToBytes -import com.hexagonkt.http.CHECKED_HEADERS -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.model.HttpResponse -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.CookieSameSite.* -import com.hexagonkt.http.model.ws.WsSession -import com.hexagonkt.http.parseContentType +package com.hexagontk.http.client.jetty + +import com.hexagontk.core.media.TEXT_EVENT_STREAM +import com.hexagontk.core.security.loadKeyStore +import com.hexagontk.http.handlers.bodyToBytes +import com.hexagontk.http.CHECKED_HEADERS +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.model.HttpResponse +import com.hexagontk.http.model.* +import com.hexagontk.http.model.CookieSameSite.* +import com.hexagontk.http.model.ws.WsSession +import com.hexagontk.http.parseContentType import org.eclipse.jetty.client.HttpResponseException import org.eclipse.jetty.client.ContentResponse import org.eclipse.jetty.client.Request diff --git a/http/http_client_jetty/src/main/kotlin/module-info.java b/http/http_client_jetty/src/main/kotlin/module-info.java index 04b83b04c3..75b4ad4d6a 100644 --- a/http/http_client_jetty/src/main/kotlin/module-info.java +++ b/http/http_client_jetty/src/main/kotlin/module-info.java @@ -1,13 +1,13 @@ -module com.hexagonkt.http_client_jetty { +module com.hexagontk.http_client_jetty { - requires transitive com.hexagonkt.http; - requires transitive com.hexagonkt.http_client; + requires transitive com.hexagontk.http; + requires transitive com.hexagontk.http_client; requires transitive org.eclipse.jetty.io; requires transitive org.eclipse.jetty.util; requires transitive org.eclipse.jetty.client; requires transitive org.eclipse.jetty.http2.client; requires transitive org.eclipse.jetty.http2.client.transport; - exports com.hexagonkt.http.client.jetty; + exports com.hexagontk.http.client.jetty; } diff --git a/http/http_client_jetty/src/test/kotlin/com/hexagonkt/http/client/jetty/JettyClientAdapterTest.kt b/http/http_client_jetty/src/test/kotlin/com/hexagonkt/http/client/jetty/JettyClientAdapterTest.kt index 251c18d0e2..f1edddcaad 100644 --- a/http/http_client_jetty/src/test/kotlin/com/hexagonkt/http/client/jetty/JettyClientAdapterTest.kt +++ b/http/http_client_jetty/src/test/kotlin/com/hexagonkt/http/client/jetty/JettyClientAdapterTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.client.jetty +package com.hexagontk.http.client.jetty -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.model.HttpRequest +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.model.HttpRequest import org.junit.jupiter.api.Test import kotlin.IllegalStateException import kotlin.test.assertEquals diff --git a/http/http_client_jetty_ws/README.md b/http/http_client_jetty_ws/README.md index 2232818051..09c658db04 100644 --- a/http/http_client_jetty_ws/README.md +++ b/http/http_client_jetty_ws/README.md @@ -18,18 +18,18 @@ mavenCentral() } - implementation("com.hexagonkt:http_client_jetty_ws:$hexagonVersion") + implementation("com.hexagontk:http_client_jetty_ws:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk http_client_jetty_ws $hexagonVersion ``` -# Package com.hexagonkt.http.client.jetty +# Package com.hexagontk.http.client.jetty Jetty HTTP client implementation classes. diff --git a/http/http_client_jetty_ws/api/http_client_jetty_ws.api b/http/http_client_jetty_ws/api/http_client_jetty_ws.api index be706d6e3a..d026870037 100644 --- a/http/http_client_jetty_ws/api/http_client_jetty_ws.api +++ b/http/http_client_jetty_ws/api/http_client_jetty_ws.api @@ -1,10 +1,10 @@ -public final class com/hexagonkt/http/client/jetty/ws/JettyClientWsSession : com/hexagonkt/http/model/ws/WsSession { +public final class com/hexagontk/http/client/jetty/ws/JettyClientWsSession : com/hexagontk/http/model/ws/WsSession { public fun (Ljava/net/URI;Lorg/eclipse/jetty/websocket/api/Session;)V public fun close (ILjava/lang/String;)V public fun getAttributes ()Ljava/util/Map; public fun getException ()Ljava/lang/Exception; public fun getPathParameters ()Ljava/util/Map; - public fun getRequest ()Lcom/hexagonkt/http/model/HttpRequestPort; + public fun getRequest ()Lcom/hexagontk/http/model/HttpRequestPort; public fun getUri ()Ljava/net/URI; public fun ping ([B)V public fun pong ([B)V @@ -12,7 +12,7 @@ public final class com/hexagonkt/http/client/jetty/ws/JettyClientWsSession : com public fun send ([B)V } -public final class com/hexagonkt/http/client/jetty/ws/JettyWebSocketAdapter { +public final class com/hexagontk/http/client/jetty/ws/JettyWebSocketAdapter { public fun (Ljava/net/URI;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)V public final fun onWebSocketBinary (Lorg/eclipse/jetty/websocket/api/Session;Ljava/nio/ByteBuffer;Lorg/eclipse/jetty/websocket/api/Callback;)V public final fun onWebSocketClose (Lorg/eclipse/jetty/websocket/api/Session;ILjava/lang/String;)V @@ -20,10 +20,10 @@ public final class com/hexagonkt/http/client/jetty/ws/JettyWebSocketAdapter { public final fun onWebSocketText (Lorg/eclipse/jetty/websocket/api/Session;Ljava/lang/String;)V } -public final class com/hexagonkt/http/client/jetty/ws/JettyWsClientAdapter : com/hexagonkt/http/client/jetty/JettyClientAdapter { +public final class com/hexagontk/http/client/jetty/ws/JettyWsClientAdapter : com/hexagontk/http/client/jetty/JettyClientAdapter { public fun ()V public fun shutDown ()V - public fun startUp (Lcom/hexagonkt/http/client/HttpClient;)V - public fun ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagonkt/http/model/ws/WsSession; + public fun startUp (Lcom/hexagontk/http/client/HttpClient;)V + public fun ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagontk/http/model/ws/WsSession; } diff --git a/http/http_client_jetty_ws/src/main/kotlin/com/hexagonkt/http/client/jetty/ws/JettyClientWsSession.kt b/http/http_client_jetty_ws/src/main/kotlin/com/hexagonkt/http/client/jetty/ws/JettyClientWsSession.kt index 1b052f197a..6a656f347f 100644 --- a/http/http_client_jetty_ws/src/main/kotlin/com/hexagonkt/http/client/jetty/ws/JettyClientWsSession.kt +++ b/http/http_client_jetty_ws/src/main/kotlin/com/hexagonkt/http/client/jetty/ws/JettyClientWsSession.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.client.jetty.ws +package com.hexagontk.http.client.jetty.ws -import com.hexagonkt.http.model.HttpRequestPort -import com.hexagonkt.http.model.ws.WsSession +import com.hexagontk.http.model.HttpRequestPort +import com.hexagontk.http.model.ws.WsSession import org.eclipse.jetty.websocket.api.Callback.NOOP import org.eclipse.jetty.websocket.api.Session import java.net.URI diff --git a/http/http_client_jetty_ws/src/main/kotlin/com/hexagonkt/http/client/jetty/ws/JettyWebSocketAdapter.kt b/http/http_client_jetty_ws/src/main/kotlin/com/hexagonkt/http/client/jetty/ws/JettyWebSocketAdapter.kt index b31db55af5..c2faa160a6 100644 --- a/http/http_client_jetty_ws/src/main/kotlin/com/hexagonkt/http/client/jetty/ws/JettyWebSocketAdapter.kt +++ b/http/http_client_jetty_ws/src/main/kotlin/com/hexagonkt/http/client/jetty/ws/JettyWebSocketAdapter.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.client.jetty.ws +package com.hexagontk.http.client.jetty.ws -import com.hexagonkt.http.model.ws.WsSession +import com.hexagontk.http.model.ws.WsSession import org.eclipse.jetty.websocket.api.Callback import org.eclipse.jetty.websocket.api.Session import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose diff --git a/http/http_client_jetty_ws/src/main/kotlin/com/hexagonkt/http/client/jetty/ws/JettyWsClientAdapter.kt b/http/http_client_jetty_ws/src/main/kotlin/com/hexagonkt/http/client/jetty/ws/JettyWsClientAdapter.kt index 4f3f5da25b..78ac3d79df 100644 --- a/http/http_client_jetty_ws/src/main/kotlin/com/hexagonkt/http/client/jetty/ws/JettyWsClientAdapter.kt +++ b/http/http_client_jetty_ws/src/main/kotlin/com/hexagonkt/http/client/jetty/ws/JettyWsClientAdapter.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.http.client.jetty.ws +package com.hexagontk.http.client.jetty.ws -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.jetty.JettyClientAdapter -import com.hexagonkt.http.model.ws.WsSession +import com.hexagontk.core.urlOf +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.jetty.JettyClientAdapter +import com.hexagontk.http.model.ws.WsSession import org.eclipse.jetty.websocket.client.WebSocketClient import java.net.URI diff --git a/http/http_client_jetty_ws/src/main/kotlin/module-info.java b/http/http_client_jetty_ws/src/main/kotlin/module-info.java index 472128a575..5631105840 100644 --- a/http/http_client_jetty_ws/src/main/kotlin/module-info.java +++ b/http/http_client_jetty_ws/src/main/kotlin/module-info.java @@ -1,9 +1,9 @@ -module com.hexagonkt.http_client_jetty_ws { +module com.hexagontk.http_client_jetty_ws { requires transitive kotlin.stdlib; - requires transitive com.hexagonkt.http_client_jetty; - requires transitive com.hexagonkt.core; + requires transitive com.hexagontk.http_client_jetty; + requires transitive com.hexagontk.core; requires transitive org.eclipse.jetty.io; requires transitive org.eclipse.jetty.util; requires transitive org.eclipse.jetty.client; @@ -12,5 +12,5 @@ requires transitive org.eclipse.jetty.websocket.api; requires transitive org.eclipse.jetty.websocket.client; - exports com.hexagonkt.http.client.jetty.ws; + exports com.hexagontk.http.client.jetty.ws; } diff --git a/http/http_client_jetty_ws/src/test/kotlin/com/hexagonkt/http/client/jetty/ws/JettyClientAdapterTest.kt b/http/http_client_jetty_ws/src/test/kotlin/com/hexagonkt/http/client/jetty/ws/JettyClientAdapterTest.kt index 8d2af02ffb..6bc3cd6586 100644 --- a/http/http_client_jetty_ws/src/test/kotlin/com/hexagonkt/http/client/jetty/ws/JettyClientAdapterTest.kt +++ b/http/http_client_jetty_ws/src/test/kotlin/com/hexagonkt/http/client/jetty/ws/JettyClientAdapterTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.client.jetty.ws +package com.hexagontk.http.client.jetty.ws -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.model.HttpRequest +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.model.HttpRequest import org.junit.jupiter.api.Test import kotlin.IllegalStateException import kotlin.test.assertEquals diff --git a/http/http_handlers/README.md b/http/http_handlers/README.md index aa6c44ebad..a985e92bb9 100644 --- a/http/http_handlers/README.md +++ b/http/http_handlers/README.md @@ -75,12 +75,12 @@ To create a server, you need to provide a handler (check the [handlers section] information), and after creating a server you can run it or stop it with [start()] and [stop()] methods. -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?serverCreation +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?serverCreation -[server settings]: /api/http/http_server/com.hexagonkt.http.server/-http-server-settings +[server settings]: /api/http/http_server/com.hexagontk.http.server/-http-server-settings [handlers section]: /http_server/#handlers -[start()]: /api/http/http_server/com.hexagonkt.http.server/-http-server -[stop()]: /api/http/http_server/com.hexagonkt.http.server/-http-server +[start()]: /api/http/http_server/com.hexagontk.http.server/-http-server +[stop()]: /api/http/http_server/com.hexagontk.http.server/-http-server ## Servlet Web server There is a special server adapter for running inside Servlet Containers. To use it you should import @@ -101,9 +101,9 @@ attributes among handlers. The methods are available directly from the callback. You can check the [API documentation] for the full list of methods. This sample code illustrates the usage: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackCall +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackCall -[API documentation]: /api/http/http_handlers/com.hexagonkt.http.handlers/-http-context +[API documentation]: /api/http/http_handlers/com.hexagontk.http.handlers/-http-context # Handlers The main building blocks of Hexagon HTTP services are a set of handlers. A handler is made up of two @@ -137,9 +137,9 @@ H1 (after) Check the next snippet for Handlers usage examples: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?routesCreation +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?routesCreation -[next]: /api/http/http_handlers/com.hexagonkt.http.handlers/-http-context +[next]: /api/http/http_handlers/com.hexagontk.http.handlers/-http-context @@ -157,7 +157,7 @@ the following fields: It yields true if all the supplied fields matches a call context. -[HttpPredicate]: /api/http/http_handlers/com.hexagonkt.http.handlers/-http-predicate +[HttpPredicate]: /api/http/http_handlers/com.hexagontk.http.handlers/-http-predicate ## Path Patterns Patterns to match requests paths. They can have: @@ -188,19 +188,19 @@ that pattern. The following code details filters usage: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?filters +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?filters ## Path Handlers Handlers can be grouped by calling the `path()` method, which takes a String prefix and gives you a scope to declare other handlers. Ie: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?routeGroups +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?routeGroups If you have a lot of routes, it can be helpful to group them into Path Handlers. You can create path handlers to mount a group of routes in different paths (allowing you to reuse them). Check this snippet: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?routers +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?routers # Handler Callbacks Callbacks are request's handling blocks that are bound to handlers. They make the request and @@ -212,7 +212,7 @@ Callbacks results are the input for the next handler's callbacks in the pipeline ## Request Request functionality is provided by the `request` field: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackRequest +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackRequest ## Path Parameters Route patterns can include named parameters, accessible via the `pathParameters` map on the request @@ -220,37 +220,37 @@ object: Path parameters can be accessed by name or by index. -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackPathParam +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackPathParam ## Query Parameters It is possible to access the whole query string or only a specific query parameter using the `parameters` map on the `request` object: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackQueryParam +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackQueryParam ## Form Parameters HTML Form processing. Don't parse body! -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackFormParam +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackFormParam ## File Uploads Multipart Requests -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/MultipartSamplesTest.kt?callbackFile +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/MultipartSamplesTest.kt?callbackFile ## Response Response information is provided by the `response` field: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackResponse +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackResponse To send error responses: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackHalt +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackHalt ## Redirects You can redirect requests (returning 30x codes) by using `Call` utility methods: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackRedirect +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackRedirect ## Cookies The request and response cookie functions provide a convenient way for sharing information between @@ -261,7 +261,7 @@ add new ones you have to use `response.addCookie()` and `response.removeCookie() Check the following sample code for details: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackCookie +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackCookie @@ -272,13 +272,13 @@ handlers returning error codes. ## HTTP Errors Handlers Allow handling responses that returned an HTTP error code. Example: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?errors +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?errors ## Exception Mapping You can handle previously thrown exceptions of a given type (or subtype). The handler allows you to refer to the thrown exception. Look at the following code for a detailed example: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?exceptions +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?exceptions # Static Files You can use a [FileCallback] or a [UrlCallback] to route requests to files or classpath resources. @@ -288,21 +288,21 @@ have a parameter to provide the file to be fetched inside the folder. Check the next example for details: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?files +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?files ## Media Types The media types of static files are computed from the file extension using the utility methods of -the [com.hexagonkt.core.media] package. +the [com.hexagontk.core.media] package. -[com.hexagonkt.core.media]: /api/core/com.hexagonkt.core.media +[com.hexagontk.core.media]: /api/core/com.hexagontk.core.media # CORS CORS behaviour can be different depending on the path. You can attach different [CORS Callbacks] to different handlers. Check the [CorsCallback][CORS Callbacks] class for more details. -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CorsTest.kt?cors +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/CorsTest.kt?cors -[CORS Callbacks]: /api/http/http_server/com.hexagonkt.http.server.callbacks/-cors-callback +[CORS Callbacks]: /api/http/http_server/com.hexagontk.http.server.callbacks/-cors-callback # HTTPS It is possible to start a secure server enabling HTTPS. For this, you have to provide a server @@ -325,16 +325,16 @@ client used to connect (assuming it is valid, if not the connection will end wit Below you can find a simple example to set up an HTTPS server and client with mutual TLS: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt?https +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/HttpsTest.kt?https -[SslSettings]: /api/http/http/com.hexagonkt.http/-ssl-settings +[SslSettings]: /api/http/http/com.hexagontk.http/-ssl-settings [HTTP/2]: https://en.wikipedia.org/wiki/HTTP/2 [ALPN]: https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation [Gradle]: https://gradle.org [create sample certificates]: /gradle/#certificates [mutual TLS]: https://en.wikipedia.org/wiki/Mutual_authentication -[SslSettings.clientAuth]: /api/http/http/com.hexagonkt.http/-ssl-settings -[Request.certificateChain]: /api/http/http/com.hexagonkt.http.model/-http-request +[SslSettings.clientAuth]: /api/http/http/com.hexagontk.http/-ssl-settings +[Request.certificateChain]: /api/http/http/com.hexagontk.http.model/-http-request # WebSockets A Web Socket is an HTTP(S) connection made with the GET method and the `upgrade: websocket` and @@ -357,14 +357,14 @@ Sessions connected to the same WS endpoint can be stored to broadcast messages. Ping and pong allows to maintain connection opened. -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/WebSocketsTest.kt?ws_server +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/WebSocketsTest.kt?ws_server # Compression Gzip encoding is supported on the Hexagon Toolkit, however, its implementation depends on the used adapter. To turn on Gzip encoding, you need to enable that feature on the server settings. Check the code below for an example: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ZipTest.kt?zip +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ZipTest.kt?zip # Testing @@ -372,7 +372,7 @@ code below for an example: To test HTTP servers from outside using a real Adapter, you can create a server setting `0` as port. This will pick a random free port which you can check later: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?test +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?test To do this kind of tests without creating a custom server (using the real production code). Check the [tests of the starter projects]. @@ -386,23 +386,23 @@ relying on mocking libraries. For a quick example, check the snipped below: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?mockRequest +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?mockRequest -# Package com.hexagonkt.http.server +# Package com.hexagontk.http.server This package defines server interfaces for HTTP server adapters. -# Package com.hexagonkt.http.server.callbacks +# Package com.hexagontk.http.server.callbacks Utility callbacks that can be used on handlers. Reuse a callback in different handlers (after, filter, etc.). -# Package com.hexagonkt.http.server.handlers +# Package com.hexagontk.http.server.handlers Contains the HTTP handlers implementation (on top of Core's general event handlers). It houses the HTTP handlers (AfterHandler, OnHandler, PathHandler and FilterHandler) and the HTTP predicate. -# Package com.hexagonkt.http.server.model +# Package com.hexagontk.http.server.model Classes to model server HTTP messages (requests and responses). Built on top of the [http] module. -# Package com.hexagonkt.http.model.ws +# Package com.hexagontk.http.model.ws Classes to model server HTTP messages (requests and responses). Built on top of the [http] module. [http]: /http diff --git a/http/http_handlers/api/http_handlers.api b/http/http_handlers/api/http_handlers.api index 0f9c7a923b..4b30ab169b 100644 --- a/http/http_handlers/api/http_handlers.api +++ b/http/http_handlers/api/http_handlers.api @@ -1,243 +1,243 @@ -public final class com/hexagonkt/http/handlers/AfterHandler : com/hexagonkt/handlers/Handler, com/hexagonkt/http/handlers/HttpHandler { - public fun (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun (Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V +public final class com/hexagontk/http/handlers/AfterHandler : com/hexagontk/handlers/Handler, com/hexagontk/http/handlers/HttpHandler { + public fun (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/handlers/HttpHandler; public fun byMethod ()Ljava/util/Map; - public final fun component1 ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public final fun component1 ()Lcom/hexagontk/http/handlers/HttpPredicate; public final fun component2 ()Lkotlin/jvm/functions/Function1; - public final fun copy (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/AfterHandler; - public static synthetic fun copy$default (Lcom/hexagonkt/http/handlers/AfterHandler;Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/AfterHandler; + public final fun copy (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/AfterHandler; + public static synthetic fun copy$default (Lcom/hexagontk/http/handlers/AfterHandler;Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/AfterHandler; public fun equals (Ljava/lang/Object;)Z - public fun filter (Lcom/hexagonkt/http/model/HttpMethod;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun filter (Lcom/hexagontk/http/model/HttpMethod;)Lcom/hexagontk/http/handlers/HttpHandler; public final fun getBlock ()Lkotlin/jvm/functions/Function1; public fun getCallback ()Lkotlin/jvm/functions/Function1; - public fun getHandlerPredicate ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public fun getHandlerPredicate ()Lcom/hexagontk/http/handlers/HttpPredicate; public fun getPredicate ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; - public fun process (Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/handlers/HttpContext; - public fun processHttp (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; + public fun process (Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/handlers/HttpContext; + public fun processHttp (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/handlers/BeforeHandler : com/hexagonkt/handlers/Handler, com/hexagonkt/http/handlers/HttpHandler { - public fun (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun (Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V +public final class com/hexagontk/http/handlers/BeforeHandler : com/hexagontk/handlers/Handler, com/hexagontk/http/handlers/HttpHandler { + public fun (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/handlers/HttpHandler; public fun byMethod ()Ljava/util/Map; - public final fun component1 ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public final fun component1 ()Lcom/hexagontk/http/handlers/HttpPredicate; public final fun component2 ()Lkotlin/jvm/functions/Function1; - public final fun copy (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/BeforeHandler; - public static synthetic fun copy$default (Lcom/hexagonkt/http/handlers/BeforeHandler;Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/BeforeHandler; + public final fun copy (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/BeforeHandler; + public static synthetic fun copy$default (Lcom/hexagontk/http/handlers/BeforeHandler;Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/BeforeHandler; public fun equals (Ljava/lang/Object;)Z - public fun filter (Lcom/hexagonkt/http/model/HttpMethod;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun filter (Lcom/hexagontk/http/model/HttpMethod;)Lcom/hexagontk/http/handlers/HttpHandler; public final fun getBlock ()Lkotlin/jvm/functions/Function1; public fun getCallback ()Lkotlin/jvm/functions/Function1; - public fun getHandlerPredicate ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public fun getHandlerPredicate ()Lcom/hexagontk/http/handlers/HttpPredicate; public fun getPredicate ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; - public fun process (Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/handlers/HttpContext; - public fun processHttp (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; + public fun process (Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/handlers/HttpContext; + public fun processHttp (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/handlers/ExceptionHandler : com/hexagonkt/handlers/Handler, com/hexagonkt/http/handlers/HttpHandler { +public final class com/hexagontk/http/handlers/ExceptionHandler : com/hexagontk/handlers/Handler, com/hexagontk/http/handlers/HttpHandler { public fun (Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;)V public synthetic fun (Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/handlers/HttpHandler; public fun byMethod ()Ljava/util/Map; public final fun component1 ()Lkotlin/reflect/KClass; public final fun component2 ()Z public final fun component3 ()Lkotlin/jvm/functions/Function2; - public final fun copy (Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;)Lcom/hexagonkt/http/handlers/ExceptionHandler; - public static synthetic fun copy$default (Lcom/hexagonkt/http/handlers/ExceptionHandler;Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/ExceptionHandler; + public final fun copy (Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;)Lcom/hexagontk/http/handlers/ExceptionHandler; + public static synthetic fun copy$default (Lcom/hexagontk/http/handlers/ExceptionHandler;Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/ExceptionHandler; public fun equals (Ljava/lang/Object;)Z - public fun filter (Lcom/hexagonkt/http/model/HttpMethod;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun filter (Lcom/hexagontk/http/model/HttpMethod;)Lcom/hexagontk/http/handlers/HttpHandler; public final fun getBlock ()Lkotlin/jvm/functions/Function2; public fun getCallback ()Lkotlin/jvm/functions/Function1; public final fun getClear ()Z public final fun getException ()Lkotlin/reflect/KClass; - public fun getHandlerPredicate ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public fun getHandlerPredicate ()Lcom/hexagontk/http/handlers/HttpPredicate; public fun getPredicate ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; - public fun process (Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/handlers/HttpContext; - public fun processHttp (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; + public fun process (Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/handlers/HttpContext; + public fun processHttp (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/handlers/FilterHandler : com/hexagonkt/handlers/Handler, com/hexagonkt/http/handlers/HttpHandler { - public fun (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun (Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V +public final class com/hexagontk/http/handlers/FilterHandler : com/hexagontk/handlers/Handler, com/hexagontk/http/handlers/HttpHandler { + public fun (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/handlers/HttpHandler; public fun byMethod ()Ljava/util/Map; - public final fun component1 ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public final fun component1 ()Lcom/hexagontk/http/handlers/HttpPredicate; public final fun component2 ()Lkotlin/jvm/functions/Function1; - public final fun copy (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/FilterHandler; - public static synthetic fun copy$default (Lcom/hexagonkt/http/handlers/FilterHandler;Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/FilterHandler; + public final fun copy (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/FilterHandler; + public static synthetic fun copy$default (Lcom/hexagontk/http/handlers/FilterHandler;Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/FilterHandler; public fun equals (Ljava/lang/Object;)Z - public fun filter (Lcom/hexagonkt/http/model/HttpMethod;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun filter (Lcom/hexagontk/http/model/HttpMethod;)Lcom/hexagontk/http/handlers/HttpHandler; public final fun getBlock ()Lkotlin/jvm/functions/Function1; public fun getCallback ()Lkotlin/jvm/functions/Function1; - public fun getHandlerPredicate ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public fun getHandlerPredicate ()Lcom/hexagontk/http/handlers/HttpPredicate; public fun getPredicate ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; - public fun process (Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/handlers/HttpContext; - public fun processHttp (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; + public fun process (Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/handlers/HttpContext; + public fun processHttp (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/handlers/HandlerBuilder { +public final class com/hexagontk/http/handlers/HandlerBuilder { public fun ()V public fun (Ljava/util/List;)V public synthetic fun (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun after (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V - public final fun after (Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V + public final fun after (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V + public final fun after (Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V public final fun after (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public final fun after (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun after$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static synthetic fun after$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static synthetic fun after$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public final fun before (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V - public final fun before (Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V + public final fun after (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V + public static synthetic fun after$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun after$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun after$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public final fun before (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V + public final fun before (Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V public final fun before (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public final fun before (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun before$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static synthetic fun before$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static synthetic fun before$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public final fun before (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V + public static synthetic fun before$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun before$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun before$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V public final fun delete (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun delete$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun delete$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V public final fun exception (Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;)V - public static synthetic fun exception$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V - public final fun filter (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V - public final fun filter (Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V + public static synthetic fun exception$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Lkotlin/reflect/KClass;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V + public final fun filter (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V + public final fun filter (Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V public final fun filter (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public final fun filter (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun filter$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static synthetic fun filter$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static synthetic fun filter$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public final fun filter (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V + public static synthetic fun filter$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun filter$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun filter$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V public final fun get (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun get$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun get$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V public final fun getHandlers ()Ljava/util/List; - public final fun handler (Ljava/lang/String;)Lcom/hexagonkt/http/handlers/HttpHandler; - public static synthetic fun handler$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/lang/String;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpHandler; + public final fun handler (Ljava/lang/String;)Lcom/hexagontk/http/handlers/HttpHandler; + public static synthetic fun handler$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/lang/String;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpHandler; public final fun head (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun head$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public final fun on (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V - public final fun on (Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V + public static synthetic fun head$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public final fun on (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V + public final fun on (Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V public final fun on (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public final fun on (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun on$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static synthetic fun on$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static synthetic fun on$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public final fun on (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V + public static synthetic fun on$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun on$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun on$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V public final fun options (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun options$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun options$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V public final fun patch (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun patch$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public final fun path (Ljava/lang/String;Lcom/hexagonkt/http/handlers/PathHandler;)V + public static synthetic fun patch$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public final fun path (Ljava/lang/String;Lcom/hexagontk/http/handlers/PathHandler;)V public final fun path (Ljava/lang/String;Ljava/util/List;)V public final fun path (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public final fun path (Ljava/lang/String;[Lcom/hexagonkt/http/handlers/HttpHandler;)V + public final fun path (Ljava/lang/String;[Lcom/hexagontk/http/handlers/HttpHandler;)V public final fun post (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun post$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun post$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V public final fun put (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun put$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun put$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V public final fun setHandlers (Ljava/util/List;)V public final fun trace (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun trace$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public final fun use (Lcom/hexagonkt/http/handlers/HttpHandler;)V + public static synthetic fun trace$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public final fun use (Lcom/hexagontk/http/handlers/HttpHandler;)V public final fun ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun ws$default (Lcom/hexagonkt/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun ws$default (Lcom/hexagontk/http/handlers/HandlerBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V } -public final class com/hexagonkt/http/handlers/HandlersKt { - public static final fun Delete (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/OnHandler; - public static synthetic fun Delete$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/OnHandler; - public static final fun Get (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/OnHandler; - public static synthetic fun Get$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/OnHandler; - public static final fun Head (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/OnHandler; - public static synthetic fun Head$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/OnHandler; - public static final fun Options (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/OnHandler; - public static synthetic fun Options$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/OnHandler; - public static final fun Patch (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/OnHandler; - public static synthetic fun Patch$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/OnHandler; - public static final fun Post (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/OnHandler; - public static synthetic fun Post$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/OnHandler; - public static final fun Put (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/OnHandler; - public static synthetic fun Put$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/OnHandler; - public static final fun Trace (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/OnHandler; - public static synthetic fun Trace$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/OnHandler; - public static final fun Ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/OnHandler; - public static synthetic fun Ws$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/OnHandler; +public final class com/hexagontk/http/handlers/HandlersKt { + public static final fun Delete (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/OnHandler; + public static synthetic fun Delete$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/OnHandler; + public static final fun Get (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/OnHandler; + public static synthetic fun Get$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/OnHandler; + public static final fun Head (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/OnHandler; + public static synthetic fun Head$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/OnHandler; + public static final fun Options (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/OnHandler; + public static synthetic fun Options$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/OnHandler; + public static final fun Patch (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/OnHandler; + public static synthetic fun Patch$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/OnHandler; + public static final fun Post (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/OnHandler; + public static synthetic fun Post$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/OnHandler; + public static final fun Put (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/OnHandler; + public static synthetic fun Put$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/OnHandler; + public static final fun Trace (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/OnHandler; + public static synthetic fun Trace$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/OnHandler; + public static final fun Ws (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/OnHandler; + public static synthetic fun Ws$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/OnHandler; public static final fun bodyToBytes (Ljava/lang/Object;)[B - public static final fun path (Ljava/lang/String;Ljava/util/List;)Lcom/hexagonkt/http/handlers/PathHandler; - public static final fun path (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/PathHandler; - public static synthetic fun path$default (Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/PathHandler; - public static synthetic fun path$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/PathHandler; - public static final fun process (Lkotlin/jvm/functions/Function1;Lcom/hexagonkt/http/model/HttpMethod;Lcom/hexagonkt/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagonkt/http/model/QueryParameters;Lcom/hexagonkt/http/model/Headers;Ljava/lang/Object;Ljava/util/List;Lcom/hexagonkt/http/model/FormParameters;Ljava/util/List;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/List;JLjava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static final fun process (Lkotlin/jvm/functions/Function1;Lcom/hexagonkt/http/model/HttpRequest;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun process$default (Lkotlin/jvm/functions/Function1;Lcom/hexagonkt/http/model/HttpMethod;Lcom/hexagonkt/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagonkt/http/model/QueryParameters;Lcom/hexagonkt/http/model/Headers;Ljava/lang/Object;Ljava/util/List;Lcom/hexagonkt/http/model/FormParameters;Ljava/util/List;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/List;JLjava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun process$default (Lkotlin/jvm/functions/Function1;Lcom/hexagonkt/http/model/HttpRequest;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; + public static final fun path (Ljava/lang/String;Ljava/util/List;)Lcom/hexagontk/http/handlers/PathHandler; + public static final fun path (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/PathHandler; + public static synthetic fun path$default (Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/PathHandler; + public static synthetic fun path$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/PathHandler; + public static final fun process (Lkotlin/jvm/functions/Function1;Lcom/hexagontk/http/model/HttpMethod;Lcom/hexagontk/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagontk/http/model/QueryParameters;Lcom/hexagontk/http/model/Headers;Ljava/lang/Object;Ljava/util/List;Lcom/hexagontk/http/model/FormParameters;Ljava/util/List;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/List;JLjava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static final fun process (Lkotlin/jvm/functions/Function1;Lcom/hexagontk/http/model/HttpRequest;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun process$default (Lkotlin/jvm/functions/Function1;Lcom/hexagontk/http/model/HttpMethod;Lcom/hexagontk/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagontk/http/model/QueryParameters;Lcom/hexagontk/http/model/Headers;Ljava/lang/Object;Ljava/util/List;Lcom/hexagontk/http/model/FormParameters;Ljava/util/List;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/List;JLjava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun process$default (Lkotlin/jvm/functions/Function1;Lcom/hexagontk/http/model/HttpRequest;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; } -public abstract interface class com/hexagonkt/http/handlers/HttpCallback : kotlin/jvm/functions/Function1 { +public abstract interface class com/hexagontk/http/handlers/HttpCallback : kotlin/jvm/functions/Function1 { } -public final class com/hexagonkt/http/handlers/HttpContext : com/hexagonkt/handlers/Context { - public fun (Lcom/hexagonkt/handlers/Context;)V - public fun (Lcom/hexagonkt/http/model/HttpCall;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;Z)V - public synthetic fun (Lcom/hexagonkt/http/model/HttpCall;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/HttpResponsePort;Lcom/hexagonkt/http/handlers/HttpPredicate;Ljava/util/Map;)V - public synthetic fun (Lcom/hexagonkt/http/model/HttpRequestPort;Lcom/hexagonkt/http/model/HttpResponsePort;Lcom/hexagonkt/http/handlers/HttpPredicate;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun accepted (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun accepted$default (Lcom/hexagonkt/http/handlers/HttpContext;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun badRequest (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun badRequest$default (Lcom/hexagonkt/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun component1 ()Lcom/hexagonkt/http/model/HttpCall; +public final class com/hexagontk/http/handlers/HttpContext : com/hexagontk/handlers/Context { + public fun (Lcom/hexagontk/handlers/Context;)V + public fun (Lcom/hexagontk/http/model/HttpCall;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;Z)V + public synthetic fun (Lcom/hexagontk/http/model/HttpCall;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/HttpResponsePort;Lcom/hexagontk/http/handlers/HttpPredicate;Ljava/util/Map;)V + public synthetic fun (Lcom/hexagontk/http/model/HttpRequestPort;Lcom/hexagontk/http/model/HttpResponsePort;Lcom/hexagontk/http/handlers/HttpPredicate;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun accepted (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun accepted$default (Lcom/hexagontk/http/handlers/HttpContext;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun badRequest (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun badRequest$default (Lcom/hexagontk/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun component1 ()Lcom/hexagontk/http/model/HttpCall; public final fun component2 ()Lkotlin/jvm/functions/Function1; public final fun component3 ()Ljava/util/List; public final fun component4 ()I public final fun component5 ()Ljava/lang/Exception; public final fun component6 ()Ljava/util/Map; public final fun component7 ()Z - public final fun copy (Lcom/hexagonkt/http/model/HttpCall;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;Z)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun copy$default (Lcom/hexagonkt/http/handlers/HttpContext;Lcom/hexagonkt/http/model/HttpCall;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;ZILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun created (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun created$default (Lcom/hexagonkt/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; + public final fun copy (Lcom/hexagontk/http/model/HttpCall;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;Z)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun copy$default (Lcom/hexagontk/http/handlers/HttpContext;Lcom/hexagontk/http/model/HttpCall;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;ZILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun created (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun created$default (Lcom/hexagontk/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; public fun equals (Ljava/lang/Object;)Z - public final fun forbidden (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun forbidden$default (Lcom/hexagonkt/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun found (Ljava/lang/String;Lcom/hexagonkt/http/model/Headers;Ljava/util/List;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun found$default (Lcom/hexagonkt/http/handlers/HttpContext;Ljava/lang/String;Lcom/hexagonkt/http/model/Headers;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; + public final fun forbidden (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun forbidden$default (Lcom/hexagontk/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun found (Ljava/lang/String;Lcom/hexagontk/http/model/Headers;Ljava/util/List;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun found$default (Lcom/hexagontk/http/handlers/HttpContext;Ljava/lang/String;Lcom/hexagontk/http/model/Headers;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; public final fun getAccept ()Ljava/util/List; public fun getAttributes ()Ljava/util/Map; - public final fun getAuthorization ()Lcom/hexagonkt/http/model/Authorization; + public final fun getAuthorization ()Lcom/hexagontk/http/model/Authorization; public final fun getCertificate ()Ljava/security/cert/X509Certificate; public final fun getCertificateChain ()Ljava/util/List; - public fun getEvent ()Lcom/hexagonkt/http/model/HttpCall; + public fun getEvent ()Lcom/hexagontk/http/model/HttpCall; public synthetic fun getEvent ()Ljava/lang/Object; public fun getException ()Ljava/lang/Exception; - public final fun getFormParameters ()Lcom/hexagonkt/http/model/FormParameters; + public final fun getFormParameters ()Lcom/hexagontk/http/model/FormParameters; public fun getHandled ()Z public final fun getHost ()Ljava/lang/String; - public final fun getMethod ()Lcom/hexagonkt/http/model/HttpMethod; + public final fun getMethod ()Lcom/hexagontk/http/model/HttpMethod; public fun getNextHandler ()I public fun getNextHandlers ()Ljava/util/List; public final fun getOrigin ()Ljava/lang/String; @@ -247,161 +247,161 @@ public final class com/hexagonkt/http/handlers/HttpContext : com/hexagonkt/handl public final fun getPathParameters ()Ljava/util/Map; public final fun getPort ()I public fun getPredicate ()Lkotlin/jvm/functions/Function1; - public final fun getProtocol ()Lcom/hexagonkt/http/model/HttpProtocol; - public final fun getQueryParameters ()Lcom/hexagonkt/http/model/QueryParameters; + public final fun getProtocol ()Lcom/hexagontk/http/model/HttpProtocol; + public final fun getQueryParameters ()Lcom/hexagontk/http/model/QueryParameters; public final fun getReferer ()Ljava/lang/String; - public final fun getRequest ()Lcom/hexagonkt/http/model/HttpRequestPort; - public final fun getResponse ()Lcom/hexagonkt/http/model/HttpResponsePort; - public final fun getStatus ()Lcom/hexagonkt/http/model/HttpStatus; + public final fun getRequest ()Lcom/hexagontk/http/model/HttpRequestPort; + public final fun getResponse ()Lcom/hexagontk/http/model/HttpResponsePort; + public final fun getStatus ()Lcom/hexagontk/http/model/HttpStatus; public final fun getUrl ()Ljava/net/URL; public final fun getUserAgent ()Ljava/lang/String; public fun hashCode ()I - public final fun internalServerError (Ljava/lang/Exception;Lcom/hexagonkt/http/model/Headers;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun internalServerError (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun internalServerError$default (Lcom/hexagonkt/http/handlers/HttpContext;Ljava/lang/Exception;Lcom/hexagonkt/http/model/Headers;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun internalServerError$default (Lcom/hexagonkt/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public synthetic fun next ()Lcom/hexagonkt/handlers/Context; - public fun next ()Lcom/hexagonkt/http/handlers/HttpContext; - public final fun notFound (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun notFound$default (Lcom/hexagonkt/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun ok (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun ok$default (Lcom/hexagonkt/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun receive (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/List;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun receive$default (Lcom/hexagonkt/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun redirect (Lcom/hexagonkt/http/model/HttpStatus;Ljava/lang/String;Lcom/hexagonkt/http/model/Headers;Ljava/util/List;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun redirect$default (Lcom/hexagonkt/http/handlers/HttpContext;Lcom/hexagonkt/http/model/HttpStatus;Ljava/lang/String;Lcom/hexagonkt/http/model/Headers;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun send (Lcom/hexagonkt/http/model/HttpRequestPort;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun send (Lcom/hexagonkt/http/model/HttpResponsePort;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun send (Lcom/hexagonkt/http/model/HttpStatus;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun send$default (Lcom/hexagonkt/http/handlers/HttpContext;Lcom/hexagonkt/http/model/HttpRequestPort;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun send$default (Lcom/hexagonkt/http/handlers/HttpContext;Lcom/hexagonkt/http/model/HttpResponsePort;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun send$default (Lcom/hexagonkt/http/handlers/HttpContext;Lcom/hexagonkt/http/model/HttpStatus;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun serverError (Lcom/hexagonkt/http/model/HttpStatus;Ljava/lang/Exception;Lcom/hexagonkt/http/model/Headers;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun serverError$default (Lcom/hexagonkt/http/handlers/HttpContext;Lcom/hexagonkt/http/model/HttpStatus;Ljava/lang/Exception;Lcom/hexagonkt/http/model/Headers;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public final fun sse (Ljava/util/concurrent/Flow$Publisher;)Lcom/hexagonkt/http/handlers/HttpContext; + public final fun internalServerError (Ljava/lang/Exception;Lcom/hexagontk/http/model/Headers;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun internalServerError (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun internalServerError$default (Lcom/hexagontk/http/handlers/HttpContext;Ljava/lang/Exception;Lcom/hexagontk/http/model/Headers;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun internalServerError$default (Lcom/hexagontk/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public synthetic fun next ()Lcom/hexagontk/handlers/Context; + public fun next ()Lcom/hexagontk/http/handlers/HttpContext; + public final fun notFound (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun notFound$default (Lcom/hexagontk/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun ok (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun ok$default (Lcom/hexagontk/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun receive (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/List;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun receive$default (Lcom/hexagontk/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun redirect (Lcom/hexagontk/http/model/HttpStatus;Ljava/lang/String;Lcom/hexagontk/http/model/Headers;Ljava/util/List;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun redirect$default (Lcom/hexagontk/http/handlers/HttpContext;Lcom/hexagontk/http/model/HttpStatus;Ljava/lang/String;Lcom/hexagontk/http/model/Headers;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun send (Lcom/hexagontk/http/model/HttpRequestPort;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun send (Lcom/hexagontk/http/model/HttpResponsePort;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun send (Lcom/hexagontk/http/model/HttpStatus;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun send$default (Lcom/hexagontk/http/handlers/HttpContext;Lcom/hexagontk/http/model/HttpRequestPort;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun send$default (Lcom/hexagontk/http/handlers/HttpContext;Lcom/hexagontk/http/model/HttpResponsePort;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun send$default (Lcom/hexagontk/http/handlers/HttpContext;Lcom/hexagontk/http/model/HttpStatus;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun serverError (Lcom/hexagontk/http/model/HttpStatus;Ljava/lang/Exception;Lcom/hexagontk/http/model/Headers;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun serverError$default (Lcom/hexagontk/http/handlers/HttpContext;Lcom/hexagontk/http/model/HttpStatus;Ljava/lang/Exception;Lcom/hexagontk/http/model/Headers;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public final fun sse (Ljava/util/concurrent/Flow$Publisher;)Lcom/hexagontk/http/handlers/HttpContext; public fun toString ()Ljava/lang/String; - public final fun unauthorized (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagonkt/http/handlers/HttpContext; - public static synthetic fun unauthorized$default (Lcom/hexagonkt/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpContext; - public fun with (Lcom/hexagonkt/http/model/HttpCall;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;Z)Lcom/hexagonkt/handlers/Context; - public synthetic fun with (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;Z)Lcom/hexagonkt/handlers/Context; + public final fun unauthorized (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;)Lcom/hexagontk/http/handlers/HttpContext; + public static synthetic fun unauthorized$default (Lcom/hexagontk/http/handlers/HttpContext;Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Ljava/util/List;Ljava/util/Map;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpContext; + public fun with (Lcom/hexagontk/http/model/HttpCall;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;Z)Lcom/hexagontk/handlers/Context; + public synthetic fun with (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Ljava/util/List;ILjava/lang/Exception;Ljava/util/Map;Z)Lcom/hexagontk/handlers/Context; } -public abstract interface class com/hexagonkt/http/handlers/HttpController : com/hexagonkt/http/handlers/HttpHandler { - public abstract fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/handlers/HttpHandler; +public abstract interface class com/hexagontk/http/handlers/HttpController : com/hexagontk/http/handlers/HttpHandler { + public abstract fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/handlers/HttpHandler; public abstract fun getCallback ()Lkotlin/jvm/functions/Function1; - public abstract fun getHandler ()Lcom/hexagonkt/http/handlers/HttpHandler; - public abstract fun getHandlerPredicate ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public abstract fun getHandler ()Lcom/hexagontk/http/handlers/HttpHandler; + public abstract fun getHandlerPredicate ()Lcom/hexagontk/http/handlers/HttpPredicate; public abstract fun getPredicate ()Lkotlin/jvm/functions/Function1; - public abstract fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; + public abstract fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; } -public final class com/hexagonkt/http/handlers/HttpController$DefaultImpls { - public static fun addPrefix (Lcom/hexagonkt/http/handlers/HttpController;Ljava/lang/String;)Lcom/hexagonkt/http/handlers/HttpHandler; - public static fun byMethod (Lcom/hexagonkt/http/handlers/HttpController;)Ljava/util/Map; - public static fun filter (Lcom/hexagonkt/http/handlers/HttpController;Lcom/hexagonkt/http/model/HttpMethod;)Lcom/hexagonkt/http/handlers/HttpHandler; - public static fun getCallback (Lcom/hexagonkt/http/handlers/HttpController;)Lkotlin/jvm/functions/Function1; - public static fun getHandlerPredicate (Lcom/hexagonkt/http/handlers/HttpController;)Lcom/hexagonkt/http/handlers/HttpPredicate; - public static fun getPredicate (Lcom/hexagonkt/http/handlers/HttpController;)Lkotlin/jvm/functions/Function1; - public static fun process (Lcom/hexagonkt/http/handlers/HttpController;Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; - public static fun process (Lcom/hexagonkt/http/handlers/HttpController;Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/handlers/HttpContext; - public static fun processHttp (Lcom/hexagonkt/http/handlers/HttpController;Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; +public final class com/hexagontk/http/handlers/HttpController$DefaultImpls { + public static fun addPrefix (Lcom/hexagontk/http/handlers/HttpController;Ljava/lang/String;)Lcom/hexagontk/http/handlers/HttpHandler; + public static fun byMethod (Lcom/hexagontk/http/handlers/HttpController;)Ljava/util/Map; + public static fun filter (Lcom/hexagontk/http/handlers/HttpController;Lcom/hexagontk/http/model/HttpMethod;)Lcom/hexagontk/http/handlers/HttpHandler; + public static fun getCallback (Lcom/hexagontk/http/handlers/HttpController;)Lkotlin/jvm/functions/Function1; + public static fun getHandlerPredicate (Lcom/hexagontk/http/handlers/HttpController;)Lcom/hexagontk/http/handlers/HttpPredicate; + public static fun getPredicate (Lcom/hexagontk/http/handlers/HttpController;)Lkotlin/jvm/functions/Function1; + public static fun process (Lcom/hexagontk/http/handlers/HttpController;Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; + public static fun process (Lcom/hexagontk/http/handlers/HttpController;Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/handlers/HttpContext; + public static fun processHttp (Lcom/hexagontk/http/handlers/HttpController;Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; } -public abstract interface class com/hexagonkt/http/handlers/HttpExceptionCallback : kotlin/jvm/functions/Function2 { +public abstract interface class com/hexagontk/http/handlers/HttpExceptionCallback : kotlin/jvm/functions/Function2 { } -public abstract interface class com/hexagonkt/http/handlers/HttpHandler : com/hexagonkt/handlers/Handler { - public abstract fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/handlers/HttpHandler; +public abstract interface class com/hexagontk/http/handlers/HttpHandler : com/hexagontk/handlers/Handler { + public abstract fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/handlers/HttpHandler; public abstract fun byMethod ()Ljava/util/Map; - public abstract fun filter (Lcom/hexagonkt/http/model/HttpMethod;)Lcom/hexagonkt/http/handlers/HttpHandler; - public abstract fun getHandlerPredicate ()Lcom/hexagonkt/http/handlers/HttpPredicate; - public abstract fun process (Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/handlers/HttpContext; - public abstract fun processHttp (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public abstract fun filter (Lcom/hexagontk/http/model/HttpMethod;)Lcom/hexagontk/http/handlers/HttpHandler; + public abstract fun getHandlerPredicate ()Lcom/hexagontk/http/handlers/HttpPredicate; + public abstract fun process (Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/handlers/HttpContext; + public abstract fun processHttp (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; } -public final class com/hexagonkt/http/handlers/HttpHandler$DefaultImpls { - public static fun byMethod (Lcom/hexagonkt/http/handlers/HttpHandler;)Ljava/util/Map; - public static fun filter (Lcom/hexagonkt/http/handlers/HttpHandler;Lcom/hexagonkt/http/model/HttpMethod;)Lcom/hexagonkt/http/handlers/HttpHandler; - public static fun process (Lcom/hexagonkt/http/handlers/HttpHandler;Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/handlers/HttpContext; - public static fun processHttp (Lcom/hexagonkt/http/handlers/HttpHandler;Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; +public final class com/hexagontk/http/handlers/HttpHandler$DefaultImpls { + public static fun byMethod (Lcom/hexagontk/http/handlers/HttpHandler;)Ljava/util/Map; + public static fun filter (Lcom/hexagontk/http/handlers/HttpHandler;Lcom/hexagontk/http/model/HttpMethod;)Lcom/hexagontk/http/handlers/HttpHandler; + public static fun process (Lcom/hexagontk/http/handlers/HttpHandler;Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/handlers/HttpContext; + public static fun processHttp (Lcom/hexagontk/http/handlers/HttpHandler;Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; } -public final class com/hexagonkt/http/handlers/HttpPredicate : kotlin/jvm/functions/Function1 { +public final class com/hexagontk/http/handlers/HttpPredicate : kotlin/jvm/functions/Function1 { public fun ()V - public fun (Ljava/util/Set;Lcom/hexagonkt/http/patterns/PathPattern;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;)V - public synthetic fun (Ljava/util/Set;Lcom/hexagonkt/http/patterns/PathPattern;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Z)V - public synthetic fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/handlers/HttpPredicate; - public final fun clearMethods ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public fun (Ljava/util/Set;Lcom/hexagontk/http/patterns/PathPattern;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;)V + public synthetic fun (Ljava/util/Set;Lcom/hexagontk/http/patterns/PathPattern;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Z)V + public synthetic fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/handlers/HttpPredicate; + public final fun clearMethods ()Lcom/hexagontk/http/handlers/HttpPredicate; public final fun component1 ()Ljava/util/Set; - public final fun component2 ()Lcom/hexagonkt/http/patterns/PathPattern; + public final fun component2 ()Lcom/hexagontk/http/patterns/PathPattern; public final fun component3 ()Lkotlin/reflect/KClass; - public final fun component4 ()Lcom/hexagonkt/http/model/HttpStatus; - public final fun copy (Ljava/util/Set;Lcom/hexagonkt/http/patterns/PathPattern;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;)Lcom/hexagonkt/http/handlers/HttpPredicate; - public static synthetic fun copy$default (Lcom/hexagonkt/http/handlers/HttpPredicate;Ljava/util/Set;Lcom/hexagonkt/http/patterns/PathPattern;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/HttpPredicate; + public final fun component4 ()Lcom/hexagontk/http/model/HttpStatus; + public final fun copy (Ljava/util/Set;Lcom/hexagontk/http/patterns/PathPattern;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;)Lcom/hexagontk/http/handlers/HttpPredicate; + public static synthetic fun copy$default (Lcom/hexagontk/http/handlers/HttpPredicate;Ljava/util/Set;Lcom/hexagontk/http/patterns/PathPattern;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/HttpPredicate; public final fun describe ()Ljava/lang/String; public fun equals (Ljava/lang/Object;)Z public final fun getException ()Lkotlin/reflect/KClass; public final fun getMethods ()Ljava/util/Set; - public final fun getPathPattern ()Lcom/hexagonkt/http/patterns/PathPattern; + public final fun getPathPattern ()Lcom/hexagontk/http/patterns/PathPattern; public final fun getPredicate ()Lkotlin/jvm/functions/Function1; - public final fun getStatus ()Lcom/hexagonkt/http/model/HttpStatus; + public final fun getStatus ()Lcom/hexagontk/http/model/HttpStatus; public fun hashCode ()I - public fun invoke (Lcom/hexagonkt/handlers/Context;)Ljava/lang/Boolean; + public fun invoke (Lcom/hexagontk/handlers/Context;)Ljava/lang/Boolean; public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/handlers/OnHandler : com/hexagonkt/handlers/Handler, com/hexagonkt/http/handlers/HttpHandler { - public fun (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun (Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Lcom/hexagonkt/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V +public final class com/hexagontk/http/handlers/OnHandler : com/hexagontk/handlers/Handler, com/hexagontk/http/handlers/HttpHandler { + public fun (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Lcom/hexagontk/http/model/HttpMethod;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagonkt/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Ljava/util/Set;Ljava/lang/String;Lkotlin/reflect/KClass;Lcom/hexagontk/http/model/HttpStatus;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/handlers/HttpHandler; public fun byMethod ()Ljava/util/Map; - public final fun component1 ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public final fun component1 ()Lcom/hexagontk/http/handlers/HttpPredicate; public final fun component2 ()Lkotlin/jvm/functions/Function1; - public final fun copy (Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/handlers/OnHandler; - public static synthetic fun copy$default (Lcom/hexagonkt/http/handlers/OnHandler;Lcom/hexagonkt/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/OnHandler; + public final fun copy (Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/handlers/OnHandler; + public static synthetic fun copy$default (Lcom/hexagontk/http/handlers/OnHandler;Lcom/hexagontk/http/handlers/HttpPredicate;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/OnHandler; public fun equals (Ljava/lang/Object;)Z - public fun filter (Lcom/hexagonkt/http/model/HttpMethod;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun filter (Lcom/hexagontk/http/model/HttpMethod;)Lcom/hexagontk/http/handlers/HttpHandler; public final fun getBlock ()Lkotlin/jvm/functions/Function1; public fun getCallback ()Lkotlin/jvm/functions/Function1; - public fun getHandlerPredicate ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public fun getHandlerPredicate ()Lcom/hexagontk/http/handlers/HttpPredicate; public fun getPredicate ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; - public fun process (Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/handlers/HttpContext; - public fun processHttp (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; + public fun process (Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/handlers/HttpContext; + public fun processHttp (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/handlers/PathHandler : com/hexagonkt/handlers/Handler, com/hexagonkt/http/handlers/HttpHandler { - public fun (Lcom/hexagonkt/http/handlers/HttpPredicate;Ljava/util/List;)V +public final class com/hexagontk/http/handlers/PathHandler : com/hexagontk/handlers/Handler, com/hexagontk/http/handlers/HttpHandler { + public fun (Lcom/hexagontk/http/handlers/HttpPredicate;Ljava/util/List;)V public fun (Ljava/lang/String;Ljava/util/List;)V - public fun (Ljava/lang/String;[Lcom/hexagonkt/http/handlers/HttpHandler;)V - public fun ([Lcom/hexagonkt/http/handlers/HttpHandler;)V - public fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun (Ljava/lang/String;[Lcom/hexagontk/http/handlers/HttpHandler;)V + public fun ([Lcom/hexagontk/http/handlers/HttpHandler;)V + public fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/handlers/HttpHandler; public fun byMethod ()Ljava/util/Map; - public final fun component1 ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public final fun component1 ()Lcom/hexagontk/http/handlers/HttpPredicate; public final fun component2 ()Ljava/util/List; - public final fun copy (Lcom/hexagonkt/http/handlers/HttpPredicate;Ljava/util/List;)Lcom/hexagonkt/http/handlers/PathHandler; - public static synthetic fun copy$default (Lcom/hexagonkt/http/handlers/PathHandler;Lcom/hexagonkt/http/handlers/HttpPredicate;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagonkt/http/handlers/PathHandler; + public final fun copy (Lcom/hexagontk/http/handlers/HttpPredicate;Ljava/util/List;)Lcom/hexagontk/http/handlers/PathHandler; + public static synthetic fun copy$default (Lcom/hexagontk/http/handlers/PathHandler;Lcom/hexagontk/http/handlers/HttpPredicate;Ljava/util/List;ILjava/lang/Object;)Lcom/hexagontk/http/handlers/PathHandler; public final fun describe ()Ljava/lang/String; public fun equals (Ljava/lang/Object;)Z - public fun filter (Lcom/hexagonkt/http/model/HttpMethod;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun filter (Lcom/hexagontk/http/model/HttpMethod;)Lcom/hexagontk/http/handlers/HttpHandler; public fun getCallback ()Lkotlin/jvm/functions/Function1; - public fun getHandlerPredicate ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public fun getHandlerPredicate ()Lcom/hexagontk/http/handlers/HttpPredicate; public final fun getHandlers ()Ljava/util/List; public fun getPredicate ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; - public fun process (Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/handlers/HttpContext; - public fun processHttp (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; + public fun process (Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/handlers/HttpContext; + public fun processHttp (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; public fun toString ()Ljava/lang/String; } diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/AfterHandler.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/AfterHandler.kt index 35a6ea0e17..f9adf5c98a 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/AfterHandler.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/AfterHandler.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.handlers.AfterHandler -import com.hexagonkt.handlers.Handler -import com.hexagonkt.http.model.HttpMethod -import com.hexagonkt.http.model.HttpStatus -import com.hexagonkt.http.model.HttpCall +import com.hexagontk.handlers.AfterHandler +import com.hexagontk.handlers.Handler +import com.hexagontk.http.model.HttpMethod +import com.hexagontk.http.model.HttpStatus +import com.hexagontk.http.model.HttpCall import kotlin.reflect.KClass data class AfterHandler( diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/BeforeHandler.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/BeforeHandler.kt index 5f61157291..0d3a586238 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/BeforeHandler.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/BeforeHandler.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.handlers.BeforeHandler -import com.hexagonkt.handlers.Handler -import com.hexagonkt.http.model.HttpMethod -import com.hexagonkt.http.model.HttpStatus -import com.hexagonkt.http.model.HttpCall +import com.hexagontk.handlers.BeforeHandler +import com.hexagontk.handlers.Handler +import com.hexagontk.http.model.HttpMethod +import com.hexagontk.http.model.HttpStatus +import com.hexagontk.http.model.HttpCall import kotlin.reflect.KClass data class BeforeHandler( diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/ExceptionHandler.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/ExceptionHandler.kt index 4acd949a8a..54ba127690 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/ExceptionHandler.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/ExceptionHandler.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.handlers.ExceptionHandler -import com.hexagonkt.handlers.Handler -import com.hexagonkt.http.model.HttpCall +import com.hexagontk.handlers.ExceptionHandler +import com.hexagontk.handlers.Handler +import com.hexagontk.http.model.HttpCall import kotlin.reflect.KClass data class ExceptionHandler( diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/FilterHandler.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/FilterHandler.kt index 7c5feeff5d..f5dff2d710 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/FilterHandler.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/FilterHandler.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.handlers.FilterHandler -import com.hexagonkt.handlers.Handler -import com.hexagonkt.http.model.HttpMethod -import com.hexagonkt.http.model.HttpStatus -import com.hexagonkt.http.model.HttpCall +import com.hexagontk.handlers.FilterHandler +import com.hexagontk.handlers.Handler +import com.hexagontk.http.model.HttpMethod +import com.hexagontk.http.model.HttpStatus +import com.hexagontk.http.model.HttpCall import kotlin.reflect.KClass data class FilterHandler( diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HandlerBuilder.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HandlerBuilder.kt index cd2d9a14ed..66d759d6d9 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HandlerBuilder.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HandlerBuilder.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.http.model.HttpMethod -import com.hexagonkt.http.model.HttpStatus +import com.hexagontk.http.model.HttpMethod +import com.hexagontk.http.model.HttpStatus import kotlin.reflect.KClass class HandlerBuilder(var handlers: List = emptyList()) { @@ -15,7 +15,7 @@ class HandlerBuilder(var handlers: List = emptyList()) { } fun path(pattern: String, block: HandlerBuilder.() -> Unit) { - use(com.hexagonkt.http.handlers.path(pattern, block)) + use(com.hexagontk.http.handlers.path(pattern, block)) } fun path(pattern: String, pathHandler: PathHandler) { diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/Handlers.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/Handlers.kt index 38c326ee97..3855d0a81f 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/Handlers.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/Handlers.kt @@ -1,12 +1,12 @@ @file:Suppress("FunctionName") // Uppercase functions are used for providing named constructors -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.core.logging.Logger -import com.hexagonkt.handlers.Context -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.http.model.HttpProtocol.HTTP +import com.hexagontk.core.logging.Logger +import com.hexagontk.handlers.Context +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.http.model.HttpProtocol.HTTP import java.math.BigInteger import java.security.cert.X509Certificate diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpCallback.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpCallback.kt index 86f1203a78..a22c17863e 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpCallback.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpCallback.kt @@ -1,3 +1,3 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers interface HttpCallback : (HttpContext) -> HttpContext diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpContext.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpContext.kt index 76dabeb0e2..fdb7ae8da4 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpContext.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpContext.kt @@ -1,15 +1,15 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.handlers.Context -import com.hexagonkt.core.assertEnabled -import com.hexagonkt.core.media.TEXT_EVENT_STREAM -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.core.toText -import com.hexagonkt.handlers.Handler -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.INTERNAL_SERVER_ERROR_500 -import com.hexagonkt.http.model.ServerEvent -import com.hexagonkt.http.model.ws.WsSession +import com.hexagontk.handlers.Context +import com.hexagontk.core.assertEnabled +import com.hexagontk.core.media.TEXT_EVENT_STREAM +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.core.toText +import com.hexagontk.handlers.Handler +import com.hexagontk.http.model.* +import com.hexagontk.http.model.INTERNAL_SERVER_ERROR_500 +import com.hexagontk.http.model.ServerEvent +import com.hexagontk.http.model.ws.WsSession import java.net.URL import java.security.cert.X509Certificate import java.util.concurrent.Flow.Publisher diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpController.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpController.kt index 739e813053..df60a36bab 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpController.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpController.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.handlers.Context -import com.hexagonkt.http.model.HttpCall +import com.hexagontk.handlers.Context +import com.hexagontk.http.model.HttpCall /** * Utility to encapsulate a handler in a class. TODO diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpExceptionCallback.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpExceptionCallback.kt index cd8deba07d..5d16647e50 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpExceptionCallback.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpExceptionCallback.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers // TODO Use this type to implement the RFC 7807 exception handler interface HttpExceptionCallback : (HttpContext, T) -> HttpContext diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpHandler.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpHandler.kt index e5106f7036..0bb2ce3285 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpHandler.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpHandler.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.handlers.Handler -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpCall +import com.hexagontk.handlers.Handler +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpCall interface HttpHandler : Handler { val handlerPredicate: HttpPredicate diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpPredicate.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpPredicate.kt index 03b7c861cd..b57c2b82a4 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpPredicate.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/HttpPredicate.kt @@ -1,13 +1,13 @@ -package com.hexagonkt.http.handlers - -import com.hexagonkt.handlers.Context -import com.hexagonkt.core.logging.Logger -import com.hexagonkt.http.patterns.LiteralPathPattern -import com.hexagonkt.http.model.HttpMethod -import com.hexagonkt.http.model.HttpStatus -import com.hexagonkt.http.patterns.PathPattern -import com.hexagonkt.http.patterns.createPathPattern -import com.hexagonkt.http.model.HttpCall +package com.hexagontk.http.handlers + +import com.hexagontk.handlers.Context +import com.hexagontk.core.logging.Logger +import com.hexagontk.http.patterns.LiteralPathPattern +import com.hexagontk.http.model.HttpMethod +import com.hexagontk.http.model.HttpStatus +import com.hexagontk.http.patterns.PathPattern +import com.hexagontk.http.patterns.createPathPattern +import com.hexagontk.http.model.HttpCall import kotlin.reflect.KClass data class HttpPredicate( diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/OnHandler.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/OnHandler.kt index 1a91d72476..2e26a69bb3 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/OnHandler.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/OnHandler.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.handlers.OnHandler -import com.hexagonkt.handlers.Handler -import com.hexagonkt.http.model.HttpMethod -import com.hexagonkt.http.model.HttpStatus -import com.hexagonkt.http.model.HttpCall +import com.hexagontk.handlers.OnHandler +import com.hexagontk.handlers.Handler +import com.hexagontk.http.model.HttpMethod +import com.hexagontk.http.model.HttpStatus +import com.hexagontk.http.model.HttpCall import kotlin.reflect.KClass data class OnHandler( diff --git a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/PathHandler.kt b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/PathHandler.kt index db6bbab023..908a19f6a9 100644 --- a/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/PathHandler.kt +++ b/http/http_handlers/src/main/kotlin/com/hexagonkt/http/handlers/PathHandler.kt @@ -1,13 +1,13 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.core.logging.Logger -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.core.toText -import com.hexagonkt.handlers.ChainHandler -import com.hexagonkt.handlers.Handler -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpMethod.Companion.ALL -import com.hexagonkt.http.model.HttpStatusType.SERVER_ERROR +import com.hexagontk.core.logging.Logger +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.core.toText +import com.hexagontk.handlers.ChainHandler +import com.hexagontk.handlers.Handler +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpMethod.Companion.ALL +import com.hexagontk.http.model.HttpStatusType.SERVER_ERROR data class PathHandler( override val handlerPredicate: HttpPredicate, diff --git a/http/http_handlers/src/main/kotlin/module-info.java b/http/http_handlers/src/main/kotlin/module-info.java index eca9ddd1df..5124a08b18 100644 --- a/http/http_handlers/src/main/kotlin/module-info.java +++ b/http/http_handlers/src/main/kotlin/module-info.java @@ -1,8 +1,8 @@ -module com.hexagonkt.http_handlers { +module com.hexagontk.http_handlers { - requires transitive com.hexagonkt.http; - requires transitive com.hexagonkt.handlers; + requires transitive com.hexagontk.http; + requires transitive com.hexagontk.handlers; - exports com.hexagonkt.http.handlers; + exports com.hexagontk.http.handlers; } diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/AfterHandlerTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/AfterHandlerTest.kt index 6c0cbfed1d..d50cb0d939 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/AfterHandlerTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/AfterHandlerTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.http.model.HttpMethod.GET +import com.hexagontk.http.model.HttpMethod.GET import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/BeforeHandlerTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/BeforeHandlerTest.kt index 3fec028ded..877f47b067 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/BeforeHandlerTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/BeforeHandlerTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.http.model.HttpMethod.GET -import com.hexagonkt.http.model.HttpRequest +import com.hexagontk.http.model.HttpMethod.GET +import com.hexagontk.http.model.HttpRequest import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/BooksTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/BooksTest.kt index c438809156..a163f78c62 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/BooksTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/BooksTest.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.http.handlers - -import com.hexagonkt.core.fail -import com.hexagonkt.core.require -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.http.model.HttpMethod.Companion.ALL -import com.hexagonkt.http.model.CREATED_201 +package com.hexagontk.http.handlers + +import com.hexagontk.core.fail +import com.hexagontk.core.require +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.http.model.HttpMethod.Companion.ALL +import com.hexagontk.http.model.CREATED_201 import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/ErrorsTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/ErrorsTest.kt index 57d8124096..f895108585 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/ErrorsTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/ErrorsTest.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.core.fail -import com.hexagonkt.http.model.NOT_FOUND_404 -import com.hexagonkt.http.model.HttpStatus -import com.hexagonkt.http.model.Header -import com.hexagonkt.http.model.HttpMethod.GET -import com.hexagonkt.http.model.INTERNAL_SERVER_ERROR_500 +import com.hexagontk.core.fail +import com.hexagontk.http.model.NOT_FOUND_404 +import com.hexagontk.http.model.HttpStatus +import com.hexagontk.http.model.Header +import com.hexagontk.http.model.HttpMethod.GET +import com.hexagontk.http.model.INTERNAL_SERVER_ERROR_500 import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/Examples.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/Examples.kt index e8d4516f6e..895e3018ca 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/Examples.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/Examples.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.http.basicAuth -import com.hexagonkt.http.model.* -import com.hexagonkt.http.parseQueryString +import com.hexagontk.http.basicAuth +import com.hexagontk.http.model.* +import com.hexagontk.http.parseQueryString import kotlin.test.assertEquals internal fun assertResponseContains( diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/FilterHandlerTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/FilterHandlerTest.kt index 8bbd158216..1521d3d3ca 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/FilterHandlerTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/FilterHandlerTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.http.model.HttpMethod.GET +import com.hexagontk.http.model.HttpMethod.GET import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/FiltersTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/FiltersTest.kt index baa0529ad5..fcd5efbad6 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/FiltersTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/FiltersTest.kt @@ -1,12 +1,12 @@ -package com.hexagonkt.http.handlers - -import com.hexagonkt.core.text.decodeBase64 -import com.hexagonkt.http.model.FORBIDDEN_403 -import com.hexagonkt.http.model.UNAUTHORIZED_401 -import com.hexagonkt.http.model.Header -import com.hexagonkt.http.model.HttpMethod.GET -import com.hexagonkt.http.model.HttpMethod.PUT -import com.hexagonkt.http.model.* +package com.hexagontk.http.handlers + +import com.hexagontk.core.text.decodeBase64 +import com.hexagontk.http.model.FORBIDDEN_403 +import com.hexagontk.http.model.UNAUTHORIZED_401 +import com.hexagontk.http.model.Header +import com.hexagontk.http.model.HttpMethod.GET +import com.hexagontk.http.model.HttpMethod.PUT +import com.hexagontk.http.model.* import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HandlerBuilderTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HandlerBuilderTest.kt index ae263723a8..a54b52fa61 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HandlerBuilderTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HandlerBuilderTest.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.http.handlers - -import com.hexagonkt.http.model.METHOD_NOT_ALLOWED_405 -import com.hexagonkt.http.model.NOT_FOUND_404 -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.http.model.* -import com.hexagonkt.http.patterns.LiteralPathPattern -import com.hexagonkt.http.model.HttpRequest +package com.hexagontk.http.handlers + +import com.hexagontk.http.model.METHOD_NOT_ALLOWED_405 +import com.hexagontk.http.model.NOT_FOUND_404 +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.http.model.* +import com.hexagontk.http.patterns.LiteralPathPattern +import com.hexagontk.http.model.HttpRequest import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HandlersTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HandlersTest.kt index 6be5e0e964..9af72b9b41 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HandlersTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HandlersTest.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.model.INTERNAL_SERVER_ERROR_500 -import com.hexagonkt.http.model.NOT_FOUND_404 -import com.hexagonkt.http.model.OK_200 +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.model.INTERNAL_SERVER_ERROR_500 +import com.hexagontk.http.model.NOT_FOUND_404 +import com.hexagontk.http.model.OK_200 import org.junit.jupiter.api.Test import java.math.BigInteger import java.time.LocalDate diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpContextTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpContextTest.kt index 616e2da9f1..ba93352db1 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpContextTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpContextTest.kt @@ -1,17 +1,17 @@ -package com.hexagonkt.http.handlers - -import com.hexagonkt.core.media.TEXT_HTML -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.http.model.HttpProtocol.HTTPS -import com.hexagonkt.http.model.FOUND_302 -import com.hexagonkt.http.model.BAD_GATEWAY_502 -import com.hexagonkt.http.model.INTERNAL_SERVER_ERROR_500 -import com.hexagonkt.http.patterns.TemplatePathPattern -import com.hexagonkt.http.model.HttpCall -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.model.HttpResponse +package com.hexagontk.http.handlers + +import com.hexagontk.core.media.TEXT_HTML +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.http.model.HttpProtocol.HTTPS +import com.hexagontk.http.model.FOUND_302 +import com.hexagontk.http.model.BAD_GATEWAY_502 +import com.hexagontk.http.model.INTERNAL_SERVER_ERROR_500 +import com.hexagontk.http.patterns.TemplatePathPattern +import com.hexagontk.http.model.HttpCall +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.model.HttpResponse import org.junit.jupiter.api.Test import java.lang.RuntimeException import kotlin.test.assertEquals diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpControllerTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpControllerTest.kt index e343d3d445..18547ef80d 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpControllerTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpControllerTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.http.model.HttpRequest +import com.hexagontk.http.model.HttpRequest import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpPredicateTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpPredicateTest.kt index 62552e249e..24345508cb 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpPredicateTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpPredicateTest.kt @@ -1,14 +1,14 @@ -package com.hexagonkt.http.handlers - -import com.hexagonkt.http.model.HttpStatus -import com.hexagonkt.http.model.HttpMethod -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.http.model.HttpMethod.Companion.ALL -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.patterns.LiteralPathPattern -import com.hexagonkt.http.model.HttpCall -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.model.HttpResponse +package com.hexagontk.http.handlers + +import com.hexagontk.http.model.HttpStatus +import com.hexagontk.http.model.HttpMethod +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.http.model.HttpMethod.Companion.ALL +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.patterns.LiteralPathPattern +import com.hexagontk.http.model.HttpCall +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.model.HttpResponse import org.junit.jupiter.api.Test import java.io.IOException import kotlin.IllegalStateException diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpServerTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpServerTest.kt index f0397346d4..badd6199fe 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpServerTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/HttpServerTest.kt @@ -1,13 +1,13 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.core.require -import com.hexagonkt.http.model.METHOD_NOT_ALLOWED_405 -import com.hexagonkt.http.model.NOT_FOUND_404 -import com.hexagonkt.http.model.HttpMethod.GET -import com.hexagonkt.http.model.HttpMethod.PUT -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.model.HttpResponse +import com.hexagontk.core.require +import com.hexagontk.http.model.METHOD_NOT_ALLOWED_405 +import com.hexagontk.http.model.NOT_FOUND_404 +import com.hexagontk.http.model.HttpMethod.GET +import com.hexagontk.http.model.HttpMethod.PUT +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.model.HttpResponse import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/OnHandlerTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/OnHandlerTest.kt index 211313b4e8..1b914bd186 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/OnHandlerTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/OnHandlerTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.http.model.HttpMethod.GET -import com.hexagonkt.http.model.HttpRequest +import com.hexagontk.http.model.HttpMethod.GET +import com.hexagontk.http.model.HttpRequest import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/PathHandlerTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/PathHandlerTest.kt index 77575fd3de..87ef4b98a2 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/PathHandlerTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/PathHandlerTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.http.model.HttpMethod -import com.hexagonkt.http.model.HttpMethod.* +import com.hexagontk.http.model.HttpMethod +import com.hexagontk.http.model.HttpMethod.* import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/RoutingTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/RoutingTest.kt index 3027cc98ff..02d7929b75 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/RoutingTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/RoutingTest.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.handlers +package com.hexagontk.http.handlers -import com.hexagonkt.core.require -import com.hexagonkt.http.model.Header -import com.hexagonkt.http.model.HttpMethod.GET +import com.hexagontk.core.require +import com.hexagontk.http.model.Header +import com.hexagontk.http.model.HttpMethod.GET import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/ServerSentEventsTest.kt b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/ServerSentEventsTest.kt index 4ee11880e9..aff7fee2f5 100644 --- a/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/ServerSentEventsTest.kt +++ b/http/http_handlers/src/test/kotlin/com/hexagonkt/http/handlers/ServerSentEventsTest.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.http.handlers - -import com.hexagonkt.core.fail -import com.hexagonkt.core.logging.info -import com.hexagonkt.core.media.TEXT_EVENT_STREAM -import com.hexagonkt.http.model.HttpMethod.GET -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.model.ServerEvent +package com.hexagontk.http.handlers + +import com.hexagontk.core.fail +import com.hexagontk.core.logging.info +import com.hexagontk.core.media.TEXT_EVENT_STREAM +import com.hexagontk.http.model.HttpMethod.GET +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.model.ServerEvent import org.junit.jupiter.api.Test import java.util.concurrent.Flow import java.util.concurrent.Flow.Subscription diff --git a/http/http_server/README.md b/http/http_server/README.md index 01d3e21dce..a02756e0e8 100644 --- a/http/http_server/README.md +++ b/http/http_server/README.md @@ -70,12 +70,12 @@ To create a server, you need to provide a handler (check the [handlers section] information), and after creating a server you can run it or stop it with [start()] and [stop()] methods. -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?serverCreation +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?serverCreation -[server settings]: /api/http/http_server/com.hexagonkt.http.server/-http-server-settings +[server settings]: /api/http/http_server/com.hexagontk.http.server/-http-server-settings [handlers section]: /http_server/#handlers -[start()]: /api/http/http_server/com.hexagonkt.http.server/-http-server -[stop()]: /api/http/http_server/com.hexagonkt.http.server/-http-server +[start()]: /api/http/http_server/com.hexagontk.http.server/-http-server +[stop()]: /api/http/http_server/com.hexagontk.http.server/-http-server ## Servlet Web server There is a special server adapter for running inside Servlet Containers. To use it you should import @@ -96,9 +96,9 @@ attributes among handlers. The methods are available directly from the callback. You can check the [API documentation] for the full list of methods. This sample code illustrates the usage: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackCall +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackCall -[API documentation]: /api/http/http_handlers/com.hexagonkt.http.handlers/-http-context +[API documentation]: /api/http/http_handlers/com.hexagontk.http.handlers/-http-context # Handlers The main building blocks of Hexagon HTTP services are a set of handlers. A handler is made up of two @@ -132,9 +132,9 @@ H1 (after) Check the next snippet for Handlers usage examples: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?routesCreation +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?routesCreation -[next]: /api/http/http_handlers/com.hexagonkt.http.handlers/-http-context +[next]: /api/http/http_handlers/com.hexagontk.http.handlers/-http-context @@ -152,7 +152,7 @@ the following fields: It yields true if all the supplied fields matches a call context. -[HttpPredicate]: /api/http/http_handlers/com.hexagonkt.http.handlers/-http-predicate +[HttpPredicate]: /api/http/http_handlers/com.hexagontk.http.handlers/-http-predicate ## Path Patterns Patterns to match requests paths. They can have: @@ -183,19 +183,19 @@ that pattern. The following code details filters usage: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?filters +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?filters ## Path Handlers Handlers can be grouped by calling the `path()` method, which takes a String prefix and gives you a scope to declare other handlers. Ie: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?routeGroups +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?routeGroups If you have a lot of routes, it can be helpful to group them into Path Handlers. You can create path handlers to mount a group of routes in different paths (allowing you to reuse them). Check this snippet: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?routers +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?routers # Handler Callbacks Callbacks are request's handling blocks that are bound to handlers. They make the request and @@ -207,7 +207,7 @@ Callbacks results are the input for the next handler's callbacks in the pipeline ## Request Request functionality is provided by the `request` field: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackRequest +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackRequest ## Path Parameters Route patterns can include named parameters, accessible via the `pathParameters` map on the request @@ -215,37 +215,37 @@ object: Path parameters can be accessed by name or by index. -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackPathParam +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackPathParam ## Query Parameters It is possible to access the whole query string or only a specific query parameter using the `parameters` map on the `request` object: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackQueryParam +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackQueryParam ## Form Parameters HTML Form processing. Don't parse body! -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackFormParam +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackFormParam ## File Uploads Multipart Requests -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/MultipartSamplesTest.kt?callbackFile +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/MultipartSamplesTest.kt?callbackFile ## Response Response information is provided by the `response` field: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackResponse +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackResponse To send error responses: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackHalt +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackHalt ## Redirects You can redirect requests (returning 30x codes) by using `Call` utility methods: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackRedirect +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackRedirect ## Cookies The request and response cookie functions provide a convenient way for sharing information between @@ -256,7 +256,7 @@ add new ones you have to use `response.addCookie()` and `response.removeCookie() Check the following sample code for details: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?callbackCookie +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?callbackCookie @@ -267,13 +267,13 @@ handlers returning error codes. ## HTTP Errors Handlers Allow handling responses that returned an HTTP error code. Example: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?errors +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?errors ## Exception Mapping You can handle previously thrown exceptions of a given type (or subtype). The handler allows you to refer to the thrown exception. Look at the following code for a detailed example: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?exceptions +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?exceptions # Static Files You can use a [FileCallback] or a [UrlCallback] to route requests to files or classpath resources. @@ -283,21 +283,21 @@ have a parameter to provide the file to be fetched inside the folder. Check the next example for details: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?files +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?files ## Media Types The media types of static files are computed from the file extension using the utility methods of -the [com.hexagonkt.core.media] package. +the [com.hexagontk.core.media] package. -[com.hexagonkt.core.media]: /api/core/com.hexagonkt.core.media +[com.hexagontk.core.media]: /api/core/com.hexagontk.core.media # CORS CORS behaviour can be different depending on the path. You can attach different [CORS Callbacks] to different handlers. Check the [CorsCallback][CORS Callbacks] class for more details. -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CorsTest.kt?cors +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/CorsTest.kt?cors -[CORS Callbacks]: /api/http/http_server/com.hexagonkt.http.server.callbacks/-cors-callback +[CORS Callbacks]: /api/http/http_server/com.hexagontk.http.server.callbacks/-cors-callback # HTTPS It is possible to start a secure server enabling HTTPS. For this, you have to provide a server @@ -320,16 +320,16 @@ client used to connect (assuming it is valid, if not the connection will end wit Below you can find a simple example to set up an HTTPS server and client with mutual TLS: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt?https +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/HttpsTest.kt?https -[SslSettings]: /api/http/http/com.hexagonkt.http/-ssl-settings +[SslSettings]: /api/http/http/com.hexagontk.http/-ssl-settings [HTTP/2]: https://en.wikipedia.org/wiki/HTTP/2 [ALPN]: https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation [Gradle]: https://gradle.org [create sample certificates]: /gradle/#certificates [mutual TLS]: https://en.wikipedia.org/wiki/Mutual_authentication -[SslSettings.clientAuth]: /api/http/http/com.hexagonkt.http/-ssl-settings -[Request.certificateChain]: /api/http/http/com.hexagonkt.http.model/-http-request +[SslSettings.clientAuth]: /api/http/http/com.hexagontk.http/-ssl-settings +[Request.certificateChain]: /api/http/http/com.hexagontk.http.model/-http-request # WebSockets A Web Socket is an HTTP(S) connection made with the GET method and the `upgrade: websocket` and @@ -352,14 +352,14 @@ Sessions connected to the same WS endpoint can be stored to broadcast messages. Ping and pong allows to maintain connection opened. -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/WebSocketsTest.kt?ws_server +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/WebSocketsTest.kt?ws_server # Compression Gzip encoding is supported on the Hexagon Toolkit, however, its implementation depends on the used adapter. To turn on Gzip encoding, you need to enable that feature on the server settings. Check the code below for an example: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ZipTest.kt?zip +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ZipTest.kt?zip # Testing @@ -367,7 +367,7 @@ code below for an example: To test HTTP servers from outside using a real Adapter, you can create a server setting `0` as port. This will pick a random free port which you can check later: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?test +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?test To do this kind of tests without creating a custom server (using the real production code). Check the [tests of the starter projects]. @@ -381,21 +381,21 @@ relying on mocking libraries. For a quick example, check the snipped below: -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt?mockRequest +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/SamplesTest.kt?mockRequest -# Package com.hexagonkt.http.server +# Package com.hexagontk.http.server This package defines server interfaces for HTTP server adapters. -# Package com.hexagonkt.http.server.callbacks +# Package com.hexagontk.http.server.callbacks Utility callbacks that can be used on handlers. Reuse a callback in different handlers (after, filter, etc.). -# Package com.hexagonkt.http.server.handlers +# Package com.hexagontk.http.server.handlers Contains the HTTP handlers implementation (on top of Core's general event handlers). It houses the HTTP handlers (AfterHandler, OnHandler, PathHandler and FilterHandler) and the HTTP predicate. -# Package com.hexagonkt.http.server.model +# Package com.hexagontk.http.server.model Classes to model server HTTP messages (requests and responses). Built on top of the `http` module. -# Package com.hexagonkt.http.model.ws +# Package com.hexagontk.http.model.ws Classes to model server HTTP messages (requests and responses). Built on top of the `http` module. diff --git a/http/http_server/api/http_server.api b/http/http_server/api/http_server.api index 76be57a4bb..8c10791323 100644 --- a/http/http_server/api/http_server.api +++ b/http/http_server/api/http_server.api @@ -1,20 +1,20 @@ -public final class com/hexagonkt/http/server/HttpServer : java/io/Closeable { - public static final field Companion Lcom/hexagonkt/http/server/HttpServer$Companion; - public fun (Lcom/hexagonkt/http/server/HttpServerPort;Lcom/hexagonkt/http/handlers/HttpHandler;Lcom/hexagonkt/http/server/HttpServerSettings;)V - public synthetic fun (Lcom/hexagonkt/http/server/HttpServerPort;Lcom/hexagonkt/http/handlers/HttpHandler;Lcom/hexagonkt/http/server/HttpServerSettings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun (Lcom/hexagonkt/http/server/HttpServerPort;Lcom/hexagonkt/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;)V - public synthetic fun (Lcom/hexagonkt/http/server/HttpServerPort;Lcom/hexagonkt/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V +public final class com/hexagontk/http/server/HttpServer : java/io/Closeable { + public static final field Companion Lcom/hexagontk/http/server/HttpServer$Companion; + public fun (Lcom/hexagontk/http/server/HttpServerPort;Lcom/hexagontk/http/handlers/HttpHandler;Lcom/hexagontk/http/server/HttpServerSettings;)V + public synthetic fun (Lcom/hexagontk/http/server/HttpServerPort;Lcom/hexagontk/http/handlers/HttpHandler;Lcom/hexagontk/http/server/HttpServerSettings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lcom/hexagontk/http/server/HttpServerPort;Lcom/hexagontk/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;)V + public synthetic fun (Lcom/hexagontk/http/server/HttpServerPort;Lcom/hexagontk/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun close ()V - public final fun component2 ()Lcom/hexagonkt/http/handlers/HttpHandler; - public final fun component3 ()Lcom/hexagonkt/http/server/HttpServerSettings; - public final fun copy (Lcom/hexagonkt/http/server/HttpServerPort;Lcom/hexagonkt/http/handlers/HttpHandler;Lcom/hexagonkt/http/server/HttpServerSettings;)Lcom/hexagonkt/http/server/HttpServer; - public static synthetic fun copy$default (Lcom/hexagonkt/http/server/HttpServer;Lcom/hexagonkt/http/server/HttpServerPort;Lcom/hexagonkt/http/handlers/HttpHandler;Lcom/hexagonkt/http/server/HttpServerSettings;ILjava/lang/Object;)Lcom/hexagonkt/http/server/HttpServer; + public final fun component2 ()Lcom/hexagontk/http/handlers/HttpHandler; + public final fun component3 ()Lcom/hexagontk/http/server/HttpServerSettings; + public final fun copy (Lcom/hexagontk/http/server/HttpServerPort;Lcom/hexagontk/http/handlers/HttpHandler;Lcom/hexagontk/http/server/HttpServerSettings;)Lcom/hexagontk/http/server/HttpServer; + public static synthetic fun copy$default (Lcom/hexagontk/http/server/HttpServer;Lcom/hexagontk/http/server/HttpServerPort;Lcom/hexagontk/http/handlers/HttpHandler;Lcom/hexagontk/http/server/HttpServerSettings;ILjava/lang/Object;)Lcom/hexagontk/http/server/HttpServer; public fun equals (Ljava/lang/Object;)Z public final fun getBinding ()Ljava/net/URL; - public final fun getHandler ()Lcom/hexagonkt/http/handlers/HttpHandler; + public final fun getHandler ()Lcom/hexagontk/http/handlers/HttpHandler; public final fun getPortName ()Ljava/lang/String; public final fun getRuntimePort ()I - public final fun getSettings ()Lcom/hexagonkt/http/server/HttpServerSettings; + public final fun getSettings ()Lcom/hexagontk/http/server/HttpServerSettings; public fun hashCode ()I public final fun start ()V public final fun started ()Z @@ -22,63 +22,63 @@ public final class com/hexagonkt/http/server/HttpServer : java/io/Closeable { public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/server/HttpServer$Companion { +public final class com/hexagontk/http/server/HttpServer$Companion { public final fun getBanner ()Ljava/lang/String; } -public final class com/hexagonkt/http/server/HttpServerFeature : java/lang/Enum { - public static final field SSE Lcom/hexagonkt/http/server/HttpServerFeature; - public static final field WEB_SOCKETS Lcom/hexagonkt/http/server/HttpServerFeature; - public static final field ZIP Lcom/hexagonkt/http/server/HttpServerFeature; +public final class com/hexagontk/http/server/HttpServerFeature : java/lang/Enum { + public static final field SSE Lcom/hexagontk/http/server/HttpServerFeature; + public static final field WEB_SOCKETS Lcom/hexagontk/http/server/HttpServerFeature; + public static final field ZIP Lcom/hexagontk/http/server/HttpServerFeature; public static fun getEntries ()Lkotlin/enums/EnumEntries; - public static fun valueOf (Ljava/lang/String;)Lcom/hexagonkt/http/server/HttpServerFeature; - public static fun values ()[Lcom/hexagonkt/http/server/HttpServerFeature; + public static fun valueOf (Ljava/lang/String;)Lcom/hexagontk/http/server/HttpServerFeature; + public static fun values ()[Lcom/hexagontk/http/server/HttpServerFeature; } -public abstract interface class com/hexagonkt/http/server/HttpServerPort { +public abstract interface class com/hexagontk/http/server/HttpServerPort { public abstract fun options ()Ljava/util/Map; public abstract fun runtimePort ()I public abstract fun shutDown ()V - public abstract fun startUp (Lcom/hexagonkt/http/server/HttpServer;)V + public abstract fun startUp (Lcom/hexagontk/http/server/HttpServer;)V public abstract fun started ()Z public abstract fun supportedFeatures ()Ljava/util/Set; public abstract fun supportedProtocols ()Ljava/util/Set; } -public final class com/hexagonkt/http/server/HttpServerSettings { +public final class com/hexagontk/http/server/HttpServerSettings { public fun ()V - public fun (Ljava/net/InetAddress;ILjava/lang/String;Lcom/hexagonkt/http/model/HttpProtocol;Lcom/hexagonkt/http/SslSettings;Ljava/lang/String;Z)V - public synthetic fun (Ljava/net/InetAddress;ILjava/lang/String;Lcom/hexagonkt/http/model/HttpProtocol;Lcom/hexagonkt/http/SslSettings;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Ljava/net/InetAddress;ILjava/lang/String;Lcom/hexagontk/http/model/HttpProtocol;Lcom/hexagontk/http/SslSettings;Ljava/lang/String;Z)V + public synthetic fun (Ljava/net/InetAddress;ILjava/lang/String;Lcom/hexagontk/http/model/HttpProtocol;Lcom/hexagontk/http/SslSettings;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ljava/net/InetAddress; public final fun component2 ()I public final fun component3 ()Ljava/lang/String; - public final fun component4 ()Lcom/hexagonkt/http/model/HttpProtocol; - public final fun component5 ()Lcom/hexagonkt/http/SslSettings; + public final fun component4 ()Lcom/hexagontk/http/model/HttpProtocol; + public final fun component5 ()Lcom/hexagontk/http/SslSettings; public final fun component6 ()Ljava/lang/String; public final fun component7 ()Z - public final fun copy (Ljava/net/InetAddress;ILjava/lang/String;Lcom/hexagonkt/http/model/HttpProtocol;Lcom/hexagonkt/http/SslSettings;Ljava/lang/String;Z)Lcom/hexagonkt/http/server/HttpServerSettings; - public static synthetic fun copy$default (Lcom/hexagonkt/http/server/HttpServerSettings;Ljava/net/InetAddress;ILjava/lang/String;Lcom/hexagonkt/http/model/HttpProtocol;Lcom/hexagonkt/http/SslSettings;Ljava/lang/String;ZILjava/lang/Object;)Lcom/hexagonkt/http/server/HttpServerSettings; + public final fun copy (Ljava/net/InetAddress;ILjava/lang/String;Lcom/hexagontk/http/model/HttpProtocol;Lcom/hexagontk/http/SslSettings;Ljava/lang/String;Z)Lcom/hexagontk/http/server/HttpServerSettings; + public static synthetic fun copy$default (Lcom/hexagontk/http/server/HttpServerSettings;Ljava/net/InetAddress;ILjava/lang/String;Lcom/hexagontk/http/model/HttpProtocol;Lcom/hexagontk/http/SslSettings;Ljava/lang/String;ZILjava/lang/Object;)Lcom/hexagontk/http/server/HttpServerSettings; public fun equals (Ljava/lang/Object;)Z public final fun getBanner ()Ljava/lang/String; public final fun getBindAddress ()Ljava/net/InetAddress; public final fun getBindPort ()I public final fun getBindUrl ()Ljava/net/URL; public final fun getContextPath ()Ljava/lang/String; - public final fun getProtocol ()Lcom/hexagonkt/http/model/HttpProtocol; - public final fun getSslSettings ()Lcom/hexagonkt/http/SslSettings; + public final fun getProtocol ()Lcom/hexagontk/http/model/HttpProtocol; + public final fun getSslSettings ()Lcom/hexagontk/http/SslSettings; public final fun getZip ()Z public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class com/hexagonkt/http/server/HttpServersKt { - public static final fun serve (Lcom/hexagonkt/http/server/HttpServerPort;Lcom/hexagonkt/http/handlers/HttpHandler;Lcom/hexagonkt/http/server/HttpServerSettings;)Lcom/hexagonkt/http/server/HttpServer; - public static final fun serve (Lcom/hexagonkt/http/server/HttpServerPort;Lcom/hexagonkt/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/server/HttpServer; - public static synthetic fun serve$default (Lcom/hexagonkt/http/server/HttpServerPort;Lcom/hexagonkt/http/handlers/HttpHandler;Lcom/hexagonkt/http/server/HttpServerSettings;ILjava/lang/Object;)Lcom/hexagonkt/http/server/HttpServer; - public static synthetic fun serve$default (Lcom/hexagonkt/http/server/HttpServerPort;Lcom/hexagonkt/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/server/HttpServer; +public final class com/hexagontk/http/server/HttpServersKt { + public static final fun serve (Lcom/hexagontk/http/server/HttpServerPort;Lcom/hexagontk/http/handlers/HttpHandler;Lcom/hexagontk/http/server/HttpServerSettings;)Lcom/hexagontk/http/server/HttpServer; + public static final fun serve (Lcom/hexagontk/http/server/HttpServerPort;Lcom/hexagontk/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/server/HttpServer; + public static synthetic fun serve$default (Lcom/hexagontk/http/server/HttpServerPort;Lcom/hexagontk/http/handlers/HttpHandler;Lcom/hexagontk/http/server/HttpServerSettings;ILjava/lang/Object;)Lcom/hexagontk/http/server/HttpServer; + public static synthetic fun serve$default (Lcom/hexagontk/http/server/HttpServerPort;Lcom/hexagontk/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/server/HttpServer; } -public final class com/hexagonkt/http/server/callbacks/CorsCallback : kotlin/jvm/functions/Function1 { +public final class com/hexagontk/http/server/callbacks/CorsCallback : kotlin/jvm/functions/Function1 { public static final field ALLOW_CREDENTIALS Ljava/lang/String; public static final field ALLOW_HEADERS Ljava/lang/String; public static final field ALLOW_ORIGIN Ljava/lang/String; @@ -86,57 +86,57 @@ public final class com/hexagonkt/http/server/callbacks/CorsCallback : kotlin/jvm public static final field MAX_AGE Ljava/lang/String; public static final field REQUEST_HEADERS Ljava/lang/String; public static final field REQUEST_METHOD Ljava/lang/String; - public fun (Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ZLcom/hexagonkt/http/model/HttpStatus;J)V - public synthetic fun (Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ZLcom/hexagonkt/http/model/HttpStatus;JILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun (Lkotlin/text/Regex;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ZLcom/hexagonkt/http/model/HttpStatus;J)V - public synthetic fun (Lkotlin/text/Regex;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ZLcom/hexagonkt/http/model/HttpStatus;JILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun invoke (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public fun (Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ZLcom/hexagontk/http/model/HttpStatus;J)V + public synthetic fun (Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ZLcom/hexagontk/http/model/HttpStatus;JILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lkotlin/text/Regex;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ZLcom/hexagontk/http/model/HttpStatus;J)V + public synthetic fun (Lkotlin/text/Regex;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ZLcom/hexagontk/http/model/HttpStatus;JILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun invoke (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; } -public final class com/hexagonkt/http/server/callbacks/DateCallback : kotlin/jvm/functions/Function1 { +public final class com/hexagontk/http/server/callbacks/DateCallback : kotlin/jvm/functions/Function1 { public fun ()V public fun (Ljava/lang/String;)V public synthetic fun (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun invoke (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public fun invoke (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; } -public final class com/hexagonkt/http/server/callbacks/FileCallback : kotlin/jvm/functions/Function1 { +public final class com/hexagontk/http/server/callbacks/FileCallback : kotlin/jvm/functions/Function1 { public fun (Ljava/io/File;)V public fun (Ljava/lang/String;)V - public fun invoke (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public fun invoke (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; } -public final class com/hexagonkt/http/server/callbacks/LoggingCallback : kotlin/jvm/functions/Function1 { +public final class com/hexagontk/http/server/callbacks/LoggingCallback : kotlin/jvm/functions/Function1 { public fun ()V - public fun (Ljava/lang/System$Logger$Level;Lcom/hexagonkt/core/logging/Logger;ZZ)V - public synthetic fun (Ljava/lang/System$Logger$Level;Lcom/hexagonkt/core/logging/Logger;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun invoke (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public fun (Ljava/lang/System$Logger$Level;Lcom/hexagontk/core/logging/Logger;ZZ)V + public synthetic fun (Ljava/lang/System$Logger$Level;Lcom/hexagontk/core/logging/Logger;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun invoke (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; } -public final class com/hexagonkt/http/server/callbacks/UrlCallback : kotlin/jvm/functions/Function1 { +public final class com/hexagontk/http/server/callbacks/UrlCallback : kotlin/jvm/functions/Function1 { public fun (Ljava/lang/String;)V public fun (Ljava/net/URL;)V - public fun invoke (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public fun invoke (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; } -public final class com/hexagonkt/http/server/handlers/CorsHandler : com/hexagonkt/http/handlers/HttpHandler { - public fun (Lcom/hexagonkt/http/server/callbacks/CorsCallback;)V - public fun (Ljava/lang/String;Lcom/hexagonkt/http/server/callbacks/CorsCallback;)V - public fun (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ZLcom/hexagonkt/http/model/HttpStatus;J)V - public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ZLcom/hexagonkt/http/model/HttpStatus;JILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun addPrefix (Ljava/lang/String;)Lcom/hexagonkt/http/handlers/HttpHandler; +public final class com/hexagontk/http/server/handlers/CorsHandler : com/hexagontk/http/handlers/HttpHandler { + public fun (Lcom/hexagontk/http/server/callbacks/CorsCallback;)V + public fun (Ljava/lang/String;Lcom/hexagontk/http/server/callbacks/CorsCallback;)V + public fun (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ZLcom/hexagontk/http/model/HttpStatus;J)V + public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ZLcom/hexagontk/http/model/HttpStatus;JILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun addPrefix (Ljava/lang/String;)Lcom/hexagontk/http/handlers/HttpHandler; public fun byMethod ()Ljava/util/Map; - public fun filter (Lcom/hexagonkt/http/model/HttpMethod;)Lcom/hexagonkt/http/handlers/HttpHandler; + public fun filter (Lcom/hexagontk/http/model/HttpMethod;)Lcom/hexagontk/http/handlers/HttpHandler; public fun getCallback ()Lkotlin/jvm/functions/Function1; - public fun getHandlerPredicate ()Lcom/hexagonkt/http/handlers/HttpPredicate; + public fun getHandlerPredicate ()Lcom/hexagontk/http/handlers/HttpPredicate; public fun getPredicate ()Lkotlin/jvm/functions/Function1; - public fun process (Lcom/hexagonkt/handlers/Context;)Lcom/hexagonkt/handlers/Context; - public fun process (Lcom/hexagonkt/http/model/HttpRequestPort;)Lcom/hexagonkt/http/handlers/HttpContext; - public fun processHttp (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext; + public fun process (Lcom/hexagontk/handlers/Context;)Lcom/hexagontk/handlers/Context; + public fun process (Lcom/hexagontk/http/model/HttpRequestPort;)Lcom/hexagontk/http/handlers/HttpContext; + public fun processHttp (Lcom/hexagontk/http/handlers/HttpContext;)Lcom/hexagontk/http/handlers/HttpContext; } diff --git a/http/http_server/src/jmh/kotlin/com/hexagonkt/http/server/callbacks/DateBenchmark.kt b/http/http_server/src/jmh/kotlin/com/hexagonkt/http/server/callbacks/DateBenchmark.kt index 7a52457cc0..eb6363f50c 100644 --- a/http/http_server/src/jmh/kotlin/com/hexagonkt/http/server/callbacks/DateBenchmark.kt +++ b/http/http_server/src/jmh/kotlin/com/hexagonkt/http/server/callbacks/DateBenchmark.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.server.callbacks +package com.hexagontk.http.server.callbacks -import com.hexagonkt.http.model.Header -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.toHttpFormat +import com.hexagontk.http.model.Header +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.toHttpFormat import org.openjdk.jmh.annotations.Benchmark import org.openjdk.jmh.annotations.Scope import org.openjdk.jmh.annotations.State diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServer.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServer.kt index d4a6964e13..97b0b0c70f 100644 --- a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServer.kt +++ b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServer.kt @@ -1,31 +1,31 @@ -package com.hexagonkt.http.server +package com.hexagontk.http.server -import com.hexagonkt.core.logging.Logger -import com.hexagonkt.core.Jvm.charset -import com.hexagonkt.core.Jvm.cpuCount -import com.hexagonkt.core.Jvm.hostName -import com.hexagonkt.core.Jvm.name -import com.hexagonkt.core.Jvm.version -import com.hexagonkt.core.Jvm.localeCode -import com.hexagonkt.http.model.HttpProtocol.HTTP2 +import com.hexagontk.core.logging.Logger +import com.hexagontk.core.Jvm.charset +import com.hexagontk.core.Jvm.cpuCount +import com.hexagontk.core.Jvm.hostName +import com.hexagontk.core.Jvm.name +import com.hexagontk.core.Jvm.version +import com.hexagontk.core.Jvm.localeCode +import com.hexagontk.http.model.HttpProtocol.HTTP2 import java.lang.Runtime.getRuntime -import com.hexagonkt.core.text.AnsiColor.BLUE -import com.hexagonkt.core.text.AnsiColor.CYAN -import com.hexagonkt.core.text.AnsiColor.DEFAULT -import com.hexagonkt.core.text.AnsiColor.MAGENTA -import com.hexagonkt.core.text.Ansi.RESET -import com.hexagonkt.core.text.AnsiEffect.BOLD -import com.hexagonkt.core.text.AnsiEffect.UNDERLINE -import com.hexagonkt.core.Jvm.timeZone -import com.hexagonkt.core.Jvm.totalMemory -import com.hexagonkt.core.Jvm.usedMemory -import com.hexagonkt.core.text.prependIndent -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.server.HttpServerFeature.ZIP -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.HandlerBuilder -import com.hexagonkt.http.handlers.path +import com.hexagontk.core.text.AnsiColor.BLUE +import com.hexagontk.core.text.AnsiColor.CYAN +import com.hexagontk.core.text.AnsiColor.DEFAULT +import com.hexagontk.core.text.AnsiColor.MAGENTA +import com.hexagontk.core.text.Ansi.RESET +import com.hexagontk.core.text.AnsiEffect.BOLD +import com.hexagontk.core.text.AnsiEffect.UNDERLINE +import com.hexagontk.core.Jvm.timeZone +import com.hexagontk.core.Jvm.totalMemory +import com.hexagontk.core.Jvm.usedMemory +import com.hexagontk.core.text.prependIndent +import com.hexagontk.core.urlOf +import com.hexagontk.http.server.HttpServerFeature.ZIP +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.HandlerBuilder +import com.hexagontk.http.handlers.path import java.io.Closeable import java.lang.System.nanoTime import java.net.URL diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerFeature.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerFeature.kt index bd6e266d0c..9c4813309f 100644 --- a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerFeature.kt +++ b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerFeature.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.server +package com.hexagontk.http.server /** * Toolkit feature that may or may not be implemented by a server adapter. diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerPort.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerPort.kt index e635ff8459..03dbf40b0f 100644 --- a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerPort.kt +++ b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerPort.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.server +package com.hexagontk.http.server -import com.hexagonkt.http.model.HttpProtocol +import com.hexagontk.http.model.HttpProtocol /** * Server instance of one kind. diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerSettings.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerSettings.kt index fa16fd4505..76a40c676c 100644 --- a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerSettings.kt +++ b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerSettings.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.server +package com.hexagontk.http.server -import com.hexagonkt.core.Jvm -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.SslSettings -import com.hexagonkt.http.model.HttpProtocol -import com.hexagonkt.http.model.HttpProtocol.HTTP +import com.hexagontk.core.Jvm +import com.hexagontk.core.urlOf +import com.hexagontk.http.SslSettings +import com.hexagontk.http.model.HttpProtocol +import com.hexagontk.http.model.HttpProtocol.HTTP import java.net.InetAddress import java.net.URL diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServers.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServers.kt index 141fad03a6..1c41c88f14 100644 --- a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServers.kt +++ b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServers.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.server +package com.hexagontk.http.server -import com.hexagonkt.http.handlers.HandlerBuilder -import com.hexagonkt.http.handlers.HttpHandler +import com.hexagontk.http.handlers.HandlerBuilder +import com.hexagontk.http.handlers.HttpHandler /** * Create a server and start it. diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/CorsCallback.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/CorsCallback.kt index 5dd39a1f09..3944cae9c7 100644 --- a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/CorsCallback.kt +++ b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/CorsCallback.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.http.server.callbacks - -import com.hexagonkt.core.text.Glob -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpMethod.Companion.ALL -import com.hexagonkt.http.model.HttpMethod.OPTIONS -import com.hexagonkt.http.model.HttpStatusType.SUCCESS -import com.hexagonkt.http.handlers.HttpContext +package com.hexagontk.http.server.callbacks + +import com.hexagontk.core.text.Glob +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpMethod.Companion.ALL +import com.hexagontk.http.model.HttpMethod.OPTIONS +import com.hexagontk.http.model.HttpStatusType.SUCCESS +import com.hexagontk.http.handlers.HttpContext /** * HTTP CORS callback. It holds info for CORS. diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/DateCallback.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/DateCallback.kt index 777de481a5..fa144b15ca 100644 --- a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/DateCallback.kt +++ b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/DateCallback.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.server.callbacks +package com.hexagontk.http.server.callbacks -import com.hexagonkt.http.model.Header -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.toHttpFormat +import com.hexagontk.http.model.Header +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.toHttpFormat import java.time.Instant import java.util.concurrent.atomic.AtomicLong import java.util.concurrent.atomic.AtomicReference diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/FileCallback.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/FileCallback.kt index b1735fb9bd..26a0f96eef 100644 --- a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/FileCallback.kt +++ b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/FileCallback.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.server.callbacks +package com.hexagontk.http.server.callbacks -import com.hexagonkt.core.logging.Logger -import com.hexagonkt.core.media.mediaTypeOfOrNull -import com.hexagonkt.core.require -import com.hexagonkt.http.model.ContentType -import com.hexagonkt.http.handlers.HttpContext +import com.hexagontk.core.logging.Logger +import com.hexagontk.core.media.mediaTypeOfOrNull +import com.hexagontk.core.require +import com.hexagontk.http.model.ContentType +import com.hexagontk.http.handlers.HttpContext import java.io.File /** diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/LoggingCallback.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/LoggingCallback.kt index cdcbd02be1..5bcd0721b7 100644 --- a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/LoggingCallback.kt +++ b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/LoggingCallback.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.server.callbacks +package com.hexagontk.http.server.callbacks -import com.hexagonkt.core.logging.Logger -import com.hexagonkt.http.model.* -import com.hexagonkt.http.handlers.HttpContext +import com.hexagontk.core.logging.Logger +import com.hexagontk.http.model.* +import com.hexagontk.http.handlers.HttpContext import java.lang.System.Logger.Level import kotlin.system.measureNanoTime diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/UrlCallback.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/UrlCallback.kt index 7b09606d2c..f58e6d47fa 100644 --- a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/UrlCallback.kt +++ b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/UrlCallback.kt @@ -1,12 +1,12 @@ -package com.hexagonkt.http.server.callbacks - -import com.hexagonkt.core.ResourceNotFoundException -import com.hexagonkt.core.logging.Logger -import com.hexagonkt.core.media.mediaTypeOfOrNull -import com.hexagonkt.core.require -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.model.ContentType -import com.hexagonkt.http.handlers.HttpContext +package com.hexagontk.http.server.callbacks + +import com.hexagontk.core.ResourceNotFoundException +import com.hexagontk.core.logging.Logger +import com.hexagontk.core.media.mediaTypeOfOrNull +import com.hexagontk.core.require +import com.hexagontk.core.urlOf +import com.hexagontk.http.model.ContentType +import com.hexagontk.http.handlers.HttpContext import java.net.URL class UrlCallback(private val url: URL) : (HttpContext) -> HttpContext { diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/handlers/CorsHandler.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/handlers/CorsHandler.kt index d7e79a5db7..d33859b564 100644 --- a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/handlers/CorsHandler.kt +++ b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/handlers/CorsHandler.kt @@ -1,13 +1,13 @@ -package com.hexagonkt.http.server.handlers +package com.hexagontk.http.server.handlers -import com.hexagonkt.http.handlers.FilterHandler -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.HttpPredicate -import com.hexagonkt.http.model.HttpMethod -import com.hexagonkt.http.model.HttpMethod.Companion.ALL -import com.hexagonkt.http.model.HttpStatus -import com.hexagonkt.http.model.NO_CONTENT_204 -import com.hexagonkt.http.server.callbacks.CorsCallback +import com.hexagontk.http.handlers.FilterHandler +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.HttpPredicate +import com.hexagontk.http.model.HttpMethod +import com.hexagontk.http.model.HttpMethod.Companion.ALL +import com.hexagontk.http.model.HttpStatus +import com.hexagontk.http.model.NO_CONTENT_204 +import com.hexagontk.http.server.callbacks.CorsCallback class CorsHandler(pattern: String, cors: CorsCallback) : HttpHandler by FilterHandler(HttpPredicate(pattern = pattern), cors) { diff --git a/http/http_server/src/main/kotlin/module-info.java b/http/http_server/src/main/kotlin/module-info.java index 7ced4f4fbc..1995853028 100644 --- a/http/http_server/src/main/kotlin/module-info.java +++ b/http/http_server/src/main/kotlin/module-info.java @@ -1,9 +1,9 @@ -module com.hexagonkt.http_server { +module com.hexagontk.http_server { - requires transitive com.hexagonkt.core; - requires transitive com.hexagonkt.http_handlers; + requires transitive com.hexagontk.core; + requires transitive com.hexagontk.http_handlers; - exports com.hexagonkt.http.server; - exports com.hexagonkt.http.server.callbacks; + exports com.hexagontk.http.server; + exports com.hexagontk.http.server.callbacks; } diff --git a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/CheatSheetTest.kt b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/CheatSheetTest.kt index cc357c4c12..adf3ae3151 100644 --- a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/CheatSheetTest.kt +++ b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/CheatSheetTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.server +package com.hexagontk.http.server import org.junit.jupiter.api.Test diff --git a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/HttpServerSettingsTest.kt b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/HttpServerSettingsTest.kt index b226de2ec3..f7aea4b916 100644 --- a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/HttpServerSettingsTest.kt +++ b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/HttpServerSettingsTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.server +package com.hexagontk.http.server -import com.hexagonkt.http.model.HttpProtocol.HTTP -import com.hexagonkt.http.model.HttpProtocol.HTTP2 +import com.hexagontk.http.model.HttpProtocol.HTTP +import com.hexagontk.http.model.HttpProtocol.HTTP2 import org.junit.jupiter.api.condition.DisabledOnOs import org.junit.jupiter.api.condition.OS.WINDOWS import org.junit.jupiter.api.Test diff --git a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/HttpServerTest.kt b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/HttpServerTest.kt index eed1208fd0..17986af3ea 100644 --- a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/HttpServerTest.kt +++ b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/HttpServerTest.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.server +package com.hexagontk.http.server -import com.hexagonkt.http.model.HttpProtocol.H2C -import com.hexagonkt.http.handlers.OnHandler -import com.hexagonkt.http.handlers.PathHandler +import com.hexagontk.http.model.HttpProtocol.H2C +import com.hexagontk.http.handlers.OnHandler +import com.hexagontk.http.handlers.PathHandler import org.junit.jupiter.api.Test import kotlin.test.assertContains import kotlin.test.assertEquals diff --git a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/VoidAdapter.kt b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/VoidAdapter.kt index 5ed6e95f6c..1db1fd589d 100644 --- a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/VoidAdapter.kt +++ b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/VoidAdapter.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.server +package com.hexagontk.http.server -import com.hexagonkt.http.model.HttpProtocol -import com.hexagonkt.http.model.HttpProtocol.H2C -import com.hexagonkt.http.server.HttpServerFeature.SSE +import com.hexagontk.http.model.HttpProtocol +import com.hexagontk.http.model.HttpProtocol.H2C +import com.hexagontk.http.server.HttpServerFeature.SSE internal object VoidAdapter : HttpServerPort { private var started = false diff --git a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/CorsCallbackTest.kt b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/CorsCallbackTest.kt index 18ba5a1469..d99b49ac34 100644 --- a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/CorsCallbackTest.kt +++ b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/CorsCallbackTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.server.callbacks +package com.hexagontk.http.server.callbacks -import com.hexagonkt.http.model.NOT_FOUND_404 +import com.hexagontk.http.model.NOT_FOUND_404 import java.lang.IllegalArgumentException import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/DateCallbackTest.kt b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/DateCallbackTest.kt index 60da5f9ff5..853900103f 100644 --- a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/DateCallbackTest.kt +++ b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/DateCallbackTest.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.http.server.callbacks +package com.hexagontk.http.server.callbacks -import com.hexagonkt.core.fail -import com.hexagonkt.core.require -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.toHttpFormat +import com.hexagontk.core.fail +import com.hexagontk.core.require +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.toHttpFormat import java.time.Instant import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/FileCallbackTest.kt b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/FileCallbackTest.kt index 96cb058f19..959ad8620e 100644 --- a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/FileCallbackTest.kt +++ b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/FileCallbackTest.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.server.callbacks +package com.hexagontk.http.server.callbacks -import com.hexagonkt.core.media.TEXT_MARKDOWN -import com.hexagonkt.http.model.* -import com.hexagonkt.http.patterns.TemplatePathPattern -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.handlers.HttpPredicate +import com.hexagontk.core.media.TEXT_MARKDOWN +import com.hexagontk.http.model.* +import com.hexagontk.http.patterns.TemplatePathPattern +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.handlers.HttpPredicate import org.junit.jupiter.api.Test import kotlin.IllegalStateException import kotlin.test.assertEquals diff --git a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/LoggingCallbackTest.kt b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/LoggingCallbackTest.kt index 3be1b2efaf..a2a67d2f53 100644 --- a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/LoggingCallbackTest.kt +++ b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/LoggingCallbackTest.kt @@ -1,14 +1,14 @@ -package com.hexagonkt.http.server.callbacks +package com.hexagontk.http.server.callbacks -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.media.TEXT_HTML -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.http.model.ContentType -import com.hexagonkt.http.model.Header -import com.hexagonkt.http.model.Headers -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.model.HttpResponse +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.media.TEXT_HTML +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.http.model.ContentType +import com.hexagontk.http.model.Header +import com.hexagontk.http.model.Headers +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.model.HttpResponse import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/UrlCallbackTest.kt b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/UrlCallbackTest.kt index c1ec53961a..0e5c565850 100644 --- a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/UrlCallbackTest.kt +++ b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/UrlCallbackTest.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.server.callbacks +package com.hexagontk.http.server.callbacks -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.http.model.* -import com.hexagonkt.http.patterns.TemplatePathPattern -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.handlers.HttpPredicate +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.http.model.* +import com.hexagontk.http.patterns.TemplatePathPattern +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.handlers.HttpPredicate import org.junit.jupiter.api.Test import kotlin.IllegalStateException import kotlin.test.assertEquals diff --git a/http/http_server_helidon/README.md b/http/http_server_helidon/README.md index b574b58b66..6105ff07ca 100644 --- a/http/http_server_helidon/README.md +++ b/http/http_server_helidon/README.md @@ -18,7 +18,7 @@ IMPORTANT: There is a [known bug] in this adapter. } dependencies { - implementation("com.hexagonkt:http_server_helidon:$hexagonVersion") + implementation("com.hexagontk:http_server_helidon:$hexagonVersion") } ``` @@ -26,11 +26,11 @@ IMPORTANT: There is a [known bug] in this adapter. ```xml - com.hexagonkt + com.hexagontk http_server_helidon $hexagonVersion ``` -# Package com.hexagonkt.http.server.helidon +# Package com.hexagontk.http.server.helidon Code implementing the Helidon HTTP server adapter. diff --git a/http/http_server_helidon/api/http_server_helidon.api b/http/http_server_helidon/api/http_server_helidon.api index 1bec7ad5c5..722a2ee302 100644 --- a/http/http_server_helidon/api/http_server_helidon.api +++ b/http/http_server_helidon/api/http_server_helidon.api @@ -1,50 +1,50 @@ -public final class com/hexagonkt/http/server/helidon/HelidonKt { - public static final fun serve (Lcom/hexagonkt/http/server/HttpServerSettings;Lcom/hexagonkt/http/handlers/HttpHandler;)Lcom/hexagonkt/http/server/HttpServer; - public static final fun serve (Lcom/hexagonkt/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/server/HttpServer; - public static synthetic fun serve$default (Lcom/hexagonkt/http/server/HttpServerSettings;Lcom/hexagonkt/http/handlers/HttpHandler;ILjava/lang/Object;)Lcom/hexagonkt/http/server/HttpServer; - public static synthetic fun serve$default (Lcom/hexagonkt/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/server/HttpServer; +public final class com/hexagontk/http/server/helidon/HelidonKt { + public static final fun serve (Lcom/hexagontk/http/server/HttpServerSettings;Lcom/hexagontk/http/handlers/HttpHandler;)Lcom/hexagontk/http/server/HttpServer; + public static final fun serve (Lcom/hexagontk/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/server/HttpServer; + public static synthetic fun serve$default (Lcom/hexagontk/http/server/HttpServerSettings;Lcom/hexagontk/http/handlers/HttpHandler;ILjava/lang/Object;)Lcom/hexagontk/http/server/HttpServer; + public static synthetic fun serve$default (Lcom/hexagontk/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/server/HttpServer; } -public final class com/hexagonkt/http/server/helidon/HelidonRequestAdapter : com/hexagonkt/http/model/HttpRequestPort { +public final class com/hexagontk/http/server/helidon/HelidonRequestAdapter : com/hexagontk/http/model/HttpRequestPort { public fun (Lio/helidon/http/Method;Lio/helidon/webserver/http/ServerRequest;)V - public fun authorization ()Lcom/hexagonkt/http/model/Authorization; + public fun authorization ()Lcom/hexagontk/http/model/Authorization; public fun bodyString ()Ljava/lang/String; public fun certificate ()Ljava/security/cert/X509Certificate; public fun cookiesMap ()Ljava/util/Map; public fun getAccept ()Ljava/util/List; - public fun getAuthorization ()Lcom/hexagonkt/http/model/Authorization; + public fun getAuthorization ()Lcom/hexagontk/http/model/Authorization; public fun getBody ()Ljava/lang/Object; public fun getCertificateChain ()Ljava/util/List; public fun getContentLength ()J - public fun getContentType ()Lcom/hexagonkt/http/model/ContentType; + public fun getContentType ()Lcom/hexagontk/http/model/ContentType; public fun getCookies ()Ljava/util/List; - public fun getFormParameters ()Lcom/hexagonkt/http/model/FormParameters; - public fun getHeaders ()Lcom/hexagonkt/http/model/Headers; + public fun getFormParameters ()Lcom/hexagontk/http/model/FormParameters; + public fun getHeaders ()Lcom/hexagontk/http/model/Headers; public fun getHost ()Ljava/lang/String; - public fun getMethod ()Lcom/hexagonkt/http/model/HttpMethod; + public fun getMethod ()Lcom/hexagontk/http/model/HttpMethod; public fun getParts ()Ljava/util/List; public fun getPath ()Ljava/lang/String; public fun getPort ()I - public fun getProtocol ()Lcom/hexagonkt/http/model/HttpProtocol; - public fun getQueryParameters ()Lcom/hexagonkt/http/model/QueryParameters; + public fun getProtocol ()Lcom/hexagontk/http/model/HttpProtocol; + public fun getQueryParameters ()Lcom/hexagontk/http/model/QueryParameters; public fun origin ()Ljava/lang/String; public fun partsMap ()Ljava/util/Map; - public fun plus (Lcom/hexagonkt/http/model/Cookie;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/FormParameter;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/FormParameters;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/Header;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/Headers;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/HttpPart;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/QueryParameter;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/QueryParameters;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Ljava/util/List;)Lcom/hexagonkt/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/Cookie;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/FormParameter;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/FormParameters;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/Header;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/Headers;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/HttpPart;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/QueryParameter;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/QueryParameters;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Ljava/util/List;)Lcom/hexagontk/http/model/HttpRequestPort; public fun referer ()Ljava/lang/String; public fun url ()Ljava/net/URL; public fun userAgent ()Ljava/lang/String; - public fun with (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Lcom/hexagonkt/http/model/HttpMethod;Lcom/hexagonkt/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagonkt/http/model/QueryParameters;Ljava/util/List;Lcom/hexagonkt/http/model/FormParameters;Ljava/util/List;Ljava/util/List;Lcom/hexagonkt/http/model/Authorization;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpRequestPort; + public fun with (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Lcom/hexagontk/http/model/HttpMethod;Lcom/hexagontk/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagontk/http/model/QueryParameters;Ljava/util/List;Lcom/hexagontk/http/model/FormParameters;Ljava/util/List;Ljava/util/List;Lcom/hexagontk/http/model/Authorization;Ljava/util/List;)Lcom/hexagontk/http/model/HttpRequestPort; } -public final class com/hexagonkt/http/server/helidon/HelidonServerAdapter : com/hexagonkt/http/server/HttpServerPort { +public final class com/hexagontk/http/server/helidon/HelidonServerAdapter : com/hexagontk/http/server/HttpServerPort { public static final field START_ERROR_MESSAGE Ljava/lang/String; public fun ()V public fun (IILjava/time/Duration;Ljava/time/Duration;ZZZZZZ)V @@ -52,7 +52,7 @@ public final class com/hexagonkt/http/server/helidon/HelidonServerAdapter : com/ public fun options ()Ljava/util/Map; public fun runtimePort ()I public fun shutDown ()V - public fun startUp (Lcom/hexagonkt/http/server/HttpServer;)V + public fun startUp (Lcom/hexagontk/http/server/HttpServer;)V public fun started ()Z public fun supportedFeatures ()Ljava/util/Set; public fun supportedProtocols ()Ljava/util/Set; diff --git a/http/http_server_helidon/src/main/kotlin/com/hexagonkt/http/server/helidon/Helidon.kt b/http/http_server_helidon/src/main/kotlin/com/hexagonkt/http/server/helidon/Helidon.kt index 2f9c8292c7..1cdfea37bf 100644 --- a/http/http_server_helidon/src/main/kotlin/com/hexagonkt/http/server/helidon/Helidon.kt +++ b/http/http_server_helidon/src/main/kotlin/com/hexagonkt/http/server/helidon/Helidon.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.server.helidon +package com.hexagontk.http.server.helidon -import com.hexagonkt.http.server.* -import com.hexagonkt.http.handlers.HandlerBuilder -import com.hexagonkt.http.handlers.HttpHandler +import com.hexagontk.http.server.* +import com.hexagontk.http.handlers.HandlerBuilder +import com.hexagontk.http.handlers.HttpHandler /** * Create a Helidon server and start it. It is a shortcut to avoid passing the adapter. diff --git a/http/http_server_helidon/src/main/kotlin/com/hexagonkt/http/server/helidon/HelidonRequestAdapter.kt b/http/http_server_helidon/src/main/kotlin/com/hexagonkt/http/server/helidon/HelidonRequestAdapter.kt index e6d9218684..2d4bb1d4a3 100644 --- a/http/http_server_helidon/src/main/kotlin/com/hexagonkt/http/server/helidon/HelidonRequestAdapter.kt +++ b/http/http_server_helidon/src/main/kotlin/com/hexagonkt/http/server/helidon/HelidonRequestAdapter.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.http.server.helidon +package com.hexagontk.http.server.helidon -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.core.media.MediaTypeGroup -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.Headers +import com.hexagontk.core.media.MediaType +import com.hexagontk.core.media.MediaTypeGroup +import com.hexagontk.http.model.* +import com.hexagontk.http.model.Headers import io.helidon.http.HeaderNames import io.helidon.http.Method import io.helidon.http.media.multipart.MultiPart diff --git a/http/http_server_helidon/src/main/kotlin/com/hexagonkt/http/server/helidon/HelidonServerAdapter.kt b/http/http_server_helidon/src/main/kotlin/com/hexagonkt/http/server/helidon/HelidonServerAdapter.kt index a88f145609..f4d09420f1 100644 --- a/http/http_server_helidon/src/main/kotlin/com/hexagonkt/http/server/helidon/HelidonServerAdapter.kt +++ b/http/http_server_helidon/src/main/kotlin/com/hexagonkt/http/server/helidon/HelidonServerAdapter.kt @@ -1,20 +1,20 @@ -package com.hexagonkt.http.server.helidon - -import com.hexagonkt.core.fieldsMapOf -import com.hexagonkt.core.security.createKeyManagerFactory -import com.hexagonkt.core.security.createTrustManagerFactory -import com.hexagonkt.core.toText -import com.hexagonkt.http.SslSettings -import com.hexagonkt.http.handlers.bodyToBytes -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.model.HttpProtocol -import com.hexagonkt.http.model.HttpProtocol.* -import com.hexagonkt.http.model.HttpResponse -import com.hexagonkt.http.model.HttpResponsePort -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.HttpServerFeature -import com.hexagonkt.http.server.HttpServerFeature.ZIP -import com.hexagonkt.http.server.HttpServerPort +package com.hexagontk.http.server.helidon + +import com.hexagontk.core.fieldsMapOf +import com.hexagontk.core.security.createKeyManagerFactory +import com.hexagontk.core.security.createTrustManagerFactory +import com.hexagontk.core.toText +import com.hexagontk.http.SslSettings +import com.hexagontk.http.handlers.bodyToBytes +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.model.HttpProtocol +import com.hexagontk.http.model.HttpProtocol.* +import com.hexagontk.http.model.HttpResponse +import com.hexagontk.http.model.HttpResponsePort +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.HttpServerFeature +import com.hexagontk.http.server.HttpServerFeature.ZIP +import com.hexagontk.http.server.HttpServerPort import io.helidon.common.socket.SocketOptions import io.helidon.http.Method import io.helidon.http.Status diff --git a/http/http_server_helidon/src/main/kotlin/module-info.java b/http/http_server_helidon/src/main/kotlin/module-info.java index d3982ec423..c3c3fb84eb 100644 --- a/http/http_server_helidon/src/main/kotlin/module-info.java +++ b/http/http_server_helidon/src/main/kotlin/module-info.java @@ -1,14 +1,14 @@ -module com.hexagonkt.http_server_helidon { +module com.hexagontk.http_server_helidon { requires transitive kotlin.stdlib; - requires transitive com.hexagonkt.http; - requires transitive com.hexagonkt.http_server; + requires transitive com.hexagontk.http; + requires transitive com.hexagontk.http_server; requires transitive io.helidon.common.parameters; requires transitive io.helidon.common.tls; requires transitive io.helidon.http; requires transitive io.helidon.http.media.multipart; requires transitive io.helidon.webserver.http2; - exports com.hexagonkt.http.server.helidon; + exports com.hexagontk.http.server.helidon; } diff --git a/http/http_server_helidon/src/test/kotlin/com/hexagonkt/http/server/helidon/AdapterExamplesTest.kt b/http/http_server_helidon/src/test/kotlin/com/hexagonkt/http/server/helidon/AdapterExamplesTest.kt index 2b59154fd8..726888dce0 100644 --- a/http/http_server_helidon/src/test/kotlin/com/hexagonkt/http/server/helidon/AdapterExamplesTest.kt +++ b/http/http_server_helidon/src/test/kotlin/com/hexagonkt/http/server/helidon/AdapterExamplesTest.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.server.helidon +package com.hexagontk.http.server.helidon -import com.hexagonkt.http.client.jetty.JettyClientAdapter -import com.hexagonkt.http.test.examples.* -import com.hexagonkt.serialization.jackson.JacksonTextFormat -import com.hexagonkt.serialization.jackson.json.Json -import com.hexagonkt.serialization.jackson.yaml.Yaml +import com.hexagontk.http.client.jetty.JettyClientAdapter +import com.hexagontk.http.test.examples.* +import com.hexagontk.serialization.jackson.JacksonTextFormat +import com.hexagontk.serialization.jackson.json.Json +import com.hexagontk.serialization.jackson.yaml.Yaml val clientAdapter: () -> JettyClientAdapter = ::JettyClientAdapter val serverAdapter: () -> HelidonServerAdapter = ::HelidonServerAdapter diff --git a/http/http_server_jetty/README.md b/http/http_server_jetty/README.md index cd886f315c..2d0aad89e8 100644 --- a/http/http_server_jetty/README.md +++ b/http/http_server_jetty/README.md @@ -15,7 +15,7 @@ } dependencies { - implementation("com.hexagonkt:http_server_jetty:$hexagonVersion") + implementation("com.hexagontk:http_server_jetty:$hexagonVersion") } ``` @@ -23,11 +23,11 @@ ```xml - com.hexagonkt + com.hexagontk http_server_jetty $hexagonVersion ``` -# Package com.hexagonkt.http.server.jetty +# Package com.hexagontk.http.server.jetty Code implementing the Jetty HTTP server adapter. diff --git a/http/http_server_jetty/api/http_server_jetty.api b/http/http_server_jetty/api/http_server_jetty.api index d0353f51a6..12cf2bf42c 100644 --- a/http/http_server_jetty/api/http_server_jetty.api +++ b/http/http_server_jetty/api/http_server_jetty.api @@ -1,18 +1,18 @@ -public final class com/hexagonkt/http/server/jetty/JettyKt { - public static final fun serve (Lcom/hexagonkt/http/server/HttpServerSettings;Lcom/hexagonkt/http/handlers/HttpHandler;)Lcom/hexagonkt/http/server/HttpServer; - public static final fun serve (Lcom/hexagonkt/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/server/HttpServer; - public static synthetic fun serve$default (Lcom/hexagonkt/http/server/HttpServerSettings;Lcom/hexagonkt/http/handlers/HttpHandler;ILjava/lang/Object;)Lcom/hexagonkt/http/server/HttpServer; - public static synthetic fun serve$default (Lcom/hexagonkt/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/server/HttpServer; +public final class com/hexagontk/http/server/jetty/JettyKt { + public static final fun serve (Lcom/hexagontk/http/server/HttpServerSettings;Lcom/hexagontk/http/handlers/HttpHandler;)Lcom/hexagontk/http/server/HttpServer; + public static final fun serve (Lcom/hexagontk/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/server/HttpServer; + public static synthetic fun serve$default (Lcom/hexagontk/http/server/HttpServerSettings;Lcom/hexagontk/http/handlers/HttpHandler;ILjava/lang/Object;)Lcom/hexagontk/http/server/HttpServer; + public static synthetic fun serve$default (Lcom/hexagontk/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/server/HttpServer; } -public final class com/hexagonkt/http/server/jetty/JettyServletAdapter : com/hexagonkt/http/server/HttpServerPort { +public final class com/hexagontk/http/server/jetty/JettyServletAdapter : com/hexagontk/http/server/HttpServerPort { public fun ()V public fun (IIIIZZZZ)V public synthetic fun (IIIIZZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun options ()Ljava/util/Map; public fun runtimePort ()I public fun shutDown ()V - public fun startUp (Lcom/hexagonkt/http/server/HttpServer;)V + public fun startUp (Lcom/hexagontk/http/server/HttpServer;)V public fun started ()Z public fun supportedFeatures ()Ljava/util/Set; public fun supportedProtocols ()Ljava/util/Set; diff --git a/http/http_server_jetty/src/main/kotlin/com/hexagonkt/http/server/jetty/Jetty.kt b/http/http_server_jetty/src/main/kotlin/com/hexagonkt/http/server/jetty/Jetty.kt index 19789faf56..5809739d28 100644 --- a/http/http_server_jetty/src/main/kotlin/com/hexagonkt/http/server/jetty/Jetty.kt +++ b/http/http_server_jetty/src/main/kotlin/com/hexagonkt/http/server/jetty/Jetty.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.server.jetty +package com.hexagontk.http.server.jetty -import com.hexagonkt.http.server.* -import com.hexagonkt.http.handlers.HandlerBuilder -import com.hexagonkt.http.handlers.HttpHandler +import com.hexagontk.http.server.* +import com.hexagontk.http.handlers.HandlerBuilder +import com.hexagontk.http.handlers.HttpHandler /** * Create a Jetty server and start it. It is a shortcut to avoid passing the adapter. diff --git a/http/http_server_jetty/src/main/kotlin/com/hexagonkt/http/server/jetty/JettyServletAdapter.kt b/http/http_server_jetty/src/main/kotlin/com/hexagonkt/http/server/jetty/JettyServletAdapter.kt index 6e7624bcaa..db0d25bc21 100644 --- a/http/http_server_jetty/src/main/kotlin/com/hexagonkt/http/server/jetty/JettyServletAdapter.kt +++ b/http/http_server_jetty/src/main/kotlin/com/hexagonkt/http/server/jetty/JettyServletAdapter.kt @@ -1,15 +1,15 @@ -package com.hexagonkt.http.server.jetty - -import com.hexagonkt.core.Jvm -import com.hexagonkt.core.fieldsMapOf -import com.hexagonkt.http.model.HttpProtocol -import com.hexagonkt.http.model.HttpProtocol.* -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.HttpServerFeature -import com.hexagonkt.http.server.HttpServerFeature.ZIP -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.server.servlet.ServletFilter +package com.hexagontk.http.server.jetty + +import com.hexagontk.core.Jvm +import com.hexagontk.core.fieldsMapOf +import com.hexagontk.http.model.HttpProtocol +import com.hexagontk.http.model.HttpProtocol.* +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.HttpServerFeature +import com.hexagontk.http.server.HttpServerFeature.ZIP +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.server.servlet.ServletFilter import jakarta.servlet.DispatcherType import jakarta.servlet.MultipartConfigElement import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory diff --git a/http/http_server_jetty/src/main/kotlin/module-info.java b/http/http_server_jetty/src/main/kotlin/module-info.java index d9a1afab3a..afc759b2ca 100644 --- a/http/http_server_jetty/src/main/kotlin/module-info.java +++ b/http/http_server_jetty/src/main/kotlin/module-info.java @@ -1,15 +1,15 @@ -module com.hexagonkt.http_server_jetty { +module com.hexagontk.http_server_jetty { requires transitive kotlin.stdlib; - requires transitive com.hexagonkt.http; - requires transitive com.hexagonkt.http_server; - requires transitive com.hexagonkt.http_server_servlet; + requires transitive com.hexagontk.http; + requires transitive com.hexagontk.http_server; + requires transitive com.hexagontk.http_server_servlet; requires transitive jakarta.servlet; requires transitive org.eclipse.jetty.alpn.server; requires transitive org.eclipse.jetty.ee10.servlet; requires transitive org.eclipse.jetty.util; requires transitive org.eclipse.jetty.http2.server; - exports com.hexagonkt.http.server.jetty; + exports com.hexagontk.http.server.jetty; } diff --git a/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/AdapterExamplesTest.kt b/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/AdapterExamplesTest.kt index 8dad689f4f..2e5f426505 100644 --- a/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/AdapterExamplesTest.kt +++ b/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/AdapterExamplesTest.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.server.jetty +package com.hexagontk.http.server.jetty -import com.hexagonkt.http.client.jetty.JettyClientAdapter -import com.hexagonkt.http.test.examples.* -import com.hexagonkt.serialization.jackson.JacksonTextFormat -import com.hexagonkt.serialization.jackson.json.Json -import com.hexagonkt.serialization.jackson.yaml.Yaml +import com.hexagontk.http.client.jetty.JettyClientAdapter +import com.hexagontk.http.test.examples.* +import com.hexagontk.serialization.jackson.JacksonTextFormat +import com.hexagontk.serialization.jackson.json.Json +import com.hexagontk.serialization.jackson.yaml.Yaml val clientAdapter: () -> JettyClientAdapter = ::JettyClientAdapter val serverAdapter: () -> JettyServletAdapter = ::JettyServletAdapter diff --git a/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/HelloWorldTest.kt b/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/HelloWorldTest.kt index 6872c53656..046d3078c7 100644 --- a/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/HelloWorldTest.kt +++ b/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/HelloWorldTest.kt @@ -1,24 +1,24 @@ @file:Suppress("UnusedImport") // Unused import left for the sake of documentation completeness -package com.hexagonkt.http.server.jetty +package com.hexagontk.http.server.jetty -import com.hexagonkt.http.client.jetty.JettyClientAdapter -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.model.OK_200 +import com.hexagontk.http.client.jetty.JettyClientAdapter +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.model.OK_200 import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS import kotlin.test.assertEquals -import com.hexagonkt.core.urlOf +import com.hexagontk.core.urlOf // hello_world -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.http.model.ContentType -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.jetty.serve +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.http.model.ContentType +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.jetty.serve lateinit var server: HttpServer diff --git a/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/JettyPocWsServerTest.kt b/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/JettyPocWsServerTest.kt index f0bbdd9b12..8ffddb4036 100644 --- a/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/JettyPocWsServerTest.kt +++ b/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/JettyPocWsServerTest.kt @@ -1,19 +1,19 @@ -package com.hexagonkt.http.server.jetty +package com.hexagontk.http.server.jetty -import com.hexagonkt.core.urlOf +import com.hexagontk.core.urlOf import jakarta.servlet.* import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.ServerConnector import org.eclipse.jetty.ee10.servlet.ServletContextHandler import java.util.* -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.client.jetty.ws.JettyWsClientAdapter -import com.hexagonkt.http.model.HttpMethod.GET -import com.hexagonkt.http.model.ws.NORMAL -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.handlers.AfterHandler -import com.hexagonkt.http.handlers.PathHandler +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.client.jetty.ws.JettyWsClientAdapter +import com.hexagontk.http.model.HttpMethod.GET +import com.hexagontk.http.model.ws.NORMAL +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.handlers.AfterHandler +import com.hexagontk.http.handlers.PathHandler import jakarta.websocket.CloseReason import jakarta.websocket.CloseReason.CloseCodes import jakarta.websocket.OnClose diff --git a/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/JettyServletAdapterTest.kt b/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/JettyServletAdapterTest.kt index 3f72e84a8e..1d715aed4d 100644 --- a/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/JettyServletAdapterTest.kt +++ b/http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/JettyServletAdapterTest.kt @@ -1,13 +1,13 @@ -package com.hexagonkt.http.server.jetty +package com.hexagontk.http.server.jetty -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.client.jetty.ws.JettyWsClientAdapter -import com.hexagonkt.http.model.ContentType -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.handlers.path +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.core.urlOf +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.client.jetty.ws.JettyWsClientAdapter +import com.hexagontk.http.model.ContentType +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.handlers.path import org.junit.jupiter.api.Test import org.junit.jupiter.api.condition.EnabledForJreRange import org.junit.jupiter.api.condition.JRE.JAVA_17 diff --git a/http/http_server_netty/README.md b/http/http_server_netty/README.md index 5cc7efca4d..441fc161db 100644 --- a/http/http_server_netty/README.md +++ b/http/http_server_netty/README.md @@ -15,7 +15,7 @@ } dependencies { - implementation("com.hexagonkt:http_server_netty:$hexagonVersion") + implementation("com.hexagontk:http_server_netty:$hexagonVersion") } ``` @@ -23,11 +23,11 @@ ```xml - com.hexagonkt + com.hexagontk http_server_netty $hexagonVersion ``` -# Package com.hexagonkt.http.server.netty +# Package com.hexagontk.http.server.netty Code implementing the Netty HTTP server adapter. diff --git a/http/http_server_netty/api/http_server_netty.api b/http/http_server_netty/api/http_server_netty.api index 4111d55199..ea58fbe4e1 100644 --- a/http/http_server_netty/api/http_server_netty.api +++ b/http/http_server_netty/api/http_server_netty.api @@ -1,50 +1,50 @@ -public final class com/hexagonkt/http/server/netty/NettyKt { - public static final fun serve (Lcom/hexagonkt/http/server/HttpServerSettings;Lcom/hexagonkt/http/handlers/HttpHandler;)Lcom/hexagonkt/http/server/HttpServer; - public static final fun serve (Lcom/hexagonkt/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;)Lcom/hexagonkt/http/server/HttpServer; - public static synthetic fun serve$default (Lcom/hexagonkt/http/server/HttpServerSettings;Lcom/hexagonkt/http/handlers/HttpHandler;ILjava/lang/Object;)Lcom/hexagonkt/http/server/HttpServer; - public static synthetic fun serve$default (Lcom/hexagonkt/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagonkt/http/server/HttpServer; +public final class com/hexagontk/http/server/netty/NettyKt { + public static final fun serve (Lcom/hexagontk/http/server/HttpServerSettings;Lcom/hexagontk/http/handlers/HttpHandler;)Lcom/hexagontk/http/server/HttpServer; + public static final fun serve (Lcom/hexagontk/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;)Lcom/hexagontk/http/server/HttpServer; + public static synthetic fun serve$default (Lcom/hexagontk/http/server/HttpServerSettings;Lcom/hexagontk/http/handlers/HttpHandler;ILjava/lang/Object;)Lcom/hexagontk/http/server/HttpServer; + public static synthetic fun serve$default (Lcom/hexagontk/http/server/HttpServerSettings;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/hexagontk/http/server/HttpServer; } -public final class com/hexagonkt/http/server/netty/NettyRequestAdapter : com/hexagonkt/http/model/HttpRequestPort { +public final class com/hexagontk/http/server/netty/NettyRequestAdapter : com/hexagontk/http/model/HttpRequestPort { public fun (Lio/netty/handler/codec/http/HttpMethod;Lio/netty/handler/codec/http/HttpRequest;Ljava/util/List;Lio/netty/channel/Channel;Lio/netty/handler/codec/http/HttpHeaders;)V - public fun authorization ()Lcom/hexagonkt/http/model/Authorization; + public fun authorization ()Lcom/hexagontk/http/model/Authorization; public fun bodyString ()Ljava/lang/String; public fun certificate ()Ljava/security/cert/X509Certificate; public fun cookiesMap ()Ljava/util/Map; public fun getAccept ()Ljava/util/List; - public fun getAuthorization ()Lcom/hexagonkt/http/model/Authorization; + public fun getAuthorization ()Lcom/hexagontk/http/model/Authorization; public fun getBody ()Ljava/lang/Object; public fun getCertificateChain ()Ljava/util/List; public fun getContentLength ()J - public fun getContentType ()Lcom/hexagonkt/http/model/ContentType; + public fun getContentType ()Lcom/hexagontk/http/model/ContentType; public fun getCookies ()Ljava/util/List; - public fun getFormParameters ()Lcom/hexagonkt/http/model/FormParameters; - public fun getHeaders ()Lcom/hexagonkt/http/model/Headers; + public fun getFormParameters ()Lcom/hexagontk/http/model/FormParameters; + public fun getHeaders ()Lcom/hexagontk/http/model/Headers; public fun getHost ()Ljava/lang/String; - public fun getMethod ()Lcom/hexagonkt/http/model/HttpMethod; + public fun getMethod ()Lcom/hexagontk/http/model/HttpMethod; public fun getParts ()Ljava/util/List; public fun getPath ()Ljava/lang/String; public fun getPort ()I - public fun getProtocol ()Lcom/hexagonkt/http/model/HttpProtocol; - public fun getQueryParameters ()Lcom/hexagonkt/http/model/QueryParameters; + public fun getProtocol ()Lcom/hexagontk/http/model/HttpProtocol; + public fun getQueryParameters ()Lcom/hexagontk/http/model/QueryParameters; public fun origin ()Ljava/lang/String; public fun partsMap ()Ljava/util/Map; - public fun plus (Lcom/hexagonkt/http/model/Cookie;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/FormParameter;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/FormParameters;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/Header;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/Headers;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/HttpPart;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/QueryParameter;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Lcom/hexagonkt/http/model/QueryParameters;)Lcom/hexagonkt/http/model/HttpRequestPort; - public fun plus (Ljava/util/List;)Lcom/hexagonkt/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/Cookie;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/FormParameter;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/FormParameters;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/Header;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/Headers;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/HttpPart;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/QueryParameter;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Lcom/hexagontk/http/model/QueryParameters;)Lcom/hexagontk/http/model/HttpRequestPort; + public fun plus (Ljava/util/List;)Lcom/hexagontk/http/model/HttpRequestPort; public fun referer ()Ljava/lang/String; public fun url ()Ljava/net/URL; public fun userAgent ()Ljava/lang/String; - public fun with (Ljava/lang/Object;Lcom/hexagonkt/http/model/Headers;Lcom/hexagonkt/http/model/ContentType;Lcom/hexagonkt/http/model/HttpMethod;Lcom/hexagonkt/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagonkt/http/model/QueryParameters;Ljava/util/List;Lcom/hexagonkt/http/model/FormParameters;Ljava/util/List;Ljava/util/List;Lcom/hexagonkt/http/model/Authorization;Ljava/util/List;)Lcom/hexagonkt/http/model/HttpRequestPort; + public fun with (Ljava/lang/Object;Lcom/hexagontk/http/model/Headers;Lcom/hexagontk/http/model/ContentType;Lcom/hexagontk/http/model/HttpMethod;Lcom/hexagontk/http/model/HttpProtocol;Ljava/lang/String;ILjava/lang/String;Lcom/hexagontk/http/model/QueryParameters;Ljava/util/List;Lcom/hexagontk/http/model/FormParameters;Ljava/util/List;Ljava/util/List;Lcom/hexagontk/http/model/Authorization;Ljava/util/List;)Lcom/hexagontk/http/model/HttpRequestPort; } -public class com/hexagonkt/http/server/netty/NettyServerAdapter : com/hexagonkt/http/server/HttpServerPort { +public class com/hexagontk/http/server/netty/NettyServerAdapter : com/hexagontk/http/server/HttpServerPort { public fun ()V public fun (IIIIZZJJZZZZ)V public synthetic fun (IIIIZZJJZZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -53,7 +53,7 @@ public class com/hexagonkt/http/server/netty/NettyServerAdapter : com/hexagonkt/ public fun runtimePort ()I public fun serverBootstrapSupplier (Lio/netty/channel/MultithreadEventLoopGroup;Lio/netty/channel/MultithreadEventLoopGroup;)Lio/netty/bootstrap/ServerBootstrap; public fun shutDown ()V - public fun startUp (Lcom/hexagonkt/http/server/HttpServer;)V + public fun startUp (Lcom/hexagontk/http/server/HttpServer;)V public fun started ()Z public fun supportedFeatures ()Ljava/util/Set; public fun supportedProtocols ()Ljava/util/Set; diff --git a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/HttpChannelInitializer.kt b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/HttpChannelInitializer.kt index c933958108..78280aa2a7 100644 --- a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/HttpChannelInitializer.kt +++ b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/HttpChannelInitializer.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.server.netty +package com.hexagontk.http.server.netty -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.server.HttpServerSettings +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.server.HttpServerSettings import io.netty.channel.ChannelInitializer import io.netty.channel.socket.SocketChannel import io.netty.handler.codec.http.* diff --git a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/HttpsChannelInitializer.kt b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/HttpsChannelInitializer.kt index 8005e05400..97846d461d 100644 --- a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/HttpsChannelInitializer.kt +++ b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/HttpsChannelInitializer.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.server.netty +package com.hexagontk.http.server.netty -import com.hexagonkt.http.SslSettings -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.server.HttpServerSettings +import com.hexagontk.http.SslSettings +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.server.HttpServerSettings import io.netty.channel.ChannelInitializer import io.netty.channel.socket.SocketChannel import io.netty.handler.codec.http.* diff --git a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/Netty.kt b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/Netty.kt index a910f38d6b..73f497b628 100644 --- a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/Netty.kt +++ b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/Netty.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.server.netty +package com.hexagontk.http.server.netty -import com.hexagonkt.http.server.* -import com.hexagonkt.http.handlers.HandlerBuilder -import com.hexagonkt.http.handlers.HttpHandler +import com.hexagontk.http.server.* +import com.hexagontk.http.handlers.HandlerBuilder +import com.hexagontk.http.handlers.HttpHandler /** * Create a Netty server and start it. It is a shortcut to avoid passing the adapter. diff --git a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyRequestAdapter.kt b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyRequestAdapter.kt index 260af5a8df..7078e08b66 100644 --- a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyRequestAdapter.kt +++ b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyRequestAdapter.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.http.server.netty +package com.hexagontk.http.server.netty -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.Headers -import com.hexagonkt.http.model.Headers as HxHttpHeaders -import com.hexagonkt.http.parseContentType +import com.hexagontk.http.model.* +import com.hexagontk.http.model.Headers +import com.hexagontk.http.model.Headers as HxHttpHeaders +import com.hexagontk.http.parseContentType import io.netty.buffer.ByteBufHolder import io.netty.buffer.ByteBufUtil import io.netty.buffer.Unpooled @@ -89,9 +89,9 @@ class NettyRequestAdapter( override val path: String by lazy { URI(req.uri()).path } - override val cookies: List by lazy { + override val cookies: List by lazy { val cookieHeader: String = nettyHeaders.get(COOKIE) - ?: return@lazy emptyList() + ?: return@lazy emptyList() val cookies: Set = ServerCookieDecoder.STRICT.decode(cookieHeader) @@ -151,7 +151,7 @@ class NettyRequestAdapter( queryParameters: QueryParameters, parts: List, formParameters: FormParameters, - cookies: List, + cookies: List, accept: List, authorization: Authorization?, certificateChain: List diff --git a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerAdapter.kt b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerAdapter.kt index 88a1260495..db5169fc25 100644 --- a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerAdapter.kt +++ b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerAdapter.kt @@ -1,18 +1,18 @@ -package com.hexagonkt.http.server.netty - -import com.hexagonkt.core.Jvm -import com.hexagonkt.core.fieldsMapOf -import com.hexagonkt.core.security.createKeyManagerFactory -import com.hexagonkt.core.security.createTrustManagerFactory -import com.hexagonkt.http.SslSettings -import com.hexagonkt.http.model.HttpProtocol -import com.hexagonkt.http.model.HttpProtocol.* -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.HttpServerFeature -import com.hexagonkt.http.server.HttpServerFeature.* -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.handlers.HttpHandler +package com.hexagontk.http.server.netty + +import com.hexagontk.core.Jvm +import com.hexagontk.core.fieldsMapOf +import com.hexagontk.core.security.createKeyManagerFactory +import com.hexagontk.core.security.createTrustManagerFactory +import com.hexagontk.http.SslSettings +import com.hexagontk.http.model.HttpProtocol +import com.hexagontk.http.model.HttpProtocol.* +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.HttpServerFeature +import com.hexagontk.http.server.HttpServerFeature.* +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.handlers.HttpHandler import io.netty.bootstrap.ServerBootstrap import io.netty.channel.* import io.netty.channel.nio.NioEventLoopGroup diff --git a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerHandler.kt b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerHandler.kt index 26583b8518..a3a876775f 100644 --- a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerHandler.kt +++ b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerHandler.kt @@ -1,14 +1,14 @@ -package com.hexagonkt.http.server.netty - -import com.hexagonkt.handlers.Context -import com.hexagonkt.http.handlers.bodyToBytes -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.Cookie -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.model.CookieSameSite.* -import com.hexagonkt.http.model.HttpCall -import com.hexagonkt.http.model.HttpResponse +package com.hexagontk.http.server.netty + +import com.hexagontk.handlers.Context +import com.hexagontk.http.handlers.bodyToBytes +import com.hexagontk.http.model.* +import com.hexagontk.http.model.Cookie +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.model.CookieSameSite.* +import com.hexagontk.http.model.HttpCall +import com.hexagontk.http.model.HttpResponse import io.netty.buffer.Unpooled import io.netty.channel.Channel import io.netty.channel.ChannelFutureListener.CLOSE @@ -31,7 +31,7 @@ import io.netty.handler.ssl.SslHandler import io.netty.handler.ssl.SslHandshakeCompletionEvent import java.security.cert.X509Certificate import java.util.concurrent.Flow.* -import com.hexagonkt.http.model.HttpRequest as HexagonHttpRequest +import com.hexagontk.http.model.HttpRequest as HexagonHttpRequest internal class NettyServerHandler( private val handlers: Map, diff --git a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyWebSocketHandler.kt b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyWebSocketHandler.kt index 5079dbf4db..bc1d6f1747 100644 --- a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyWebSocketHandler.kt +++ b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyWebSocketHandler.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.server.netty +package com.hexagontk.http.server.netty -import com.hexagonkt.http.model.ws.WsSession +import com.hexagontk.http.model.ws.WsSession import io.netty.channel.ChannelHandlerContext import io.netty.channel.ChannelInboundHandlerAdapter import io.netty.handler.codec.http.websocketx.* diff --git a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyWsSession.kt b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyWsSession.kt index b83a1f8bfd..d618b78df5 100644 --- a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyWsSession.kt +++ b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyWsSession.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.server.netty +package com.hexagontk.http.server.netty -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.model.HttpRequestPort -import com.hexagonkt.http.model.ws.WsSession +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.model.HttpRequestPort +import com.hexagontk.http.model.ws.WsSession import io.netty.buffer.Unpooled import io.netty.channel.ChannelHandlerContext import io.netty.handler.codec.http.websocketx.* diff --git a/http/http_server_netty/src/main/kotlin/module-info.java b/http/http_server_netty/src/main/kotlin/module-info.java index 16ae791cb6..b995c6b194 100644 --- a/http/http_server_netty/src/main/kotlin/module-info.java +++ b/http/http_server_netty/src/main/kotlin/module-info.java @@ -1,9 +1,9 @@ -module com.hexagonkt.http_server_netty { +module com.hexagontk.http_server_netty { requires transitive kotlin.stdlib; - requires transitive com.hexagonkt.http; - requires transitive com.hexagonkt.http_server; + requires transitive com.hexagontk.http; + requires transitive com.hexagontk.http_server; requires io.netty.common; requires io.netty.buffer; @@ -12,5 +12,5 @@ requires io.netty.handler; requires io.netty.transport; - exports com.hexagonkt.http.server.netty; + exports com.hexagontk.http.server.netty; } diff --git a/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/AdapterExamplesTest.kt b/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/AdapterExamplesTest.kt index 780fcc9fb5..dad28bb07f 100644 --- a/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/AdapterExamplesTest.kt +++ b/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/AdapterExamplesTest.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.server.netty +package com.hexagontk.http.server.netty -import com.hexagonkt.http.client.jetty.ws.JettyWsClientAdapter -import com.hexagonkt.http.test.examples.* -import com.hexagonkt.serialization.jackson.JacksonTextFormat -import com.hexagonkt.serialization.jackson.json.Json -import com.hexagonkt.serialization.jackson.yaml.Yaml +import com.hexagontk.http.client.jetty.ws.JettyWsClientAdapter +import com.hexagontk.http.test.examples.* +import com.hexagontk.serialization.jackson.JacksonTextFormat +import com.hexagontk.serialization.jackson.json.Json +import com.hexagontk.serialization.jackson.yaml.Yaml import org.junit.jupiter.api.condition.DisabledInNativeImage // TODO Assert context methods (request.method, request.protocol...) diff --git a/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/NettyServerHandlerTest.kt b/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/NettyServerHandlerTest.kt index 1eb5de514a..6f6371a64a 100644 --- a/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/NettyServerHandlerTest.kt +++ b/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/NettyServerHandlerTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.server.netty +package com.hexagontk.http.server.netty -import com.hexagonkt.http.model.* +import com.hexagontk.http.model.* import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.codec.http.HttpResponseStatus.* import org.junit.jupiter.api.Test diff --git a/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/WebSocket.kt b/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/WebSocket.kt index fdf59c6586..cfcacb1866 100644 --- a/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/WebSocket.kt +++ b/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/WebSocket.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.http.server.netty +package com.hexagontk.http.server.netty -import com.hexagonkt.core.logging.logger -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.model.ServerEvent -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.callbacks.UrlCallback -import com.hexagonkt.http.model.ws.WsSession +import com.hexagontk.core.logging.logger +import com.hexagontk.core.urlOf +import com.hexagontk.http.model.ServerEvent +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.callbacks.UrlCallback +import com.hexagontk.http.model.ws.WsSession import java.util.concurrent.* import java.util.concurrent.TimeUnit.MILLISECONDS import java.util.function.Supplier diff --git a/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/poc/NettyWsClientTest.kt b/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/poc/NettyWsClientTest.kt index f629e5c9b4..878254ec30 100644 --- a/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/poc/NettyWsClientTest.kt +++ b/http/http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/poc/NettyWsClientTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.http.server.netty.poc +package com.hexagontk.http.server.netty.poc -import com.hexagonkt.http.server.netty.serve +import com.hexagontk.http.server.netty.serve import io.netty.bootstrap.Bootstrap import io.netty.channel.* import io.netty.channel.nio.NioEventLoopGroup diff --git a/http/http_server_netty_epoll/README.md b/http/http_server_netty_epoll/README.md index 0b4c2d29c9..75139f140e 100644 --- a/http/http_server_netty_epoll/README.md +++ b/http/http_server_netty_epoll/README.md @@ -15,7 +15,7 @@ } dependencies { - implementation("com.hexagonkt:http_server_netty_epoll:$hexagonVersion") + implementation("com.hexagontk:http_server_netty_epoll:$hexagonVersion") // $arch could be 'x86_64' among other linux architectures implementation("io.netty:netty-transport-native-epoll:$nettyVersion:linux-$arch") } @@ -25,7 +25,7 @@ ```xml - com.hexagonkt + com.hexagontk http_server_netty_epoll $hexagonVersion @@ -38,5 +38,5 @@ ``` -# Package com.hexagonkt.http.server.netty.epoll +# Package com.hexagontk.http.server.netty.epoll Code implementing the Netty HTTP server adapter using Epoll transport. diff --git a/http/http_server_netty_epoll/api/http_server_netty_epoll.api b/http/http_server_netty_epoll/api/http_server_netty_epoll.api index 8893262011..5dba006158 100644 --- a/http/http_server_netty_epoll/api/http_server_netty_epoll.api +++ b/http/http_server_netty_epoll/api/http_server_netty_epoll.api @@ -1,4 +1,4 @@ -public final class com/hexagonkt/http/server/netty/epoll/NettyEpollServerAdapter : com/hexagonkt/http/server/netty/NettyServerAdapter { +public final class com/hexagontk/http/server/netty/epoll/NettyEpollServerAdapter : com/hexagontk/http/server/netty/NettyServerAdapter { public fun ()V public fun (IIIIZZJJZZZZ)V public synthetic fun (IIIIZZJJZZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V diff --git a/http/http_server_netty_epoll/src/main/kotlin/com/hexagonkt/http/server/netty/epoll/NettyEpollServerAdapter.kt b/http/http_server_netty_epoll/src/main/kotlin/com/hexagonkt/http/server/netty/epoll/NettyEpollServerAdapter.kt index 293ffb33b2..5a916158cc 100644 --- a/http/http_server_netty_epoll/src/main/kotlin/com/hexagonkt/http/server/netty/epoll/NettyEpollServerAdapter.kt +++ b/http/http_server_netty_epoll/src/main/kotlin/com/hexagonkt/http/server/netty/epoll/NettyEpollServerAdapter.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.server.netty.epoll +package com.hexagontk.http.server.netty.epoll -import com.hexagonkt.core.Jvm -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.netty.NettyServerAdapter +import com.hexagontk.core.Jvm +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.netty.NettyServerAdapter import io.netty.bootstrap.ServerBootstrap import io.netty.channel.Channel import io.netty.channel.ChannelOption diff --git a/http/http_server_netty_epoll/src/main/kotlin/module-info.java b/http/http_server_netty_epoll/src/main/kotlin/module-info.java index a8e649af5b..d3b2fe5e42 100644 --- a/http/http_server_netty_epoll/src/main/kotlin/module-info.java +++ b/http/http_server_netty_epoll/src/main/kotlin/module-info.java @@ -1,7 +1,7 @@ -module com.hexagonkt.http_server_netty_epoll { +module com.hexagontk.http_server_netty_epoll { - requires transitive com.hexagonkt.http_server_netty; + requires transitive com.hexagontk.http_server_netty; requires io.netty.buffer; requires io.netty.codec; @@ -10,5 +10,5 @@ requires io.netty.transport; requires io.netty.transport.classes.epoll; - exports com.hexagonkt.http.server.netty.epoll; + exports com.hexagontk.http.server.netty.epoll; } diff --git a/http/http_server_netty_epoll/src/test/kotlin/com/hexagonkt/http/server/netty/epoll/AdapterExamplesTest.kt b/http/http_server_netty_epoll/src/test/kotlin/com/hexagonkt/http/server/netty/epoll/AdapterExamplesTest.kt index 966cfbc43e..1a460e66e2 100644 --- a/http/http_server_netty_epoll/src/test/kotlin/com/hexagonkt/http/server/netty/epoll/AdapterExamplesTest.kt +++ b/http/http_server_netty_epoll/src/test/kotlin/com/hexagonkt/http/server/netty/epoll/AdapterExamplesTest.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.http.server.netty.epoll +package com.hexagontk.http.server.netty.epoll -import com.hexagonkt.http.client.jetty.JettyClientAdapter -import com.hexagonkt.http.test.examples.* -import com.hexagonkt.serialization.jackson.JacksonTextFormat -import com.hexagonkt.serialization.jackson.json.Json -import com.hexagonkt.serialization.jackson.yaml.Yaml +import com.hexagontk.http.client.jetty.JettyClientAdapter +import com.hexagontk.http.test.examples.* +import com.hexagontk.serialization.jackson.JacksonTextFormat +import com.hexagontk.serialization.jackson.json.Json +import com.hexagontk.serialization.jackson.yaml.Yaml import org.junit.jupiter.api.condition.EnabledOnOs import org.junit.jupiter.api.condition.OS diff --git a/http/http_server_servlet/README.md b/http/http_server_servlet/README.md index 4e22b0b5bd..ed4ca351cb 100644 --- a/http/http_server_servlet/README.md +++ b/http/http_server_servlet/README.md @@ -11,18 +11,18 @@ TODO mavenCentral() } - implementation("com.hexagonkt:http_server_servlet:$hexagonVersion") + implementation("com.hexagontk:http_server_servlet:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk http_server_servlet $hexagonVersion ``` -# Package com.hexagonkt.http.server.servlet +# Package com.hexagontk.http.server.servlet TODO diff --git a/http/http_server_servlet/api/http_server_servlet.api b/http/http_server_servlet/api/http_server_servlet.api index f1303cc269..e42fcd118a 100644 --- a/http/http_server_servlet/api/http_server_servlet.api +++ b/http/http_server_servlet/api/http_server_servlet.api @@ -1,13 +1,13 @@ -public final class com/hexagonkt/http/server/servlet/ServletFilter : jakarta/servlet/http/HttpFilter { - public fun (Lcom/hexagonkt/http/handlers/HttpHandler;)V +public final class com/hexagontk/http/server/servlet/ServletFilter : jakarta/servlet/http/HttpFilter { + public fun (Lcom/hexagontk/http/handlers/HttpHandler;)V public fun destroy ()V public fun init (Ljakarta/servlet/FilterConfig;)V } -public abstract class com/hexagonkt/http/server/servlet/ServletServer : jakarta/servlet/ServletContextListener { +public abstract class com/hexagontk/http/server/servlet/ServletServer : jakarta/servlet/ServletContextListener { public fun ()V - public fun (Lcom/hexagonkt/http/handlers/HttpHandler;Lcom/hexagonkt/http/server/HttpServerSettings;)V - public synthetic fun (Lcom/hexagonkt/http/handlers/HttpHandler;Lcom/hexagonkt/http/server/HttpServerSettings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lcom/hexagontk/http/handlers/HttpHandler;Lcom/hexagontk/http/server/HttpServerSettings;)V + public synthetic fun (Lcom/hexagontk/http/handlers/HttpHandler;Lcom/hexagontk/http/server/HttpServerSettings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun contextDestroyed (Ljakarta/servlet/ServletContextEvent;)V public fun contextInitialized (Ljakarta/servlet/ServletContextEvent;)V } diff --git a/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletFilter.kt b/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletFilter.kt index 91df8bbe9f..663e6cb62e 100644 --- a/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletFilter.kt +++ b/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletFilter.kt @@ -1,12 +1,12 @@ -package com.hexagonkt.http.server.servlet +package com.hexagontk.http.server.servlet -import com.hexagonkt.core.logging.Logger -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.core.toText -import com.hexagonkt.http.handlers.bodyToBytes -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.model.HttpResponse -import com.hexagonkt.http.model.HttpResponsePort +import com.hexagontk.core.logging.Logger +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.core.toText +import com.hexagontk.http.handlers.bodyToBytes +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.model.HttpResponse +import com.hexagontk.http.model.HttpResponsePort import jakarta.servlet.* import jakarta.servlet.http.Cookie import jakarta.servlet.http.HttpFilter diff --git a/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletRequestAdapter.kt b/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletRequestAdapter.kt index 01d4b7de23..6ab2ee3d9c 100644 --- a/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletRequestAdapter.kt +++ b/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletRequestAdapter.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.server.servlet +package com.hexagontk.http.server.servlet -import com.hexagonkt.http.model.* -import com.hexagonkt.http.parseContentType -import com.hexagonkt.http.parseQueryString +import com.hexagontk.http.model.* +import com.hexagontk.http.parseContentType +import com.hexagontk.http.parseQueryString import java.security.cert.X509Certificate import jakarta.servlet.http.HttpServletRequest diff --git a/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletRequestAdapterSync.kt b/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletRequestAdapterSync.kt index ff70ba3378..661b76201b 100644 --- a/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletRequestAdapterSync.kt +++ b/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletRequestAdapterSync.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.http.server.servlet +package com.hexagontk.http.server.servlet -import com.hexagonkt.http.model.* -import com.hexagonkt.http.parseContentType +import com.hexagontk.http.model.* +import com.hexagontk.http.parseContentType import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.Part import java.security.cert.X509Certificate diff --git a/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletServer.kt b/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletServer.kt index f17e91057b..a8563bf824 100644 --- a/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletServer.kt +++ b/http/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletServer.kt @@ -1,18 +1,18 @@ -package com.hexagonkt.http.server.servlet - -import com.hexagonkt.core.text.AnsiColor.BLUE -import com.hexagonkt.core.text.AnsiEffect.BOLD -import com.hexagonkt.core.text.AnsiColor.CYAN -import com.hexagonkt.core.text.AnsiColor.MAGENTA -import com.hexagonkt.core.text.Ansi.RESET -import com.hexagonkt.core.Jvm -import com.hexagonkt.core.text.prependIndent -import com.hexagonkt.core.require -import com.hexagonkt.core.logging.Logger -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.OnHandler +package com.hexagontk.http.server.servlet + +import com.hexagontk.core.text.AnsiColor.BLUE +import com.hexagontk.core.text.AnsiEffect.BOLD +import com.hexagontk.core.text.AnsiColor.CYAN +import com.hexagontk.core.text.AnsiColor.MAGENTA +import com.hexagontk.core.text.Ansi.RESET +import com.hexagontk.core.Jvm +import com.hexagontk.core.text.prependIndent +import com.hexagontk.core.require +import com.hexagontk.core.logging.Logger +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.OnHandler import jakarta.servlet.* import java.lang.management.ManagementFactory import java.util.* diff --git a/http/http_server_servlet/src/main/kotlin/module-info.java b/http/http_server_servlet/src/main/kotlin/module-info.java index 402457eb8a..78f6d13bf8 100644 --- a/http/http_server_servlet/src/main/kotlin/module-info.java +++ b/http/http_server_servlet/src/main/kotlin/module-info.java @@ -1,11 +1,11 @@ -module com.hexagonkt.http_server_servlet { +module com.hexagontk.http_server_servlet { requires transitive kotlin.stdlib; requires transitive java.management; - requires transitive com.hexagonkt.http; - requires transitive com.hexagonkt.http_server; + requires transitive com.hexagontk.http; + requires transitive com.hexagontk.http_server; requires transitive jakarta.servlet; - exports com.hexagonkt.http.server.servlet; + exports com.hexagontk.http.server.servlet; } diff --git a/http/http_server_servlet/src/test/kotlin/com/hexagonkt/http/server/servlet/ServletServerTest.kt b/http/http_server_servlet/src/test/kotlin/com/hexagonkt/http/server/servlet/ServletServerTest.kt index 3eb37a9260..7e6081da1b 100644 --- a/http/http_server_servlet/src/test/kotlin/com/hexagonkt/http/server/servlet/ServletServerTest.kt +++ b/http/http_server_servlet/src/test/kotlin/com/hexagonkt/http/server/servlet/ServletServerTest.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.http.server.servlet +package com.hexagontk.http.server.servlet -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.client.jetty.JettyClientAdapter -import com.hexagonkt.http.model.NOT_FOUND_404 -import com.hexagonkt.http.handlers.path +import com.hexagontk.core.urlOf +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.client.jetty.JettyClientAdapter +import com.hexagontk.http.model.NOT_FOUND_404 +import com.hexagontk.http.handlers.path import jakarta.servlet.MultipartConfigElement import org.eclipse.jetty.ee10.webapp.WebAppContext import org.junit.jupiter.api.AfterAll diff --git a/http/http_test/README.md b/http/http_test/README.md index aa7664ccf5..d301f2ac18 100644 --- a/http/http_test/README.md +++ b/http/http_test/README.md @@ -11,14 +11,14 @@ This module... mavenCentral() } - testImplementation("com.hexagonkt:http_test:$hexagonVersion") + testImplementation("com.hexagontk:http_test:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk http_test $hexagonVersion @@ -105,11 +105,11 @@ The mock server follows the following priority order when parsing the spec file } ``` -# Package com.hexagonkt.http.test +# Package com.hexagontk.http.test TODO -# Package com.hexagonkt.http.test.examples +# Package com.hexagontk.http.test.examples TODO -# Package com.hexagonkt.http.test.openapi +# Package com.hexagontk.http.test.openapi TODO diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/BaseTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/BaseTest.kt index d4d08646fe..9acc802a43 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/BaseTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/BaseTest.kt @@ -1,16 +1,16 @@ -package com.hexagonkt.http.test +package com.hexagontk.http.test -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.model.HttpResponsePort -import com.hexagonkt.http.model.HttpStatus -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.handlers.HttpHandler +import com.hexagontk.core.urlOf +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.model.HttpResponsePort +import com.hexagontk.http.model.HttpStatus +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.handlers.HttpHandler import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.TestInstance diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BenchmarkIT.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BenchmarkIT.kt index 942791f309..c585ac17eb 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BenchmarkIT.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BenchmarkIT.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.http.test.examples +package com.hexagontk.http.test.examples -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings import io.gatling.app.Gatling import io.gatling.core.config.GatlingPropertiesBuilder import org.junit.jupiter.api.Test diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BenchmarkSimulation.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BenchmarkSimulation.kt index 573ad637e0..e4876a8acb 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BenchmarkSimulation.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BenchmarkSimulation.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.http.test.examples +package com.hexagontk.http.test.examples import io.gatling.javaapi.core.CoreDsl import io.gatling.javaapi.core.Simulation diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BooksTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BooksTest.kt index 0c8d9c1e76..8b51f57ee2 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BooksTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BooksTest.kt @@ -1,17 +1,17 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.require -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.http.model.HttpMethod.Companion.ALL -import com.hexagonkt.http.model.CREATED_201 -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.handlers.PathHandler -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.test.BaseTest +package com.hexagontk.http.test.examples + +import com.hexagontk.core.require +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.http.model.HttpMethod.Companion.ALL +import com.hexagontk.http.model.CREATED_201 +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.handlers.PathHandler +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.test.BaseTest import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientCookiesTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientCookiesTest.kt index 368ec95ab0..9779f26255 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientCookiesTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientCookiesTest.kt @@ -1,18 +1,18 @@ -package com.hexagonkt.http.test.examples +package com.hexagontk.http.test.examples -import com.hexagonkt.core.require -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.formatQueryString -import com.hexagonkt.http.model.* -import com.hexagonkt.http.server.* -import com.hexagonkt.http.handlers.HttpCallbackType -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.test.BaseTest -import com.hexagonkt.serialization.SerializationFormat -import com.hexagonkt.serialization.SerializationManager +import com.hexagontk.core.require +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.formatQueryString +import com.hexagontk.http.model.* +import com.hexagontk.http.server.* +import com.hexagontk.http.handlers.HttpCallbackType +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.test.BaseTest +import com.hexagontk.serialization.SerializationFormat +import com.hexagontk.serialization.SerializationManager import org.junit.jupiter.api.* import kotlin.test.assertEquals diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientHttp2Test.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientHttp2Test.kt index c46ef4affe..ceeabb6380 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientHttp2Test.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientHttp2Test.kt @@ -1,22 +1,22 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.require -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.SslSettings -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.formatQueryString -import com.hexagonkt.http.model.* -import com.hexagonkt.http.server.* -import com.hexagonkt.http.handlers.HttpCallbackType -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.model.HttpProtocol.HTTP2 -import com.hexagonkt.http.test.BaseTest -import com.hexagonkt.serialization.SerializationFormat -import com.hexagonkt.serialization.SerializationManager +package com.hexagontk.http.test.examples + +import com.hexagontk.core.require +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.urlOf +import com.hexagontk.http.SslSettings +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.formatQueryString +import com.hexagontk.http.model.* +import com.hexagontk.http.server.* +import com.hexagontk.http.handlers.HttpCallbackType +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.model.HttpProtocol.HTTP2 +import com.hexagontk.http.test.BaseTest +import com.hexagontk.serialization.SerializationFormat +import com.hexagontk.serialization.SerializationManager import org.junit.jupiter.api.* import org.junit.jupiter.api.condition.DisabledIf import java.net.URL diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientHttpsTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientHttpsTest.kt index 52743fdff0..6e350d6e5f 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientHttpsTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientHttpsTest.kt @@ -1,22 +1,22 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.require -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.SslSettings -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.formatQueryString -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpProtocol.HTTPS -import com.hexagonkt.http.server.* -import com.hexagonkt.http.handlers.HttpCallbackType -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.test.BaseTest -import com.hexagonkt.serialization.SerializationFormat -import com.hexagonkt.serialization.SerializationManager +package com.hexagontk.http.test.examples + +import com.hexagontk.core.require +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.urlOf +import com.hexagontk.http.SslSettings +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.formatQueryString +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpProtocol.HTTPS +import com.hexagontk.http.server.* +import com.hexagontk.http.handlers.HttpCallbackType +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.test.BaseTest +import com.hexagontk.serialization.SerializationFormat +import com.hexagontk.serialization.SerializationManager import org.junit.jupiter.api.* import org.junit.jupiter.api.condition.DisabledIf import java.net.URL diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientMultipartTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientMultipartTest.kt index acf1c79669..068155f73a 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientMultipartTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientMultipartTest.kt @@ -1,17 +1,17 @@ -package com.hexagonkt.http.test.examples +package com.hexagontk.http.test.examples -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.formatQueryString -import com.hexagonkt.http.model.* -import com.hexagonkt.http.server.* -import com.hexagonkt.http.handlers.HttpCallbackType -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.test.BaseTest -import com.hexagonkt.serialization.SerializationFormat -import com.hexagonkt.serialization.SerializationManager +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.formatQueryString +import com.hexagontk.http.model.* +import com.hexagontk.http.server.* +import com.hexagontk.http.handlers.HttpCallbackType +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.test.BaseTest +import com.hexagontk.serialization.SerializationFormat +import com.hexagontk.serialization.SerializationManager import org.junit.jupiter.api.* import kotlin.test.assertEquals diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt index fcca62d463..9ef6d7990c 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt @@ -1,28 +1,28 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.require -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.media.APPLICATION_YAML -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.SslSettings -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.model.HttpResponsePort -import com.hexagonkt.http.formatQueryString -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpMethod.GET -import com.hexagonkt.http.model.INTERNAL_SERVER_ERROR_500 -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.server.* -import com.hexagonkt.http.handlers.HttpCallbackType -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.test.BaseTest -import com.hexagonkt.serialization.SerializationFormat -import com.hexagonkt.serialization.SerializationManager -import com.hexagonkt.serialization.serialize +package com.hexagontk.http.test.examples + +import com.hexagontk.core.require +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.media.APPLICATION_YAML +import com.hexagontk.core.urlOf +import com.hexagontk.http.SslSettings +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.model.HttpResponsePort +import com.hexagontk.http.formatQueryString +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpMethod.GET +import com.hexagontk.http.model.INTERNAL_SERVER_ERROR_500 +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.server.* +import com.hexagontk.http.handlers.HttpCallbackType +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.test.BaseTest +import com.hexagontk.serialization.SerializationFormat +import com.hexagontk.serialization.SerializationManager +import com.hexagontk.serialization.serialize import org.junit.jupiter.api.* import java.math.BigInteger diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CookiesTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CookiesTest.kt index df59f56f80..61d60d5633 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CookiesTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CookiesTest.kt @@ -1,16 +1,16 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.require -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.model.Cookie -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.handlers.PathHandler -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.model.CookieSameSite.* -import com.hexagonkt.http.test.BaseTest +package com.hexagontk.http.test.examples + +import com.hexagontk.core.require +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.model.Cookie +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.handlers.PathHandler +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.model.CookieSameSite.* +import com.hexagontk.http.test.BaseTest import org.junit.jupiter.api.* import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.MethodOrderer.OrderAnnotation diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CorsTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CorsTest.kt index 90231e5a92..07d4ac2621 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CorsTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CorsTest.kt @@ -1,20 +1,20 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.model.FORBIDDEN_403 -import com.hexagonkt.http.model.Header -import com.hexagonkt.http.model.Headers -import com.hexagonkt.http.model.HttpMethod.POST -import com.hexagonkt.http.model.NO_CONTENT_204 -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.server.* -import com.hexagonkt.http.handlers.HandlerBuilder -import com.hexagonkt.http.handlers.PathHandler -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.server.callbacks.CorsCallback -import com.hexagonkt.http.server.handlers.CorsHandler -import com.hexagonkt.http.test.BaseTest +package com.hexagontk.http.test.examples + +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.model.FORBIDDEN_403 +import com.hexagontk.http.model.Header +import com.hexagontk.http.model.Headers +import com.hexagontk.http.model.HttpMethod.POST +import com.hexagontk.http.model.NO_CONTENT_204 +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.server.* +import com.hexagontk.http.handlers.HandlerBuilder +import com.hexagontk.http.handlers.PathHandler +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.server.callbacks.CorsCallback +import com.hexagontk.http.server.handlers.CorsHandler +import com.hexagontk.http.test.BaseTest import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ErrorsTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ErrorsTest.kt index 0031352128..6a63a60fa9 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ErrorsTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ErrorsTest.kt @@ -1,16 +1,16 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.fail -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.model.HttpStatus -import com.hexagonkt.http.model.Header -import com.hexagonkt.http.model.INTERNAL_SERVER_ERROR_500 -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.handlers.PathHandler -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.test.BaseTest +package com.hexagontk.http.test.examples + +import com.hexagontk.core.fail +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.model.HttpStatus +import com.hexagontk.http.model.Header +import com.hexagontk.http.model.INTERNAL_SERVER_ERROR_500 +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.handlers.PathHandler +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.test.BaseTest import org.junit.jupiter.api.Test import java.time.LocalDateTime import kotlin.test.assertEquals diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FilesTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FilesTest.kt index 6309b41fbd..d87f678618 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FilesTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FilesTest.kt @@ -1,21 +1,21 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.media.TEXT_CSS -import com.hexagonkt.core.media.TEXT_HTML -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.NOT_FOUND_404 -import com.hexagonkt.http.model.HttpMethod.GET -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.server.callbacks.FileCallback -import com.hexagonkt.http.server.callbacks.UrlCallback -import com.hexagonkt.http.handlers.PathHandler -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.test.BaseTest +package com.hexagontk.http.test.examples + +import com.hexagontk.core.media.TEXT_CSS +import com.hexagontk.core.media.TEXT_HTML +import com.hexagontk.core.urlOf +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.model.* +import com.hexagontk.http.model.NOT_FOUND_404 +import com.hexagontk.http.model.HttpMethod.GET +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.server.callbacks.FileCallback +import com.hexagontk.http.server.callbacks.UrlCallback +import com.hexagontk.http.handlers.PathHandler +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.test.BaseTest import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FiltersTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FiltersTest.kt index bd9fa4367d..64dab63482 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FiltersTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FiltersTest.kt @@ -1,21 +1,21 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.text.decodeBase64 -import com.hexagonkt.http.basicAuth -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.model.FORBIDDEN_403 -import com.hexagonkt.http.model.UNAUTHORIZED_401 -import com.hexagonkt.http.model.Header -import com.hexagonkt.http.model.HttpMethod.PUT -import com.hexagonkt.http.model.* -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.handlers.PathHandler -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.test.BaseTest +package com.hexagontk.http.test.examples + +import com.hexagontk.core.text.decodeBase64 +import com.hexagontk.http.basicAuth +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.model.FORBIDDEN_403 +import com.hexagontk.http.model.UNAUTHORIZED_401 +import com.hexagontk.http.model.Header +import com.hexagontk.http.model.HttpMethod.PUT +import com.hexagontk.http.model.* +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.handlers.PathHandler +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.test.BaseTest import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt index 7e02d7765e..45ab2df97d 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt @@ -1,22 +1,22 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.fail -import com.hexagonkt.core.require -import com.hexagonkt.core.security.getPrivateKey -import com.hexagonkt.core.security.getPublicKey -import com.hexagonkt.core.security.loadKeyStore -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.SslSettings -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.model.Header -import com.hexagonkt.http.model.HttpProtocol.HTTP2 -import com.hexagonkt.http.model.HttpProtocol.HTTPS -import com.hexagonkt.http.server.* -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.test.BaseTest +package com.hexagontk.http.test.examples + +import com.hexagontk.core.fail +import com.hexagontk.core.require +import com.hexagontk.core.security.getPrivateKey +import com.hexagontk.core.security.getPublicKey +import com.hexagontk.core.security.loadKeyStore +import com.hexagontk.core.urlOf +import com.hexagontk.http.SslSettings +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.model.Header +import com.hexagontk.http.model.HttpProtocol.HTTP2 +import com.hexagontk.http.model.HttpProtocol.HTTPS +import com.hexagontk.http.server.* +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.test.BaseTest import org.junit.jupiter.api.Test import org.junit.jupiter.api.condition.DisabledIf import java.net.URL diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/MultipartSamplesTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/MultipartSamplesTest.kt index ac9141c472..91e0f7cea9 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/MultipartSamplesTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/MultipartSamplesTest.kt @@ -1,15 +1,15 @@ -package com.hexagonkt.http.test.examples +package com.hexagontk.http.test.examples -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings +import com.hexagontk.core.urlOf +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings import org.junit.jupiter.api.Test abstract class MultipartSamplesTest( diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/MultipartTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/MultipartTest.kt index 4403956c7e..52539bbd23 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/MultipartTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/MultipartTest.kt @@ -1,21 +1,21 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.NOT_FOUND_404 -import com.hexagonkt.http.model.HttpMethod.GET -import com.hexagonkt.http.model.HttpMethod.POST -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.server.callbacks.FileCallback -import com.hexagonkt.http.server.callbacks.UrlCallback -import com.hexagonkt.http.handlers.PathHandler -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.test.BaseTest +package com.hexagontk.http.test.examples + +import com.hexagontk.core.urlOf +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.model.* +import com.hexagontk.http.model.NOT_FOUND_404 +import com.hexagontk.http.model.HttpMethod.GET +import com.hexagontk.http.model.HttpMethod.POST +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.server.callbacks.FileCallback +import com.hexagontk.http.server.callbacks.UrlCallback +import com.hexagontk.http.handlers.PathHandler +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.test.BaseTest import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt index 803cacd8f9..8d8ffad7e1 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SamplesTest.kt @@ -1,28 +1,28 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.media.APPLICATION_XML -import com.hexagonkt.core.media.TEXT_CSS -import com.hexagonkt.core.media.TEXT_HTML -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.model.HttpResponsePort -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.http.model.HttpMethod.Companion.ALL -import com.hexagonkt.http.model.FOUND_302 -import com.hexagonkt.http.model.HTTP_VERSION_NOT_SUPPORTED_505 -import com.hexagonkt.http.model.INTERNAL_SERVER_ERROR_500 -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.server.callbacks.UrlCallback -import com.hexagonkt.http.handlers.* -import com.hexagonkt.http.server.serve +package com.hexagontk.http.test.examples + +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.media.APPLICATION_XML +import com.hexagontk.core.media.TEXT_CSS +import com.hexagontk.core.media.TEXT_HTML +import com.hexagontk.core.urlOf +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.model.HttpResponsePort +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.http.model.HttpMethod.Companion.ALL +import com.hexagontk.http.model.FOUND_302 +import com.hexagontk.http.model.HTTP_VERSION_NOT_SUPPORTED_505 +import com.hexagontk.http.model.INTERNAL_SERVER_ERROR_500 +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.server.callbacks.UrlCallback +import com.hexagontk.http.handlers.* +import com.hexagontk.http.server.serve import org.junit.jupiter.api.Test import java.net.InetAddress import kotlin.test.assertEquals diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SseTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SseTest.kt index 167a9cfcbf..6a8167d836 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SseTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/SseTest.kt @@ -1,15 +1,15 @@ -package com.hexagonkt.http.test.examples +package com.hexagontk.http.test.examples -import com.hexagonkt.core.logging.info -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.handlers.PathHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.model.ServerEvent -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.test.BaseTest +import com.hexagontk.core.logging.info +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.handlers.PathHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.model.ServerEvent +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.test.BaseTest import org.junit.jupiter.api.Test import java.util.concurrent.Flow import java.util.concurrent.Flow.Publisher diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/WebSocketsTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/WebSocketsTest.kt index 82d9e91664..a9bcb3fd38 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/WebSocketsTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/WebSocketsTest.kt @@ -1,19 +1,19 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.logging.logger -import com.hexagonkt.core.require -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.SslSettings -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.model.HttpProtocol.* -import com.hexagonkt.http.model.ws.NORMAL -import com.hexagonkt.http.model.ws.WsSession -import com.hexagonkt.http.server.* -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.test.BaseTest +package com.hexagontk.http.test.examples + +import com.hexagontk.core.logging.logger +import com.hexagontk.core.require +import com.hexagontk.core.urlOf +import com.hexagontk.http.SslSettings +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.model.HttpProtocol.* +import com.hexagontk.http.model.ws.NORMAL +import com.hexagontk.http.model.ws.WsSession +import com.hexagontk.http.server.* +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.test.BaseTest import org.junit.jupiter.api.Test import org.junit.jupiter.api.condition.DisabledOnOs import org.junit.jupiter.api.condition.OS.WINDOWS diff --git a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ZipTest.kt b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ZipTest.kt index 5d28a7ef9e..a5d6149db9 100644 --- a/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ZipTest.kt +++ b/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ZipTest.kt @@ -1,15 +1,15 @@ -package com.hexagonkt.http.test.examples - -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.model.Header -import com.hexagonkt.http.model.Headers -import com.hexagonkt.http.server.* -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.test.BaseTest +package com.hexagontk.http.test.examples + +import com.hexagontk.core.urlOf +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.model.Header +import com.hexagontk.http.model.Headers +import com.hexagontk.http.server.* +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.test.BaseTest import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/http/http_test/src/main/resources/logging.properties b/http/http_test/src/main/resources/logging.properties index 5c9f23e3ea..9bfdc40278 100644 --- a/http/http_test/src/main/resources/logging.properties +++ b/http/http_test/src/main/resources/logging.properties @@ -13,4 +13,4 @@ java.util.logging.SimpleFormatter.format=\ .level=INFO -com.hexagonkt.level=INFO +com.hexagontk.level=INFO diff --git a/http/rest/README.md b/http/rest/README.md index ed24250008..076650e772 100644 --- a/http/rest/README.md +++ b/http/rest/README.md @@ -11,18 +11,18 @@ TODO. mavenCentral() } - implementation("com.hexagonkt.extra:rest:$hexagonVersion") + implementation("com.hexagontk.extra:rest:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt.extra + com.hexagontk.extra rest $hexagonVersion ``` -# Package com.hexagonkt.rest +# Package com.hexagontk.rest TODO diff --git a/http/rest/src/main/kotlin/com/hexagonkt/rest/Rest.kt b/http/rest/src/main/kotlin/com/hexagonkt/rest/Rest.kt index a96f4b4f59..1493b45f97 100644 --- a/http/rest/src/main/kotlin/com/hexagonkt/rest/Rest.kt +++ b/http/rest/src/main/kotlin/com/hexagonkt/rest/Rest.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.rest +package com.hexagontk.rest -import com.hexagonkt.core.media.* -import com.hexagonkt.http.model.ContentType -import com.hexagonkt.http.model.HttpBase -import com.hexagonkt.serialization.* +import com.hexagontk.core.media.* +import com.hexagontk.http.model.ContentType +import com.hexagontk.http.model.HttpBase +import com.hexagontk.serialization.* val anyContentType = ContentType(ANY_MEDIA) val textContentType = ContentType(TEXT_PLAIN) diff --git a/http/rest/src/main/kotlin/com/hexagonkt/rest/SerializeRequestCallback.kt b/http/rest/src/main/kotlin/com/hexagonkt/rest/SerializeRequestCallback.kt index b9cc3f7783..111b086c02 100644 --- a/http/rest/src/main/kotlin/com/hexagonkt/rest/SerializeRequestCallback.kt +++ b/http/rest/src/main/kotlin/com/hexagonkt/rest/SerializeRequestCallback.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.rest +package com.hexagontk.rest -import com.hexagonkt.http.handlers.HttpCallback -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.serialization.SerializationManager -import com.hexagonkt.serialization.serialize +import com.hexagontk.http.handlers.HttpCallback +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.serialization.SerializationManager +import com.hexagontk.serialization.serialize // TODO Create SerializeRequestHandler like CorsHandler class SerializeRequestCallback : HttpCallback { diff --git a/http/rest/src/main/kotlin/com/hexagonkt/rest/SerializeResponseCallback.kt b/http/rest/src/main/kotlin/com/hexagonkt/rest/SerializeResponseCallback.kt index 2ba73ff71b..bc07d63d2a 100644 --- a/http/rest/src/main/kotlin/com/hexagonkt/rest/SerializeResponseCallback.kt +++ b/http/rest/src/main/kotlin/com/hexagonkt/rest/SerializeResponseCallback.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.rest +package com.hexagontk.rest -import com.hexagonkt.http.handlers.HttpCallback -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.serialization.SerializationManager -import com.hexagonkt.serialization.serialize +import com.hexagontk.http.handlers.HttpCallback +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.serialization.SerializationManager +import com.hexagontk.serialization.serialize // TODO Create SerializeResponseHandler like CorsHandler class SerializeResponseCallback: HttpCallback { diff --git a/http/rest/src/main/kotlin/module-info.java b/http/rest/src/main/kotlin/module-info.java index 3dbc574606..a766363e41 100644 --- a/http/rest/src/main/kotlin/module-info.java +++ b/http/rest/src/main/kotlin/module-info.java @@ -1,9 +1,9 @@ -module com.hexagonkt.rest { +module com.hexagontk.rest { requires transitive kotlin.stdlib; - requires transitive com.hexagonkt.http_handlers; - requires transitive com.hexagonkt.serialization; + requires transitive com.hexagontk.http_handlers; + requires transitive com.hexagontk.serialization; - exports com.hexagonkt.rest; + exports com.hexagontk.rest; } diff --git a/http/rest/src/test/kotlin/com/hexagonkt/rest/RestTest.kt b/http/rest/src/test/kotlin/com/hexagonkt/rest/RestTest.kt index 508e322c25..0f45c56c99 100644 --- a/http/rest/src/test/kotlin/com/hexagonkt/rest/RestTest.kt +++ b/http/rest/src/test/kotlin/com/hexagonkt/rest/RestTest.kt @@ -1,20 +1,20 @@ -package com.hexagonkt.rest +package com.hexagontk.rest -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.media.APPLICATION_TOML -import com.hexagonkt.core.media.APPLICATION_XML -import com.hexagonkt.core.media.APPLICATION_YAML -import com.hexagonkt.core.media.TEXT_CSV -import com.hexagonkt.core.requireInt -import com.hexagonkt.http.model.HttpResponse -import com.hexagonkt.http.model.ContentType -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.serialization.SerializationManager -import com.hexagonkt.serialization.jackson.csv.Csv -import com.hexagonkt.serialization.jackson.json.Json -import com.hexagonkt.serialization.jackson.toml.Toml -import com.hexagonkt.serialization.jackson.xml.Xml -import com.hexagonkt.serialization.jackson.yaml.Yaml +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.media.APPLICATION_TOML +import com.hexagontk.core.media.APPLICATION_XML +import com.hexagontk.core.media.APPLICATION_YAML +import com.hexagontk.core.media.TEXT_CSV +import com.hexagontk.core.requireInt +import com.hexagontk.http.model.HttpResponse +import com.hexagontk.http.model.ContentType +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.serialization.SerializationManager +import com.hexagontk.serialization.jackson.csv.Csv +import com.hexagontk.serialization.jackson.json.Json +import com.hexagontk.serialization.jackson.toml.Toml +import com.hexagontk.serialization.jackson.xml.Xml +import com.hexagontk.serialization.jackson.yaml.Yaml import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS diff --git a/http/rest/src/test/kotlin/com/hexagonkt/rest/SerializeRequestCallbackTest.kt b/http/rest/src/test/kotlin/com/hexagonkt/rest/SerializeRequestCallbackTest.kt index e29275fd5a..65dd64d18f 100644 --- a/http/rest/src/test/kotlin/com/hexagonkt/rest/SerializeRequestCallbackTest.kt +++ b/http/rest/src/test/kotlin/com/hexagonkt/rest/SerializeRequestCallbackTest.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.rest - -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.media.APPLICATION_YAML -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.model.ContentType -import com.hexagonkt.serialization.SerializationManager -import com.hexagonkt.serialization.jackson.json.Json +package com.hexagontk.rest + +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.media.APPLICATION_YAML +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.model.ContentType +import com.hexagontk.serialization.SerializationManager +import com.hexagontk.serialization.jackson.json.Json import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/http/rest/src/test/kotlin/com/hexagonkt/rest/SerializeResponseCallbackTest.kt b/http/rest/src/test/kotlin/com/hexagonkt/rest/SerializeResponseCallbackTest.kt index 6aa8043371..2633b37f64 100644 --- a/http/rest/src/test/kotlin/com/hexagonkt/rest/SerializeResponseCallbackTest.kt +++ b/http/rest/src/test/kotlin/com/hexagonkt/rest/SerializeResponseCallbackTest.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.rest - -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.media.APPLICATION_YAML -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.model.ContentType -import com.hexagonkt.serialization.SerializationManager -import com.hexagonkt.serialization.jackson.json.Json +package com.hexagontk.rest + +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.media.APPLICATION_YAML +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.model.ContentType +import com.hexagontk.serialization.SerializationManager +import com.hexagontk.serialization.jackson.json.Json import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/HttpClientTool.kt b/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/HttpClientTool.kt index 5b78256185..1a4fc43ffb 100644 --- a/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/HttpClientTool.kt +++ b/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/HttpClientTool.kt @@ -1,19 +1,19 @@ -package com.hexagonkt.rest.tools - -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.SslSettings -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientPort -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.handlers.BeforeHandler -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.model.HttpRequest -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.http.model.HttpStatusType.SUCCESS -import com.hexagonkt.http.patterns.createPathPattern -import com.hexagonkt.rest.SerializeRequestCallback +package com.hexagontk.rest.tools + +import com.hexagontk.core.media.MediaType +import com.hexagontk.core.urlOf +import com.hexagontk.http.SslSettings +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientPort +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.handlers.BeforeHandler +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.model.HttpRequest +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.http.model.HttpStatusType.SUCCESS +import com.hexagontk.http.patterns.createPathPattern +import com.hexagontk.rest.SerializeRequestCallback data class HttpClientTool( val adapter: HttpClientPort, diff --git a/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/HttpServerTool.kt b/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/HttpServerTool.kt index c241de5e0c..cd17417eb2 100644 --- a/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/HttpServerTool.kt +++ b/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/HttpServerTool.kt @@ -1,12 +1,12 @@ -package com.hexagonkt.rest.tools +package com.hexagontk.rest.tools -import com.hexagonkt.http.handlers.HandlerBuilder -import com.hexagonkt.http.model.NOT_FOUND_404 -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.handlers.PathHandler -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.rest.SerializeResponseCallback +import com.hexagontk.http.handlers.HandlerBuilder +import com.hexagontk.http.model.NOT_FOUND_404 +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.handlers.PathHandler +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.rest.SerializeResponseCallback import java.net.URL /** @@ -32,7 +32,7 @@ data class HttpServerTool( } fun path(block: HandlerBuilder.() -> Unit) { - path = com.hexagonkt.http.handlers.path(block = block) + path = com.hexagontk.http.handlers.path(block = block) } fun start() { diff --git a/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/RecordCallback.kt b/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/RecordCallback.kt index 619d7528a2..4beb0798cd 100644 --- a/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/RecordCallback.kt +++ b/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/RecordCallback.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.rest.tools +package com.hexagontk.rest.tools -import com.hexagonkt.http.handlers.HttpContext +import com.hexagontk.http.handlers.HttpContext /** * Callback that records server requests and responses (the whole event context). The result is diff --git a/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/openapi/VerifySpecCallback.kt b/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/openapi/VerifySpecCallback.kt index 9ae675eb18..2d7f3ec70d 100644 --- a/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/openapi/VerifySpecCallback.kt +++ b/http/rest_tools/src/main/kotlin/com/hexagonkt/rest/tools/openapi/VerifySpecCallback.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.rest.tools.openapi +package com.hexagontk.rest.tools.openapi import com.atlassian.oai.validator.OpenApiInteractionValidator import com.atlassian.oai.validator.OpenApiInteractionValidator.createForInlineApiSpecification @@ -9,11 +9,11 @@ import com.atlassian.oai.validator.model.SimpleRequest import com.atlassian.oai.validator.model.SimpleResponse import com.atlassian.oai.validator.report.ValidationReport import com.atlassian.oai.validator.report.ValidationReport.Message -import com.hexagonkt.http.handlers.HttpCallback -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.model.ContentType -import com.hexagonkt.http.model.HttpMethod -import com.hexagonkt.http.model.HttpMethod.* +import com.hexagontk.http.handlers.HttpCallback +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.model.ContentType +import com.hexagontk.http.model.HttpMethod +import com.hexagontk.http.model.HttpMethod.* import java.net.URL import kotlin.jvm.optionals.getOrNull diff --git a/http/rest_tools/src/main/kotlin/module-info.java_ b/http/rest_tools/src/main/kotlin/module-info.java_ index 2139b10fd2..19a73ca80d 100644 --- a/http/rest_tools/src/main/kotlin/module-info.java_ +++ b/http/rest_tools/src/main/kotlin/module-info.java_ @@ -1,16 +1,16 @@ // TODO Rename this file when build script is able to handle automatic modules -module com.hexagonkt.rest_tools { +module com.hexagontk.rest_tools { requires transitive kotlin.stdlib; - requires transitive com.hexagonkt.http; - requires transitive com.hexagonkt.rest; - requires transitive com.hexagonkt.http_server; - requires transitive com.hexagonkt.http_client; - requires transitive com.hexagonkt.serialization; + requires transitive com.hexagontk.http; + requires transitive com.hexagontk.rest; + requires transitive com.hexagontk.http_server; + requires transitive com.hexagontk.http_client; + requires transitive com.hexagontk.serialization; requires io.swagger.v3.oas.models; requires swagger.request.validator.core; - exports com.hexagonkt.rest.tools; + exports com.hexagontk.rest.tools; } diff --git a/http/rest_tools/src/test/kotlin/com/hexagonkt/rest/tools/HttpClientToolTest.kt b/http/rest_tools/src/test/kotlin/com/hexagonkt/rest/tools/HttpClientToolTest.kt index 0d76ee46a9..ca35a3b827 100644 --- a/http/rest_tools/src/test/kotlin/com/hexagonkt/rest/tools/HttpClientToolTest.kt +++ b/http/rest_tools/src/test/kotlin/com/hexagonkt/rest/tools/HttpClientToolTest.kt @@ -1,15 +1,15 @@ -package com.hexagonkt.rest.tools +package com.hexagontk.rest.tools -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.http.client.jetty.JettyClientAdapter -import com.hexagonkt.http.model.HttpMethod.POST -import com.hexagonkt.http.model.HttpMethod.PUT -import com.hexagonkt.http.model.HttpResponsePort -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.server.jetty.JettyServletAdapter -import com.hexagonkt.rest.textContentType -import com.hexagonkt.serialization.SerializationManager -import com.hexagonkt.serialization.jackson.json.Json +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.http.client.jetty.JettyClientAdapter +import com.hexagontk.http.model.HttpMethod.POST +import com.hexagontk.http.model.HttpMethod.PUT +import com.hexagontk.http.model.HttpResponsePort +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.server.jetty.JettyServletAdapter +import com.hexagontk.rest.textContentType +import com.hexagontk.serialization.SerializationManager +import com.hexagontk.serialization.jackson.json.Json import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test diff --git a/http/rest_tools/src/test/kotlin/com/hexagonkt/rest/tools/HttpServerToolTest.kt b/http/rest_tools/src/test/kotlin/com/hexagonkt/rest/tools/HttpServerToolTest.kt index 705b046084..2da6d73bba 100644 --- a/http/rest_tools/src/test/kotlin/com/hexagonkt/rest/tools/HttpServerToolTest.kt +++ b/http/rest_tools/src/test/kotlin/com/hexagonkt/rest/tools/HttpServerToolTest.kt @@ -1,23 +1,23 @@ -package com.hexagonkt.rest.tools - -import com.hexagonkt.core.logging.info -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.core.require -import com.hexagonkt.http.client.jetty.JettyClientAdapter -import com.hexagonkt.http.handlers.FilterHandler -import com.hexagonkt.http.handlers.PathHandler -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.http.model.HttpResponsePort -import com.hexagonkt.http.model.HttpStatusType.SUCCESS -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.server.jetty.JettyServletAdapter -import com.hexagonkt.rest.bodyMap -import com.hexagonkt.rest.jsonContentType -import com.hexagonkt.rest.textContentType -import com.hexagonkt.serialization.SerializationManager -import com.hexagonkt.serialization.jackson.json.Json +package com.hexagontk.rest.tools + +import com.hexagontk.core.logging.info +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.core.require +import com.hexagontk.http.client.jetty.JettyClientAdapter +import com.hexagontk.http.handlers.FilterHandler +import com.hexagontk.http.handlers.PathHandler +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.handlers.path +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.http.model.HttpResponsePort +import com.hexagontk.http.model.HttpStatusType.SUCCESS +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.server.jetty.JettyServletAdapter +import com.hexagontk.rest.bodyMap +import com.hexagontk.rest.jsonContentType +import com.hexagontk.rest.textContentType +import com.hexagontk.serialization.SerializationManager +import com.hexagontk.serialization.jackson.json.Json import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test diff --git a/http/rest_tools/src/test/kotlin/com/hexagonkt/rest/tools/openapi/VerifySpecCallbackTest.kt b/http/rest_tools/src/test/kotlin/com/hexagonkt/rest/tools/openapi/VerifySpecCallbackTest.kt index 7ababfb4a8..83e81b06c9 100644 --- a/http/rest_tools/src/test/kotlin/com/hexagonkt/rest/tools/openapi/VerifySpecCallbackTest.kt +++ b/http/rest_tools/src/test/kotlin/com/hexagonkt/rest/tools/openapi/VerifySpecCallbackTest.kt @@ -1,15 +1,15 @@ -package com.hexagonkt.rest.tools.openapi +package com.hexagontk.rest.tools.openapi -import com.hexagonkt.core.logging.info -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.model.* -import com.hexagonkt.http.model.HttpMethod.* -import com.hexagonkt.serialization.SerializationManager -import com.hexagonkt.serialization.jackson.json.Json -import com.hexagonkt.serialization.jackson.yaml.Yaml -import com.hexagonkt.serialization.serialize +import com.hexagontk.core.logging.info +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.urlOf +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.model.* +import com.hexagontk.http.model.HttpMethod.* +import com.hexagontk.serialization.SerializationManager +import com.hexagontk.serialization.jackson.json.Json +import com.hexagontk.serialization.jackson.yaml.Yaml +import com.hexagontk.serialization.serialize import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/http/web/README.md b/http/web/README.md index fe04f2154f..277e26fec3 100644 --- a/http/web/README.md +++ b/http/web/README.md @@ -15,14 +15,14 @@ ports. mavenCentral() } - implementation("com.hexagonkt:web:$hexagonVersion") + implementation("com.hexagontk:web:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk web $hexagonVersion @@ -31,5 +31,5 @@ ports. ### Templates Provide utilities for template processing inside HTTP handlers. -# Package com.hexagonkt.web +# Package com.hexagontk.web TODO diff --git a/http/web/src/main/kotlin/com/hexagonkt/web/Web.kt b/http/web/src/main/kotlin/com/hexagonkt/web/Web.kt index 1cb9d0613f..f7f0b24829 100644 --- a/http/web/src/main/kotlin/com/hexagonkt/web/Web.kt +++ b/http/web/src/main/kotlin/com/hexagonkt/web/Web.kt @@ -1,12 +1,12 @@ -package com.hexagonkt.web +package com.hexagontk.web -import com.hexagonkt.core.media.mediaTypeOfOrNull -import com.hexagonkt.http.model.ContentType -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.model.Cookie -import com.hexagonkt.http.model.Headers -import com.hexagonkt.templates.TemplateManager -import com.hexagonkt.templates.TemplatePort +import com.hexagontk.core.media.mediaTypeOfOrNull +import com.hexagontk.http.model.ContentType +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.model.Cookie +import com.hexagontk.http.model.Headers +import com.hexagontk.templates.TemplateManager +import com.hexagontk.templates.TemplatePort import java.net.URL import java.nio.charset.Charset.defaultCharset import java.util.Locale diff --git a/http/web/src/main/kotlin/module-info.java b/http/web/src/main/kotlin/module-info.java index f7c9b5993f..26cb551d16 100644 --- a/http/web/src/main/kotlin/module-info.java +++ b/http/web/src/main/kotlin/module-info.java @@ -1,10 +1,10 @@ -module com.hexagonkt.web { +module com.hexagontk.web { requires transitive kotlin.stdlib; - requires transitive com.hexagonkt.http; - requires transitive com.hexagonkt.http_server; - requires transitive com.hexagonkt.templates; + requires transitive com.hexagontk.http; + requires transitive com.hexagontk.http_server; + requires transitive com.hexagontk.templates; - exports com.hexagonkt.web; + exports com.hexagontk.web; } diff --git a/http/web/src/test/kotlin/com/hexagonkt/web/JettyServletAdapterTodoTest.kt b/http/web/src/test/kotlin/com/hexagonkt/web/JettyServletAdapterTodoTest.kt index 70ef97c813..fa67e51c1f 100644 --- a/http/web/src/test/kotlin/com/hexagonkt/web/JettyServletAdapterTodoTest.kt +++ b/http/web/src/test/kotlin/com/hexagonkt/web/JettyServletAdapterTodoTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.web +package com.hexagontk.web -import com.hexagonkt.http.server.jetty.JettyServletAdapter -import com.hexagonkt.web.examples.TodoTest +import com.hexagontk.http.server.jetty.JettyServletAdapter +import com.hexagontk.web.examples.TodoTest internal class JettyServletAdapterTodoTest : TodoTest(JettyServletAdapter()) diff --git a/http/web/src/test/kotlin/com/hexagonkt/web/WebTest.kt b/http/web/src/test/kotlin/com/hexagonkt/web/WebTest.kt index 6a6930dccd..1fc754d773 100644 --- a/http/web/src/test/kotlin/com/hexagonkt/web/WebTest.kt +++ b/http/web/src/test/kotlin/com/hexagonkt/web/WebTest.kt @@ -1,17 +1,17 @@ -package com.hexagonkt.web +package com.hexagontk.web -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.client.jetty.JettyClientAdapter -import com.hexagonkt.http.model.OK_200 -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.http.handlers.PathHandler -import com.hexagonkt.http.handlers.path -import com.hexagonkt.http.server.jetty.JettyServletAdapter -import com.hexagonkt.templates.TemplateManager -import com.hexagonkt.templates.pebble.PebbleAdapter +import com.hexagontk.core.urlOf +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.client.jetty.JettyClientAdapter +import com.hexagontk.http.model.OK_200 +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.http.handlers.PathHandler +import com.hexagontk.http.handlers.path +import com.hexagontk.http.server.jetty.JettyServletAdapter +import com.hexagontk.templates.TemplateManager +import com.hexagontk.templates.pebble.PebbleAdapter import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test diff --git a/http/web/src/test/kotlin/com/hexagonkt/web/examples/TodoTest.kt b/http/web/src/test/kotlin/com/hexagonkt/web/examples/TodoTest.kt index 24f459ca23..4a11abe370 100644 --- a/http/web/src/test/kotlin/com/hexagonkt/web/examples/TodoTest.kt +++ b/http/web/src/test/kotlin/com/hexagonkt/web/examples/TodoTest.kt @@ -1,17 +1,17 @@ -package com.hexagonkt.web.examples - -import com.hexagonkt.core.* -import com.hexagonkt.core.logging.Logger -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.client.jetty.JettyClientAdapter -import com.hexagonkt.http.model.* -import com.hexagonkt.http.server.HttpServer -import com.hexagonkt.http.server.HttpServerPort -import com.hexagonkt.http.server.HttpServerSettings -import com.hexagonkt.serialization.* -import com.hexagonkt.serialization.jackson.json.Json +package com.hexagontk.web.examples + +import com.hexagontk.core.* +import com.hexagontk.core.logging.Logger +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.client.jetty.JettyClientAdapter +import com.hexagontk.http.model.* +import com.hexagontk.http.server.HttpServer +import com.hexagontk.http.server.HttpServerPort +import com.hexagontk.http.server.HttpServerSettings +import com.hexagontk.serialization.* +import com.hexagontk.serialization.jackson.json.Json import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test diff --git a/http/web/src/test/resources/META-INF/native-image/com.hexagonkt.extra/store_mongodb_json/reflect-config.json b/http/web/src/test/resources/META-INF/native-image/com.hexagonkt.extra/store_mongodb_json/reflect-config.json index add62d6039..c8738116f6 100644 --- a/http/web/src/test/resources/META-INF/native-image/com.hexagonkt.extra/store_mongodb_json/reflect-config.json +++ b/http/web/src/test/resources/META-INF/native-image/com.hexagonkt.extra/store_mongodb_json/reflect-config.json @@ -1,6 +1,6 @@ [ { - "name": "com.hexagonkt.web.examples.TodoTest$Task", + "name": "com.hexagontk.web.examples.TodoTest$Task", "allPublicMethods": true, "allDeclaredFields": true, "allDeclaredMethods": true, diff --git a/serialization/serialization/README.md b/serialization/serialization/README.md index 8d4aae0a0f..271e022cc6 100644 --- a/serialization/serialization/README.md +++ b/serialization/serialization/README.md @@ -15,14 +15,14 @@ feature (as [serialization_dsl_json]) in order to parse/serialize data. mavenCentral() } - implementation("com.hexagonkt:serialization:$hexagonVersion") + implementation("com.hexagontk:serialization:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk serialization $hexagonVersion @@ -36,7 +36,7 @@ TODO Document module exposed ports: The core module has utilities to serialize/parse data classes to JSON and YAML. Read the following snippet for details: -@code serialization/serialization_test/src/main/kotlin/com/hexagonkt/serialization/test/SerializationTest.kt?serializationUsage +@code serialization/serialization_test/src/main/kotlin/com/hexagontk/serialization/test/SerializationTest.kt?serializationUsage -# Package com.hexagonkt.serialization +# Package com.hexagontk.serialization Parse/serialize data in different formats to class instances. diff --git a/serialization/serialization/api/serialization.api b/serialization/serialization/api/serialization.api index ac3efb0551..27a5db77db 100644 --- a/serialization/serialization/api/serialization.api +++ b/serialization/serialization/api/serialization.api @@ -1,4 +1,4 @@ -public abstract interface class com/hexagonkt/serialization/Data : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker { +public abstract interface class com/hexagontk/serialization/Data : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker { public abstract fun containsKey (Ljava/lang/String;)Z public abstract fun containsValue (Ljava/lang/Object;)Z public abstract fun copy (Ljava/util/Map;)Ljava/lang/Object; @@ -12,19 +12,19 @@ public abstract interface class com/hexagonkt/serialization/Data : java/util/Map public abstract fun isEmpty ()Z } -public final class com/hexagonkt/serialization/Data$DefaultImpls { - public static fun containsKey (Lcom/hexagonkt/serialization/Data;Ljava/lang/String;)Z - public static fun containsValue (Lcom/hexagonkt/serialization/Data;Ljava/lang/Object;)Z - public static fun get (Lcom/hexagonkt/serialization/Data;Ljava/lang/String;)Ljava/lang/Object; - public static fun get (Lcom/hexagonkt/serialization/Data;Lkotlin/reflect/KProperty1;)Ljava/lang/Object; - public static fun getEntries (Lcom/hexagonkt/serialization/Data;)Ljava/util/Set; - public static fun getKeys (Lcom/hexagonkt/serialization/Data;)Ljava/util/Set; - public static fun getSize (Lcom/hexagonkt/serialization/Data;)I - public static fun getValues (Lcom/hexagonkt/serialization/Data;)Ljava/util/Collection; - public static fun isEmpty (Lcom/hexagonkt/serialization/Data;)Z +public final class com/hexagontk/serialization/Data$DefaultImpls { + public static fun containsKey (Lcom/hexagontk/serialization/Data;Ljava/lang/String;)Z + public static fun containsValue (Lcom/hexagontk/serialization/Data;Ljava/lang/Object;)Z + public static fun get (Lcom/hexagontk/serialization/Data;Ljava/lang/String;)Ljava/lang/Object; + public static fun get (Lcom/hexagontk/serialization/Data;Lkotlin/reflect/KProperty1;)Ljava/lang/Object; + public static fun getEntries (Lcom/hexagontk/serialization/Data;)Ljava/util/Set; + public static fun getKeys (Lcom/hexagontk/serialization/Data;)Ljava/util/Set; + public static fun getSize (Lcom/hexagontk/serialization/Data;)I + public static fun getValues (Lcom/hexagontk/serialization/Data;)Ljava/util/Collection; + public static fun isEmpty (Lcom/hexagontk/serialization/Data;)Z } -public abstract interface class com/hexagonkt/serialization/MutableData : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker { +public abstract interface class com/hexagontk/serialization/MutableData : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker { public abstract fun containsKey (Ljava/lang/String;)Z public abstract fun containsValue (Ljava/lang/Object;)Z public abstract fun data ()Ljava/util/Map; @@ -37,21 +37,21 @@ public abstract interface class com/hexagonkt/serialization/MutableData : java/u public abstract fun with (Ljava/util/Map;)V } -public final class com/hexagonkt/serialization/MutableData$DefaultImpls { - public static fun containsKey (Lcom/hexagonkt/serialization/MutableData;Ljava/lang/String;)Z - public static fun containsValue (Lcom/hexagonkt/serialization/MutableData;Ljava/lang/Object;)Z - public static fun get (Lcom/hexagonkt/serialization/MutableData;Ljava/lang/String;)Ljava/lang/Object; - public static fun getEntries (Lcom/hexagonkt/serialization/MutableData;)Ljava/util/Set; - public static fun getKeys (Lcom/hexagonkt/serialization/MutableData;)Ljava/util/Set; - public static fun getSize (Lcom/hexagonkt/serialization/MutableData;)I - public static fun getValues (Lcom/hexagonkt/serialization/MutableData;)Ljava/util/Collection; - public static fun isEmpty (Lcom/hexagonkt/serialization/MutableData;)Z +public final class com/hexagontk/serialization/MutableData$DefaultImpls { + public static fun containsKey (Lcom/hexagontk/serialization/MutableData;Ljava/lang/String;)Z + public static fun containsValue (Lcom/hexagontk/serialization/MutableData;Ljava/lang/Object;)Z + public static fun get (Lcom/hexagontk/serialization/MutableData;Ljava/lang/String;)Ljava/lang/Object; + public static fun getEntries (Lcom/hexagontk/serialization/MutableData;)Ljava/util/Set; + public static fun getKeys (Lcom/hexagontk/serialization/MutableData;)Ljava/util/Set; + public static fun getSize (Lcom/hexagontk/serialization/MutableData;)I + public static fun getValues (Lcom/hexagontk/serialization/MutableData;)Ljava/util/Collection; + public static fun isEmpty (Lcom/hexagontk/serialization/MutableData;)Z } -public abstract interface class com/hexagonkt/serialization/SerializationFormat { +public abstract interface class com/hexagontk/serialization/SerializationFormat { public static final field PARSING_ERROR Ljava/lang/String; public static final field SERIALIZATION_ERROR Ljava/lang/String; - public abstract fun getMediaType ()Lcom/hexagonkt/core/media/MediaType; + public abstract fun getMediaType ()Lcom/hexagontk/core/media/MediaType; public abstract fun getTextFormat ()Z public abstract fun parse (Ljava/io/InputStream;)Ljava/lang/Object; public abstract fun parse (Ljava/lang/String;)Ljava/lang/Object; @@ -60,51 +60,51 @@ public abstract interface class com/hexagonkt/serialization/SerializationFormat public abstract fun serializeBytes (Ljava/lang/Object;)[B } -public final class com/hexagonkt/serialization/SerializationFormat$DefaultImpls { - public static fun parse (Lcom/hexagonkt/serialization/SerializationFormat;Ljava/lang/String;)Ljava/lang/Object; - public static fun serialize (Lcom/hexagonkt/serialization/SerializationFormat;Ljava/lang/Object;)Ljava/lang/String; - public static fun serializeBytes (Lcom/hexagonkt/serialization/SerializationFormat;Ljava/lang/Object;)[B +public final class com/hexagontk/serialization/SerializationFormat$DefaultImpls { + public static fun parse (Lcom/hexagontk/serialization/SerializationFormat;Ljava/lang/String;)Ljava/lang/Object; + public static fun serialize (Lcom/hexagontk/serialization/SerializationFormat;Ljava/lang/Object;)Ljava/lang/String; + public static fun serializeBytes (Lcom/hexagontk/serialization/SerializationFormat;Ljava/lang/Object;)[B } -public final class com/hexagonkt/serialization/SerializationKt { +public final class com/hexagontk/serialization/SerializationKt { public static final fun parse (Ljava/io/File;)Ljava/lang/Object; - public static final fun parse (Ljava/io/InputStream;Lcom/hexagonkt/core/media/MediaType;)Ljava/lang/Object; - public static final fun parse (Ljava/io/InputStream;Lcom/hexagonkt/serialization/SerializationFormat;)Ljava/lang/Object; - public static final fun parse (Ljava/lang/String;Lcom/hexagonkt/core/media/MediaType;)Ljava/lang/Object; - public static final fun parse (Ljava/lang/String;Lcom/hexagonkt/serialization/SerializationFormat;)Ljava/lang/Object; + public static final fun parse (Ljava/io/InputStream;Lcom/hexagontk/core/media/MediaType;)Ljava/lang/Object; + public static final fun parse (Ljava/io/InputStream;Lcom/hexagontk/serialization/SerializationFormat;)Ljava/lang/Object; + public static final fun parse (Ljava/lang/String;Lcom/hexagontk/core/media/MediaType;)Ljava/lang/Object; + public static final fun parse (Ljava/lang/String;Lcom/hexagontk/serialization/SerializationFormat;)Ljava/lang/Object; public static final fun parse (Ljava/net/URL;)Ljava/lang/Object; public static final fun parse (Ljava/nio/file/Path;)Ljava/lang/Object; public static final fun parseList (Ljava/io/File;)Ljava/util/List; - public static final fun parseList (Ljava/io/InputStream;Lcom/hexagonkt/core/media/MediaType;)Ljava/util/List; - public static final fun parseList (Ljava/io/InputStream;Lcom/hexagonkt/serialization/SerializationFormat;)Ljava/util/List; - public static final fun parseList (Ljava/lang/String;Lcom/hexagonkt/core/media/MediaType;)Ljava/util/List; - public static final fun parseList (Ljava/lang/String;Lcom/hexagonkt/serialization/SerializationFormat;)Ljava/util/List; + public static final fun parseList (Ljava/io/InputStream;Lcom/hexagontk/core/media/MediaType;)Ljava/util/List; + public static final fun parseList (Ljava/io/InputStream;Lcom/hexagontk/serialization/SerializationFormat;)Ljava/util/List; + public static final fun parseList (Ljava/lang/String;Lcom/hexagontk/core/media/MediaType;)Ljava/util/List; + public static final fun parseList (Ljava/lang/String;Lcom/hexagontk/serialization/SerializationFormat;)Ljava/util/List; public static final fun parseList (Ljava/net/URL;)Ljava/util/List; public static final fun parseList (Ljava/nio/file/Path;)Ljava/util/List; public static final fun parseMap (Ljava/io/File;)Ljava/util/Map; - public static final fun parseMap (Ljava/io/InputStream;Lcom/hexagonkt/core/media/MediaType;)Ljava/util/Map; - public static final fun parseMap (Ljava/io/InputStream;Lcom/hexagonkt/serialization/SerializationFormat;)Ljava/util/Map; - public static final fun parseMap (Ljava/lang/String;Lcom/hexagonkt/core/media/MediaType;)Ljava/util/Map; - public static final fun parseMap (Ljava/lang/String;Lcom/hexagonkt/serialization/SerializationFormat;)Ljava/util/Map; + public static final fun parseMap (Ljava/io/InputStream;Lcom/hexagontk/core/media/MediaType;)Ljava/util/Map; + public static final fun parseMap (Ljava/io/InputStream;Lcom/hexagontk/serialization/SerializationFormat;)Ljava/util/Map; + public static final fun parseMap (Ljava/lang/String;Lcom/hexagontk/core/media/MediaType;)Ljava/util/Map; + public static final fun parseMap (Ljava/lang/String;Lcom/hexagontk/serialization/SerializationFormat;)Ljava/util/Map; public static final fun parseMap (Ljava/net/URL;)Ljava/util/Map; public static final fun parseMap (Ljava/nio/file/Path;)Ljava/util/Map; public static final fun parseMaps (Ljava/io/File;)Ljava/util/List; - public static final fun parseMaps (Ljava/io/InputStream;Lcom/hexagonkt/core/media/MediaType;)Ljava/util/List; - public static final fun parseMaps (Ljava/io/InputStream;Lcom/hexagonkt/serialization/SerializationFormat;)Ljava/util/List; - public static final fun parseMaps (Ljava/lang/String;Lcom/hexagonkt/core/media/MediaType;)Ljava/util/List; - public static final fun parseMaps (Ljava/lang/String;Lcom/hexagonkt/serialization/SerializationFormat;)Ljava/util/List; + public static final fun parseMaps (Ljava/io/InputStream;Lcom/hexagontk/core/media/MediaType;)Ljava/util/List; + public static final fun parseMaps (Ljava/io/InputStream;Lcom/hexagontk/serialization/SerializationFormat;)Ljava/util/List; + public static final fun parseMaps (Ljava/lang/String;Lcom/hexagontk/core/media/MediaType;)Ljava/util/List; + public static final fun parseMaps (Ljava/lang/String;Lcom/hexagontk/serialization/SerializationFormat;)Ljava/util/List; public static final fun parseMaps (Ljava/net/URL;)Ljava/util/List; public static final fun parseMaps (Ljava/nio/file/Path;)Ljava/util/List; - public static final fun serialize (Ljava/lang/Object;Lcom/hexagonkt/core/media/MediaType;)Ljava/lang/String; - public static final fun serialize (Ljava/lang/Object;Lcom/hexagonkt/serialization/SerializationFormat;)Ljava/lang/String; - public static final fun serializeBytes (Ljava/lang/Object;Lcom/hexagonkt/core/media/MediaType;)[B - public static final fun serializeBytes (Ljava/lang/Object;Lcom/hexagonkt/serialization/SerializationFormat;)[B + public static final fun serialize (Ljava/lang/Object;Lcom/hexagontk/core/media/MediaType;)Ljava/lang/String; + public static final fun serialize (Ljava/lang/Object;Lcom/hexagontk/serialization/SerializationFormat;)Ljava/lang/String; + public static final fun serializeBytes (Ljava/lang/Object;Lcom/hexagontk/core/media/MediaType;)[B + public static final fun serializeBytes (Ljava/lang/Object;Lcom/hexagontk/serialization/SerializationFormat;)[B } -public final class com/hexagonkt/serialization/SerializationManager { - public static final field INSTANCE Lcom/hexagonkt/serialization/SerializationManager; - public final fun formatOf (Lcom/hexagonkt/core/media/MediaType;)Lcom/hexagonkt/serialization/SerializationFormat; - public final fun formatOfOrNull (Lcom/hexagonkt/core/media/MediaType;)Lcom/hexagonkt/serialization/SerializationFormat; +public final class com/hexagontk/serialization/SerializationManager { + public static final field INSTANCE Lcom/hexagontk/serialization/SerializationManager; + public final fun formatOf (Lcom/hexagontk/core/media/MediaType;)Lcom/hexagontk/serialization/SerializationFormat; + public final fun formatOfOrNull (Lcom/hexagontk/core/media/MediaType;)Lcom/hexagontk/serialization/SerializationFormat; public final fun getFormats ()Ljava/util/Set; public final fun setFormats (Ljava/util/Set;)V } diff --git a/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/Data.kt b/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/Data.kt index 58c431c833..0dfa3b0b76 100644 --- a/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/Data.kt +++ b/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/Data.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.serialization +package com.hexagontk.serialization import kotlin.collections.Map.Entry import kotlin.reflect.KProperty1 diff --git a/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/MutableData.kt b/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/MutableData.kt index 4ab2e7f8b0..3fa57a705b 100644 --- a/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/MutableData.kt +++ b/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/MutableData.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.serialization +package com.hexagontk.serialization import kotlin.collections.Map.Entry diff --git a/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/Serialization.kt b/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/Serialization.kt index 1cad6b95d4..2634e0ac23 100644 --- a/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/Serialization.kt +++ b/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/Serialization.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.serialization +package com.hexagontk.serialization -import com.hexagonkt.core.text.toStream -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.core.media.mediaTypeOf -import com.hexagonkt.serialization.SerializationManager.formatOf +import com.hexagontk.core.text.toStream +import com.hexagontk.core.media.MediaType +import com.hexagontk.core.media.mediaTypeOf +import com.hexagontk.serialization.SerializationManager.formatOf import java.io.File import java.io.InputStream import java.net.URL diff --git a/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/SerializationFormat.kt b/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/SerializationFormat.kt index 135e44eaae..68a258131e 100644 --- a/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/SerializationFormat.kt +++ b/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/SerializationFormat.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.serialization +package com.hexagontk.serialization -import com.hexagonkt.core.text.toStream -import com.hexagonkt.core.media.MediaType +import com.hexagontk.core.text.toStream +import com.hexagontk.core.media.MediaType import java.io.ByteArrayOutputStream import java.io.InputStream import java.io.OutputStream diff --git a/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/SerializationManager.kt b/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/SerializationManager.kt index 9654709a35..e62c1e595f 100644 --- a/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/SerializationManager.kt +++ b/serialization/serialization/src/main/kotlin/com/hexagonkt/serialization/SerializationManager.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.serialization +package com.hexagontk.serialization -import com.hexagonkt.core.media.MediaType +import com.hexagontk.core.media.MediaType object SerializationManager { diff --git a/serialization/serialization/src/main/kotlin/module-info.java b/serialization/serialization/src/main/kotlin/module-info.java index e80f9b8cec..0a12fa767e 100644 --- a/serialization/serialization/src/main/kotlin/module-info.java +++ b/serialization/serialization/src/main/kotlin/module-info.java @@ -1,7 +1,7 @@ -module com.hexagonkt.serialization { +module com.hexagontk.serialization { - requires transitive com.hexagonkt.core; + requires transitive com.hexagontk.core; - exports com.hexagonkt.serialization; + exports com.hexagontk.serialization; } diff --git a/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/CheatSheetTest.kt b/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/CheatSheetTest.kt index edbe2740a9..d8da540667 100644 --- a/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/CheatSheetTest.kt +++ b/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/CheatSheetTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.serialization +package com.hexagontk.serialization import org.junit.jupiter.api.Test diff --git a/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/MutableDataTest.kt b/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/MutableDataTest.kt index c013ea0c70..b284f83176 100644 --- a/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/MutableDataTest.kt +++ b/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/MutableDataTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.serialization +package com.hexagontk.serialization -import com.hexagonkt.core.fieldsMapOf -import com.hexagonkt.core.requirePath +import com.hexagontk.core.fieldsMapOf +import com.hexagontk.core.requirePath import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/SerializationFormatTest.kt b/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/SerializationFormatTest.kt index 4042ce602f..038b802053 100644 --- a/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/SerializationFormatTest.kt +++ b/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/SerializationFormatTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.serialization +package com.hexagontk.serialization import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/SerializationManagerTest.kt b/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/SerializationManagerTest.kt index 7b361bef37..b025e83716 100644 --- a/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/SerializationManagerTest.kt +++ b/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/SerializationManagerTest.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.serialization +package com.hexagontk.serialization -import com.hexagonkt.core.media.* -import com.hexagonkt.core.urlOf -import com.hexagonkt.serialization.SerializationManager.formatOf -import com.hexagonkt.serialization.SerializationManager.formatOfOrNull -import com.hexagonkt.serialization.SerializationManager.formats +import com.hexagontk.core.media.* +import com.hexagontk.core.urlOf +import com.hexagontk.serialization.SerializationManager.formatOf +import com.hexagontk.serialization.SerializationManager.formatOfOrNull +import com.hexagontk.serialization.SerializationManager.formats import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/TestUtilities.kt b/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/TestUtilities.kt index fe07f5257d..6027fa7b74 100644 --- a/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/TestUtilities.kt +++ b/serialization/serialization/src/test/kotlin/com/hexagonkt/serialization/TestUtilities.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.serialization +package com.hexagontk.serialization -import com.hexagonkt.core.* -import com.hexagonkt.core.media.APPLICATION_AVRO -import com.hexagonkt.core.media.APPLICATION_PHP +import com.hexagontk.core.* +import com.hexagontk.core.media.APPLICATION_AVRO +import com.hexagontk.core.media.APPLICATION_PHP import java.io.InputStream import java.io.OutputStream diff --git a/serialization/serialization_dsl_json/README.md b/serialization/serialization_dsl_json/README.md index b8cc11449a..d0034f7a12 100644 --- a/serialization/serialization_dsl_json/README.md +++ b/serialization/serialization_dsl_json/README.md @@ -14,18 +14,18 @@ mavenCentral() } - implementation("com.hexagonkt:serialization_dsl_json:$hexagonVersion") + implementation("com.hexagontk:serialization_dsl_json:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk serialization_dsl_json $hexagonVersion ``` -# Package com.hexagonkt.serialization.dsl.json +# Package com.hexagontk.serialization.dsl.json DSL JSON implementation classes. diff --git a/serialization/serialization_dsl_json/api/serialization_dsl_json.api b/serialization/serialization_dsl_json/api/serialization_dsl_json.api index e754ff6f78..f167c8ac7f 100644 --- a/serialization/serialization_dsl_json/api/serialization_dsl_json.api +++ b/serialization/serialization_dsl_json/api/serialization_dsl_json.api @@ -1,13 +1,13 @@ -public final class com/hexagonkt/serialization/dsl/json/Json : com/hexagonkt/serialization/dsl/json/JsonFormat { - public static final field INSTANCE Lcom/hexagonkt/serialization/dsl/json/Json; - public final fun getRaw ()Lcom/hexagonkt/serialization/dsl/json/JsonFormat; +public final class com/hexagontk/serialization/dsl/json/Json : com/hexagontk/serialization/dsl/json/JsonFormat { + public static final field INSTANCE Lcom/hexagontk/serialization/dsl/json/Json; + public final fun getRaw ()Lcom/hexagontk/serialization/dsl/json/JsonFormat; } -public class com/hexagonkt/serialization/dsl/json/JsonFormat : com/hexagonkt/serialization/SerializationFormat { +public class com/hexagontk/serialization/dsl/json/JsonFormat : com/hexagontk/serialization/SerializationFormat { public fun ()V public fun (Z)V public synthetic fun (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun getMediaType ()Lcom/hexagonkt/core/media/MediaType; + public fun getMediaType ()Lcom/hexagontk/core/media/MediaType; public fun getTextFormat ()Z public fun parse (Ljava/io/InputStream;)Ljava/lang/Object; public fun parse (Ljava/lang/String;)Ljava/lang/Object; diff --git a/serialization/serialization_dsl_json/src/main/kotlin/com/hexagonkt/serialization/dsl/json/Json.kt b/serialization/serialization_dsl_json/src/main/kotlin/com/hexagonkt/serialization/dsl/json/Json.kt index a2a29eec6d..dec6b03214 100644 --- a/serialization/serialization_dsl_json/src/main/kotlin/com/hexagonkt/serialization/dsl/json/Json.kt +++ b/serialization/serialization_dsl_json/src/main/kotlin/com/hexagonkt/serialization/dsl/json/Json.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.serialization.dsl.json +package com.hexagontk.serialization.dsl.json object Json : JsonFormat() { val raw = JsonFormat(false) diff --git a/serialization/serialization_dsl_json/src/main/kotlin/com/hexagonkt/serialization/dsl/json/JsonFormat.kt b/serialization/serialization_dsl_json/src/main/kotlin/com/hexagonkt/serialization/dsl/json/JsonFormat.kt index 7b0dcd026b..afc09da9b5 100644 --- a/serialization/serialization_dsl_json/src/main/kotlin/com/hexagonkt/serialization/dsl/json/JsonFormat.kt +++ b/serialization/serialization_dsl_json/src/main/kotlin/com/hexagonkt/serialization/dsl/json/JsonFormat.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.serialization.dsl.json +package com.hexagontk.serialization.dsl.json import com.dslplatform.json.DslJson import com.dslplatform.json.PrettifyOutputStream import com.dslplatform.json.runtime.Settings -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.serialization.SerializationFormat +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.media.MediaType +import com.hexagontk.serialization.SerializationFormat import java.io.InputStream import java.io.OutputStream diff --git a/serialization/serialization_dsl_json/src/main/kotlin/module-info.java_ b/serialization/serialization_dsl_json/src/main/kotlin/module-info.java_ index 301cecb2a7..2b1acd05c4 100644 --- a/serialization/serialization_dsl_json/src/main/kotlin/module-info.java_ +++ b/serialization/serialization_dsl_json/src/main/kotlin/module-info.java_ @@ -1,9 +1,9 @@ // TODO Rename this file when build script is able to handle automatic modules -module com.hexagonkt.serialization_dsl_json { +module com.hexagontk.serialization_dsl_json { - requires transitive com.hexagonkt.serialization; + requires transitive com.hexagontk.serialization; requires dsl.json; - exports com.hexagonkt.serialization.dsl.json; + exports com.hexagontk.serialization.dsl.json; } diff --git a/serialization/serialization_dsl_json/src/test/kotlin/com/hexagonkt/serialization/dsl/json/JsonTest.kt b/serialization/serialization_dsl_json/src/test/kotlin/com/hexagonkt/serialization/dsl/json/JsonTest.kt index e38d19dd7e..3053d1cba6 100644 --- a/serialization/serialization_dsl_json/src/test/kotlin/com/hexagonkt/serialization/dsl/json/JsonTest.kt +++ b/serialization/serialization_dsl_json/src/test/kotlin/com/hexagonkt/serialization/dsl/json/JsonTest.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.serialization.dsl.json +package com.hexagontk.serialization.dsl.json -import com.hexagonkt.core.urlOf -import com.hexagonkt.serialization.SerializationFormat -import com.hexagonkt.serialization.parse -import com.hexagonkt.serialization.test.SerializationTest +import com.hexagontk.core.urlOf +import com.hexagontk.serialization.SerializationFormat +import com.hexagontk.serialization.parse +import com.hexagontk.serialization.test.SerializationTest import org.junit.jupiter.api.Test import java.io.ByteArrayOutputStream import kotlin.IllegalStateException diff --git a/serialization/serialization_jackson/api/serialization_jackson.api b/serialization/serialization_jackson/api/serialization_jackson.api index 7a1a566f25..6ce7bfc394 100644 --- a/serialization/serialization_jackson/api/serialization_jackson.api +++ b/serialization/serialization_jackson/api/serialization_jackson.api @@ -1,11 +1,11 @@ -public final class com/hexagonkt/serialization/jackson/JacksonHelper { - public static final field INSTANCE Lcom/hexagonkt/serialization/jackson/JacksonHelper; +public final class com/hexagontk/serialization/jackson/JacksonHelper { + public static final field INSTANCE Lcom/hexagontk/serialization/jackson/JacksonHelper; public final fun createObjectMapper (Lcom/fasterxml/jackson/core/JsonFactory;)Lcom/fasterxml/jackson/databind/json/JsonMapper; public final fun mapNode (Lcom/fasterxml/jackson/databind/JsonNode;)Ljava/lang/Object; public final fun nodeToCollection (Lcom/fasterxml/jackson/databind/JsonNode;)Ljava/lang/Object; } -public abstract class com/hexagonkt/serialization/jackson/JacksonTextFormat : com/hexagonkt/serialization/SerializationFormat { +public abstract class com/hexagontk/serialization/jackson/JacksonTextFormat : com/hexagontk/serialization/SerializationFormat { public fun ()V public fun (Lkotlin/jvm/functions/Function0;Z)V public synthetic fun (Lkotlin/jvm/functions/Function0;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V diff --git a/serialization/serialization_jackson/src/main/kotlin/com/hexagonkt/serialization/jackson/JacksonHelper.kt b/serialization/serialization_jackson/src/main/kotlin/com/hexagonkt/serialization/jackson/JacksonHelper.kt index 5d8eff9ff3..9071358646 100644 --- a/serialization/serialization_jackson/src/main/kotlin/com/hexagonkt/serialization/jackson/JacksonHelper.kt +++ b/serialization/serialization_jackson/src/main/kotlin/com/hexagonkt/serialization/jackson/JacksonHelper.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.serialization.jackson +package com.hexagontk.serialization.jackson import com.fasterxml.jackson.core.JsonFactory import com.fasterxml.jackson.core.JsonParser.Feature.ALLOW_SINGLE_QUOTES diff --git a/serialization/serialization_jackson/src/main/kotlin/com/hexagonkt/serialization/jackson/JacksonTextFormat.kt b/serialization/serialization_jackson/src/main/kotlin/com/hexagonkt/serialization/jackson/JacksonTextFormat.kt index 6c1304995f..1c3b915026 100644 --- a/serialization/serialization_jackson/src/main/kotlin/com/hexagonkt/serialization/jackson/JacksonTextFormat.kt +++ b/serialization/serialization_jackson/src/main/kotlin/com/hexagonkt/serialization/jackson/JacksonTextFormat.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.serialization.jackson +package com.hexagontk.serialization.jackson import com.fasterxml.jackson.core.JsonFactory import com.fasterxml.jackson.core.util.DefaultIndenter.SYSTEM_LINEFEED_INSTANCE import com.fasterxml.jackson.core.util.DefaultPrettyPrinter -import com.hexagonkt.serialization.SerializationFormat -import com.hexagonkt.serialization.jackson.JacksonHelper.createObjectMapper -import com.hexagonkt.serialization.jackson.JacksonHelper.mapNode +import com.hexagontk.serialization.SerializationFormat +import com.hexagontk.serialization.jackson.JacksonHelper.createObjectMapper +import com.hexagontk.serialization.jackson.JacksonHelper.mapNode import java.io.InputStream import java.io.OutputStream diff --git a/serialization/serialization_jackson/src/main/kotlin/module-info.java b/serialization/serialization_jackson/src/main/kotlin/module-info.java index 5e051c3bb1..a39f83cd9f 100644 --- a/serialization/serialization_jackson/src/main/kotlin/module-info.java +++ b/serialization/serialization_jackson/src/main/kotlin/module-info.java @@ -1,9 +1,9 @@ -module com.hexagonkt.serialization_jackson { +module com.hexagontk.serialization_jackson { requires transitive kotlin.stdlib; requires transitive com.fasterxml.jackson.databind; - requires transitive com.hexagonkt.serialization; + requires transitive com.hexagontk.serialization; - exports com.hexagonkt.serialization.jackson; + exports com.hexagontk.serialization.jackson; } diff --git a/serialization/serialization_jackson/src/test/kotlin/com/hexagonkt/serialization/jackson/JacksonHelperTest.kt b/serialization/serialization_jackson/src/test/kotlin/com/hexagonkt/serialization/jackson/JacksonHelperTest.kt index 979d953d9d..30e670a219 100644 --- a/serialization/serialization_jackson/src/test/kotlin/com/hexagonkt/serialization/jackson/JacksonHelperTest.kt +++ b/serialization/serialization_jackson/src/test/kotlin/com/hexagonkt/serialization/jackson/JacksonHelperTest.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.serialization.jackson +package com.hexagontk.serialization.jackson import com.fasterxml.jackson.databind.node.* -import com.hexagonkt.serialization.jackson.JacksonHelper.mapNode -import com.hexagonkt.serialization.jackson.JacksonHelper.nodeToCollection +import com.hexagontk.serialization.jackson.JacksonHelper.mapNode +import com.hexagontk.serialization.jackson.JacksonHelper.nodeToCollection import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import java.math.BigInteger diff --git a/serialization/serialization_jackson/src/test/kotlin/com/hexagonkt/serialization/jackson/JacksonTextFormatTest.kt b/serialization/serialization_jackson/src/test/kotlin/com/hexagonkt/serialization/jackson/JacksonTextFormatTest.kt index 9b7cee6961..da66bc6180 100644 --- a/serialization/serialization_jackson/src/test/kotlin/com/hexagonkt/serialization/jackson/JacksonTextFormatTest.kt +++ b/serialization/serialization_jackson/src/test/kotlin/com/hexagonkt/serialization/jackson/JacksonTextFormatTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.serialization.jackson +package com.hexagontk.serialization.jackson -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.media.MediaType +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.media.MediaType import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import kotlin.IllegalStateException diff --git a/serialization/serialization_jackson/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson/reflect-config.json b/serialization/serialization_jackson/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson/reflect-config.json index 5266e88a5f..7d336de746 100644 --- a/serialization/serialization_jackson/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson/reflect-config.json +++ b/serialization/serialization_jackson/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson/reflect-config.json @@ -1,20 +1,20 @@ [ { - "name": "com.hexagonkt.serialization.jackson.Department", + "name": "com.hexagontk.serialization.jackson.Department", "allPublicMethods": true, "allDeclaredFields": true, "allDeclaredMethods": true, "allDeclaredConstructors": true }, { - "name": "com.hexagonkt.serialization.jackson.Person", + "name": "com.hexagontk.serialization.jackson.Person", "allPublicMethods": true, "allDeclaredFields": true, "allDeclaredMethods": true, "allDeclaredConstructors": true }, { - "name": "com.hexagonkt.serialization.jackson.Company", + "name": "com.hexagontk.serialization.jackson.Company", "allPublicMethods": true, "allDeclaredFields": true, "allDeclaredMethods": true, diff --git a/serialization/serialization_jackson_csv/api/serialization_jackson_csv.api b/serialization/serialization_jackson_csv/api/serialization_jackson_csv.api index 633cfd37e9..696a0a07b3 100644 --- a/serialization/serialization_jackson_csv/api/serialization_jackson_csv.api +++ b/serialization/serialization_jackson_csv/api/serialization_jackson_csv.api @@ -1,6 +1,6 @@ -public final class com/hexagonkt/serialization/jackson/csv/Csv : com/hexagonkt/serialization/SerializationFormat { - public static final field INSTANCE Lcom/hexagonkt/serialization/jackson/csv/Csv; - public fun getMediaType ()Lcom/hexagonkt/core/media/MediaType; +public final class com/hexagontk/serialization/jackson/csv/Csv : com/hexagontk/serialization/SerializationFormat { + public static final field INSTANCE Lcom/hexagontk/serialization/jackson/csv/Csv; + public fun getMediaType ()Lcom/hexagontk/core/media/MediaType; public fun getTextFormat ()Z public fun parse (Ljava/io/InputStream;)Ljava/lang/Object; public fun parse (Ljava/lang/String;)Ljava/lang/Object; diff --git a/serialization/serialization_jackson_csv/src/main/kotlin/com/hexagonkt/serialization/jackson/csv/Csv.kt b/serialization/serialization_jackson_csv/src/main/kotlin/com/hexagonkt/serialization/jackson/csv/Csv.kt index 66a5d754d0..bc7175cf5f 100644 --- a/serialization/serialization_jackson_csv/src/main/kotlin/com/hexagonkt/serialization/jackson/csv/Csv.kt +++ b/serialization/serialization_jackson_csv/src/main/kotlin/com/hexagonkt/serialization/jackson/csv/Csv.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.serialization.jackson.csv +package com.hexagontk.serialization.jackson.csv import com.fasterxml.jackson.dataformat.csv.CsvGenerator import com.fasterxml.jackson.dataformat.csv.CsvMapper import com.fasterxml.jackson.dataformat.csv.CsvParser -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.core.media.TEXT_CSV -import com.hexagonkt.serialization.SerializationFormat +import com.hexagontk.core.media.MediaType +import com.hexagontk.core.media.TEXT_CSV +import com.hexagontk.serialization.SerializationFormat import java.io.InputStream import java.io.OutputStream diff --git a/serialization/serialization_jackson_csv/src/main/kotlin/module-info.java b/serialization/serialization_jackson_csv/src/main/kotlin/module-info.java index 05cb1ebbea..134529c74e 100644 --- a/serialization/serialization_jackson_csv/src/main/kotlin/module-info.java +++ b/serialization/serialization_jackson_csv/src/main/kotlin/module-info.java @@ -1,9 +1,9 @@ -module com.hexagonkt.serialization_jackson_csv { +module com.hexagontk.serialization_jackson_csv { - requires transitive com.hexagonkt.core; - requires transitive com.hexagonkt.serialization_jackson; + requires transitive com.hexagontk.core; + requires transitive com.hexagontk.serialization_jackson; requires transitive com.fasterxml.jackson.dataformat.csv; - exports com.hexagonkt.serialization.jackson.csv; + exports com.hexagontk.serialization.jackson.csv; } diff --git a/serialization/serialization_jackson_csv/src/test/kotlin/com/hexagonkt/serialization/jackson/csv/CsvTest.kt b/serialization/serialization_jackson_csv/src/test/kotlin/com/hexagonkt/serialization/jackson/csv/CsvTest.kt index d13365a3be..090023bce3 100644 --- a/serialization/serialization_jackson_csv/src/test/kotlin/com/hexagonkt/serialization/jackson/csv/CsvTest.kt +++ b/serialization/serialization_jackson_csv/src/test/kotlin/com/hexagonkt/serialization/jackson/csv/CsvTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.serialization.jackson.csv +package com.hexagontk.serialization.jackson.csv -import com.hexagonkt.serialization.* +import com.hexagontk.serialization.* import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance diff --git a/serialization/serialization_jackson_json/api/serialization_jackson_json.api b/serialization/serialization_jackson_json/api/serialization_jackson_json.api index 955a728547..948d1418fd 100644 --- a/serialization/serialization_jackson_json/api/serialization_jackson_json.api +++ b/serialization/serialization_jackson_json/api/serialization_jackson_json.api @@ -1,12 +1,12 @@ -public final class com/hexagonkt/serialization/jackson/json/Json : com/hexagonkt/serialization/jackson/json/JsonFormat { - public static final field INSTANCE Lcom/hexagonkt/serialization/jackson/json/Json; - public final fun getRaw ()Lcom/hexagonkt/serialization/jackson/json/JsonFormat; +public final class com/hexagontk/serialization/jackson/json/Json : com/hexagontk/serialization/jackson/json/JsonFormat { + public static final field INSTANCE Lcom/hexagontk/serialization/jackson/json/Json; + public final fun getRaw ()Lcom/hexagontk/serialization/jackson/json/JsonFormat; } -public class com/hexagonkt/serialization/jackson/json/JsonFormat : com/hexagonkt/serialization/jackson/JacksonTextFormat { +public class com/hexagontk/serialization/jackson/json/JsonFormat : com/hexagontk/serialization/jackson/JacksonTextFormat { public fun ()V public fun (Z)V public synthetic fun (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun getMediaType ()Lcom/hexagonkt/core/media/MediaType; + public fun getMediaType ()Lcom/hexagontk/core/media/MediaType; } diff --git a/serialization/serialization_jackson_json/src/main/kotlin/com/hexagonkt/serialization/jackson/json/Json.kt b/serialization/serialization_jackson_json/src/main/kotlin/com/hexagonkt/serialization/jackson/json/Json.kt index afb247af0b..eba4c4744f 100644 --- a/serialization/serialization_jackson_json/src/main/kotlin/com/hexagonkt/serialization/jackson/json/Json.kt +++ b/serialization/serialization_jackson_json/src/main/kotlin/com/hexagonkt/serialization/jackson/json/Json.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.serialization.jackson.json +package com.hexagontk.serialization.jackson.json object Json : JsonFormat() { val raw = JsonFormat(false) diff --git a/serialization/serialization_jackson_json/src/main/kotlin/com/hexagonkt/serialization/jackson/json/JsonFormat.kt b/serialization/serialization_jackson_json/src/main/kotlin/com/hexagonkt/serialization/jackson/json/JsonFormat.kt index dcf671e30f..ab40b85659 100644 --- a/serialization/serialization_jackson_json/src/main/kotlin/com/hexagonkt/serialization/jackson/json/JsonFormat.kt +++ b/serialization/serialization_jackson_json/src/main/kotlin/com/hexagonkt/serialization/jackson/json/JsonFormat.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.serialization.jackson.json +package com.hexagontk.serialization.jackson.json -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.serialization.jackson.JacksonTextFormat +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.media.MediaType +import com.hexagontk.serialization.jackson.JacksonTextFormat open class JsonFormat(prettyPrint: Boolean = true) : JacksonTextFormat(prettyPrint = prettyPrint) { override val mediaType: MediaType = APPLICATION_JSON diff --git a/serialization/serialization_jackson_json/src/main/kotlin/module-info.java b/serialization/serialization_jackson_json/src/main/kotlin/module-info.java index 8a5fd2e30e..d11f76184d 100644 --- a/serialization/serialization_jackson_json/src/main/kotlin/module-info.java +++ b/serialization/serialization_jackson_json/src/main/kotlin/module-info.java @@ -1,8 +1,8 @@ -module com.hexagonkt.serialization_jackson_json { +module com.hexagontk.serialization_jackson_json { - requires transitive com.hexagonkt.core; - requires transitive com.hexagonkt.serialization_jackson; + requires transitive com.hexagontk.core; + requires transitive com.hexagontk.serialization_jackson; - exports com.hexagonkt.serialization.jackson.json; + exports com.hexagontk.serialization.jackson.json; } diff --git a/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/JsonTest.kt b/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/JsonTest.kt index efab12859d..66f07f8d07 100644 --- a/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/JsonTest.kt +++ b/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/JsonTest.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.serialization.jackson.json +package com.hexagontk.serialization.jackson.json -import com.hexagonkt.core.urlOf -import com.hexagonkt.serialization.SerializationFormat -import com.hexagonkt.serialization.parse -import com.hexagonkt.serialization.test.SerializationTest +import com.hexagontk.core.urlOf +import com.hexagontk.serialization.SerializationFormat +import com.hexagontk.serialization.parse +import com.hexagontk.serialization.test.SerializationTest import org.junit.jupiter.api.Test import java.io.ByteArrayOutputStream import java.net.URL diff --git a/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/SerializationHelpersTest.kt b/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/SerializationHelpersTest.kt index 893edf7d2b..89614d4856 100644 --- a/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/SerializationHelpersTest.kt +++ b/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/SerializationHelpersTest.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.serialization.jackson.json - -import com.hexagonkt.core.media.APPLICATION_JSON -import com.hexagonkt.core.text.toStream -import com.hexagonkt.core.urlOf -import com.hexagonkt.serialization.parseList -import com.hexagonkt.serialization.parseMap -import com.hexagonkt.serialization.parseMaps +package com.hexagontk.serialization.jackson.json + +import com.hexagontk.core.media.APPLICATION_JSON +import com.hexagontk.core.text.toStream +import com.hexagontk.core.urlOf +import com.hexagontk.serialization.parseList +import com.hexagontk.serialization.parseMap +import com.hexagontk.serialization.parseMaps import org.junit.jupiter.api.Test import java.io.File import java.nio.file.Path diff --git a/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/SerializationTest.kt b/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/SerializationTest.kt index b7a0b9abc8..703de4173f 100644 --- a/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/SerializationTest.kt +++ b/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/SerializationTest.kt @@ -1,12 +1,12 @@ -package com.hexagonkt.serialization.jackson.json +package com.hexagontk.serialization.jackson.json -import com.hexagonkt.core.text.decodeBase64 -import com.hexagonkt.core.media.APPLICATION_PHP -import com.hexagonkt.core.media.APPLICATION_AVRO -import com.hexagonkt.core.urlOf -import com.hexagonkt.serialization.* -import com.hexagonkt.serialization.jackson.json.Department.DESIGN -import com.hexagonkt.serialization.jackson.json.Department.DEVELOPMENT +import com.hexagontk.core.text.decodeBase64 +import com.hexagontk.core.media.APPLICATION_PHP +import com.hexagontk.core.media.APPLICATION_AVRO +import com.hexagontk.core.urlOf +import com.hexagontk.serialization.* +import com.hexagontk.serialization.jackson.json.Department.DESIGN +import com.hexagontk.serialization.jackson.json.Department.DEVELOPMENT import org.junit.jupiter.api.Test import java.io.File import java.net.InetAddress diff --git a/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/TestUtilities.kt b/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/TestUtilities.kt index 821df38b1c..b4e737569c 100644 --- a/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/TestUtilities.kt +++ b/serialization/serialization_jackson_json/src/test/kotlin/com/hexagonkt/serialization/jackson/json/TestUtilities.kt @@ -1,12 +1,12 @@ -package com.hexagonkt.serialization.jackson.json +package com.hexagontk.serialization.jackson.json -import com.hexagonkt.core.* -import com.hexagonkt.core.text.decodeBase64 -import com.hexagonkt.core.media.APPLICATION_AVRO -import com.hexagonkt.core.media.APPLICATION_PHP -import com.hexagonkt.core.text.encodeToBase64 -import com.hexagonkt.serialization.Data -import com.hexagonkt.serialization.SerializationFormat +import com.hexagontk.core.* +import com.hexagontk.core.text.decodeBase64 +import com.hexagontk.core.media.APPLICATION_AVRO +import com.hexagontk.core.media.APPLICATION_PHP +import com.hexagontk.core.text.encodeToBase64 +import com.hexagontk.serialization.Data +import com.hexagontk.serialization.SerializationFormat import java.io.InputStream import java.io.OutputStream import java.net.InetAddress diff --git a/serialization/serialization_jackson_toml/api/serialization_jackson_toml.api b/serialization/serialization_jackson_toml/api/serialization_jackson_toml.api index e6ff64deaf..786ce6c7b2 100644 --- a/serialization/serialization_jackson_toml/api/serialization_jackson_toml.api +++ b/serialization/serialization_jackson_toml/api/serialization_jackson_toml.api @@ -1,5 +1,5 @@ -public final class com/hexagonkt/serialization/jackson/toml/Toml : com/hexagonkt/serialization/jackson/JacksonTextFormat { - public static final field INSTANCE Lcom/hexagonkt/serialization/jackson/toml/Toml; - public fun getMediaType ()Lcom/hexagonkt/core/media/MediaType; +public final class com/hexagontk/serialization/jackson/toml/Toml : com/hexagontk/serialization/jackson/JacksonTextFormat { + public static final field INSTANCE Lcom/hexagontk/serialization/jackson/toml/Toml; + public fun getMediaType ()Lcom/hexagontk/core/media/MediaType; } diff --git a/serialization/serialization_jackson_toml/src/main/kotlin/com/hexagonkt/serialization/jackson/toml/Toml.kt b/serialization/serialization_jackson_toml/src/main/kotlin/com/hexagonkt/serialization/jackson/toml/Toml.kt index ad6f2d2080..28aab9655e 100644 --- a/serialization/serialization_jackson_toml/src/main/kotlin/com/hexagonkt/serialization/jackson/toml/Toml.kt +++ b/serialization/serialization_jackson_toml/src/main/kotlin/com/hexagonkt/serialization/jackson/toml/Toml.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.serialization.jackson.toml +package com.hexagontk.serialization.jackson.toml import com.fasterxml.jackson.core.JsonFactory import com.fasterxml.jackson.dataformat.toml.TomlFactory -import com.hexagonkt.core.media.APPLICATION_TOML -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.serialization.jackson.JacksonTextFormat +import com.hexagontk.core.media.APPLICATION_TOML +import com.hexagontk.core.media.MediaType +import com.hexagontk.serialization.jackson.JacksonTextFormat object Toml : JacksonTextFormat({ Toml.createTomlFactory() }) { diff --git a/serialization/serialization_jackson_toml/src/main/kotlin/module-info.java b/serialization/serialization_jackson_toml/src/main/kotlin/module-info.java index 2aa3e6dd9f..5b64c5d519 100644 --- a/serialization/serialization_jackson_toml/src/main/kotlin/module-info.java +++ b/serialization/serialization_jackson_toml/src/main/kotlin/module-info.java @@ -1,9 +1,9 @@ -module com.hexagonkt.serialization_jackson_toml { +module com.hexagontk.serialization_jackson_toml { - requires transitive com.hexagonkt.core; - requires transitive com.hexagonkt.serialization_jackson; + requires transitive com.hexagontk.core; + requires transitive com.hexagontk.serialization_jackson; requires transitive com.fasterxml.jackson.dataformat.toml; - exports com.hexagonkt.serialization.jackson.toml; + exports com.hexagontk.serialization.jackson.toml; } diff --git a/serialization/serialization_jackson_toml/src/test/kotlin/com/hexagonkt/serialization/jackson/toml/TomlTest.kt b/serialization/serialization_jackson_toml/src/test/kotlin/com/hexagonkt/serialization/jackson/toml/TomlTest.kt index 6a5ee56bd2..45bc7c15ae 100644 --- a/serialization/serialization_jackson_toml/src/test/kotlin/com/hexagonkt/serialization/jackson/toml/TomlTest.kt +++ b/serialization/serialization_jackson_toml/src/test/kotlin/com/hexagonkt/serialization/jackson/toml/TomlTest.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.serialization.jackson.toml +package com.hexagontk.serialization.jackson.toml -import com.hexagonkt.core.fieldsMapOfNotNull -import com.hexagonkt.core.require -import com.hexagonkt.core.requirePath -import com.hexagonkt.core.urlOf -import com.hexagonkt.serialization.* -import com.hexagonkt.serialization.test.SerializationTest +import com.hexagontk.core.fieldsMapOfNotNull +import com.hexagontk.core.require +import com.hexagontk.core.requirePath +import com.hexagontk.core.urlOf +import com.hexagontk.serialization.* +import com.hexagontk.serialization.test.SerializationTest import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance diff --git a/serialization/serialization_jackson_toml/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson_toml/reflect-config.json b/serialization/serialization_jackson_toml/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson_toml/reflect-config.json index dd68150799..8749ff817d 100644 --- a/serialization/serialization_jackson_toml/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson_toml/reflect-config.json +++ b/serialization/serialization_jackson_toml/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson_toml/reflect-config.json @@ -1,6 +1,6 @@ [ { - "name": "com.hexagonkt.serialization.jackson.toml.TomlTest$Player", + "name": "com.hexagontk.serialization.jackson.toml.TomlTest$Player", "allPublicMethods": true, "allDeclaredFields": true, "allDeclaredMethods": true, diff --git a/serialization/serialization_jackson_xml/api/serialization_jackson_xml.api b/serialization/serialization_jackson_xml/api/serialization_jackson_xml.api index 4e8fdccd6f..6209f43b42 100644 --- a/serialization/serialization_jackson_xml/api/serialization_jackson_xml.api +++ b/serialization/serialization_jackson_xml/api/serialization_jackson_xml.api @@ -1,6 +1,6 @@ -public final class com/hexagonkt/serialization/jackson/xml/Xml : com/hexagonkt/serialization/SerializationFormat { - public static final field INSTANCE Lcom/hexagonkt/serialization/jackson/xml/Xml; - public fun getMediaType ()Lcom/hexagonkt/core/media/MediaType; +public final class com/hexagontk/serialization/jackson/xml/Xml : com/hexagontk/serialization/SerializationFormat { + public static final field INSTANCE Lcom/hexagontk/serialization/jackson/xml/Xml; + public fun getMediaType ()Lcom/hexagontk/core/media/MediaType; public fun getTextFormat ()Z public fun parse (Ljava/io/InputStream;)Ljava/lang/Object; public fun parse (Ljava/lang/String;)Ljava/lang/Object; diff --git a/serialization/serialization_jackson_xml/src/main/kotlin/com/hexagonkt/serialization/jackson/xml/Xml.kt b/serialization/serialization_jackson_xml/src/main/kotlin/com/hexagonkt/serialization/jackson/xml/Xml.kt index 3e1e7cb9a7..3083ad31e0 100644 --- a/serialization/serialization_jackson_xml/src/main/kotlin/com/hexagonkt/serialization/jackson/xml/Xml.kt +++ b/serialization/serialization_jackson_xml/src/main/kotlin/com/hexagonkt/serialization/jackson/xml/Xml.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.serialization.jackson.xml +package com.hexagontk.serialization.jackson.xml import com.fasterxml.jackson.databind.DeserializationFeature.* import com.fasterxml.jackson.databind.ObjectMapper @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule import com.fasterxml.jackson.dataformat.xml.XmlMapper import com.fasterxml.jackson.dataformat.xml.util.DefaultXmlPrettyPrinter -import com.hexagonkt.core.media.APPLICATION_XML -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.serialization.SerializationFormat -import com.hexagonkt.serialization.jackson.JacksonHelper.mapNode +import com.hexagontk.core.media.APPLICATION_XML +import com.hexagontk.core.media.MediaType +import com.hexagontk.serialization.SerializationFormat +import com.hexagontk.serialization.jackson.JacksonHelper.mapNode import java.io.InputStream import java.io.OutputStream diff --git a/serialization/serialization_jackson_xml/src/main/kotlin/module-info.java b/serialization/serialization_jackson_xml/src/main/kotlin/module-info.java index 6885ffa88a..b5078e74b9 100644 --- a/serialization/serialization_jackson_xml/src/main/kotlin/module-info.java +++ b/serialization/serialization_jackson_xml/src/main/kotlin/module-info.java @@ -1,9 +1,9 @@ -module com.hexagonkt.serialization_jackson_xml { +module com.hexagontk.serialization_jackson_xml { - requires transitive com.hexagonkt.core; - requires transitive com.hexagonkt.serialization_jackson; + requires transitive com.hexagontk.core; + requires transitive com.hexagontk.serialization_jackson; requires transitive com.fasterxml.jackson.dataformat.xml; - exports com.hexagonkt.serialization.jackson.xml; + exports com.hexagontk.serialization.jackson.xml; } diff --git a/serialization/serialization_jackson_xml/src/test/kotlin/com/hexagonkt/serialization/jackson/xml/XmlTest.kt b/serialization/serialization_jackson_xml/src/test/kotlin/com/hexagonkt/serialization/jackson/xml/XmlTest.kt index dd30192606..1467537416 100644 --- a/serialization/serialization_jackson_xml/src/test/kotlin/com/hexagonkt/serialization/jackson/xml/XmlTest.kt +++ b/serialization/serialization_jackson_xml/src/test/kotlin/com/hexagonkt/serialization/jackson/xml/XmlTest.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.serialization.jackson.xml +package com.hexagontk.serialization.jackson.xml -import com.hexagonkt.core.* -import com.hexagonkt.core.text.toStream -import com.hexagonkt.serialization.* +import com.hexagontk.core.* +import com.hexagontk.core.text.toStream +import com.hexagontk.serialization.* import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance diff --git a/serialization/serialization_jackson_xml/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson_xml/reflect-config.json b/serialization/serialization_jackson_xml/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson_xml/reflect-config.json index 6b3728700c..f743069187 100644 --- a/serialization/serialization_jackson_xml/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson_xml/reflect-config.json +++ b/serialization/serialization_jackson_xml/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson_xml/reflect-config.json @@ -1,6 +1,6 @@ [ { - "name": "com.hexagonkt.serialization.jackson.xml.XmlTest$Player", + "name": "com.hexagontk.serialization.jackson.xml.XmlTest$Player", "allPublicMethods": true, "allDeclaredFields": true, "allDeclaredMethods": true, diff --git a/serialization/serialization_jackson_yaml/api/serialization_jackson_yaml.api b/serialization/serialization_jackson_yaml/api/serialization_jackson_yaml.api index f6bc634595..b9bbe61409 100644 --- a/serialization/serialization_jackson_yaml/api/serialization_jackson_yaml.api +++ b/serialization/serialization_jackson_yaml/api/serialization_jackson_yaml.api @@ -1,12 +1,12 @@ -public final class com/hexagonkt/serialization/jackson/yaml/Yaml : com/hexagonkt/serialization/jackson/yaml/YamlFormat { - public static final field INSTANCE Lcom/hexagonkt/serialization/jackson/yaml/Yaml; - public final fun getRaw ()Lcom/hexagonkt/serialization/jackson/yaml/YamlFormat; +public final class com/hexagontk/serialization/jackson/yaml/Yaml : com/hexagontk/serialization/jackson/yaml/YamlFormat { + public static final field INSTANCE Lcom/hexagontk/serialization/jackson/yaml/Yaml; + public final fun getRaw ()Lcom/hexagontk/serialization/jackson/yaml/YamlFormat; } -public class com/hexagonkt/serialization/jackson/yaml/YamlFormat : com/hexagonkt/serialization/jackson/JacksonTextFormat { +public class com/hexagontk/serialization/jackson/yaml/YamlFormat : com/hexagontk/serialization/jackson/JacksonTextFormat { public fun ()V public fun (Z)V public synthetic fun (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun getMediaType ()Lcom/hexagonkt/core/media/MediaType; + public fun getMediaType ()Lcom/hexagontk/core/media/MediaType; } diff --git a/serialization/serialization_jackson_yaml/src/main/kotlin/com/hexagonkt/serialization/jackson/yaml/Yaml.kt b/serialization/serialization_jackson_yaml/src/main/kotlin/com/hexagonkt/serialization/jackson/yaml/Yaml.kt index 8a2a1dd3b1..a7fbca9857 100644 --- a/serialization/serialization_jackson_yaml/src/main/kotlin/com/hexagonkt/serialization/jackson/yaml/Yaml.kt +++ b/serialization/serialization_jackson_yaml/src/main/kotlin/com/hexagonkt/serialization/jackson/yaml/Yaml.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.serialization.jackson.yaml +package com.hexagontk.serialization.jackson.yaml object Yaml : YamlFormat() { val raw = YamlFormat(false) diff --git a/serialization/serialization_jackson_yaml/src/main/kotlin/com/hexagonkt/serialization/jackson/yaml/YamlFormat.kt b/serialization/serialization_jackson_yaml/src/main/kotlin/com/hexagonkt/serialization/jackson/yaml/YamlFormat.kt index 0ab82e7ab1..5f60a48c33 100644 --- a/serialization/serialization_jackson_yaml/src/main/kotlin/com/hexagonkt/serialization/jackson/yaml/YamlFormat.kt +++ b/serialization/serialization_jackson_yaml/src/main/kotlin/com/hexagonkt/serialization/jackson/yaml/YamlFormat.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.serialization.jackson.yaml +package com.hexagontk.serialization.jackson.yaml import com.fasterxml.jackson.core.JsonFactory import com.fasterxml.jackson.dataformat.yaml.YAMLFactory import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature.* -import com.hexagonkt.core.media.APPLICATION_YAML -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.serialization.jackson.JacksonTextFormat +import com.hexagontk.core.media.APPLICATION_YAML +import com.hexagontk.core.media.MediaType +import com.hexagontk.serialization.jackson.JacksonTextFormat open class YamlFormat( prettyPrint: Boolean = true diff --git a/serialization/serialization_jackson_yaml/src/main/kotlin/module-info.java b/serialization/serialization_jackson_yaml/src/main/kotlin/module-info.java index 3c86daa9ba..3772ea9ec4 100644 --- a/serialization/serialization_jackson_yaml/src/main/kotlin/module-info.java +++ b/serialization/serialization_jackson_yaml/src/main/kotlin/module-info.java @@ -1,9 +1,9 @@ -module com.hexagonkt.serialization_jackson_yaml { +module com.hexagontk.serialization_jackson_yaml { - requires transitive com.hexagonkt.core; - requires transitive com.hexagonkt.serialization_jackson; + requires transitive com.hexagontk.core; + requires transitive com.hexagontk.serialization_jackson; requires transitive com.fasterxml.jackson.dataformat.yaml; - exports com.hexagonkt.serialization.jackson.yaml; + exports com.hexagontk.serialization.jackson.yaml; } diff --git a/serialization/serialization_jackson_yaml/src/test/kotlin/com/hexagonkt/serialization/jackson/yaml/YamlTest.kt b/serialization/serialization_jackson_yaml/src/test/kotlin/com/hexagonkt/serialization/jackson/yaml/YamlTest.kt index 2c37ebb0f4..1ddfa84c4a 100644 --- a/serialization/serialization_jackson_yaml/src/test/kotlin/com/hexagonkt/serialization/jackson/yaml/YamlTest.kt +++ b/serialization/serialization_jackson_yaml/src/test/kotlin/com/hexagonkt/serialization/jackson/yaml/YamlTest.kt @@ -1,11 +1,11 @@ -package com.hexagonkt.serialization.jackson.yaml - -import com.hexagonkt.core.fieldsMapOfNotNull -import com.hexagonkt.core.require -import com.hexagonkt.core.requirePath -import com.hexagonkt.core.urlOf -import com.hexagonkt.serialization.* -import com.hexagonkt.serialization.test.SerializationTest +package com.hexagontk.serialization.jackson.yaml + +import com.hexagontk.core.fieldsMapOfNotNull +import com.hexagontk.core.require +import com.hexagontk.core.requirePath +import com.hexagontk.core.urlOf +import com.hexagontk.serialization.* +import com.hexagontk.serialization.test.SerializationTest import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance diff --git a/serialization/serialization_jackson_yaml/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson_yaml/reflect-config.json b/serialization/serialization_jackson_yaml/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson_yaml/reflect-config.json index 100e973976..5df9e08451 100644 --- a/serialization/serialization_jackson_yaml/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson_yaml/reflect-config.json +++ b/serialization/serialization_jackson_yaml/src/test/resources/META-INF/native-image/com.hexagonkt/serialization_jackson_yaml/reflect-config.json @@ -1,6 +1,6 @@ [ { - "name": "com.hexagonkt.serialization.jackson.yaml.YamlTest$Player", + "name": "com.hexagontk.serialization.jackson.yaml.YamlTest$Player", "allPublicMethods": true, "allDeclaredFields": true, "allDeclaredMethods": true, diff --git a/serialization/serialization_test/src/main/kotlin/com/hexagonkt/serialization/test/SerializationTest.kt b/serialization/serialization_test/src/main/kotlin/com/hexagonkt/serialization/test/SerializationTest.kt index fbf46bc670..fad5233474 100644 --- a/serialization/serialization_test/src/main/kotlin/com/hexagonkt/serialization/test/SerializationTest.kt +++ b/serialization/serialization_test/src/main/kotlin/com/hexagonkt/serialization/test/SerializationTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.serialization.test +package com.hexagontk.serialization.test -import com.hexagonkt.core.requirePath -import com.hexagonkt.serialization.* +import com.hexagontk.core.requirePath +import com.hexagontk.serialization.* import org.junit.jupiter.api.Test import java.net.URL import java.time.LocalDate diff --git a/serverless/serverless_http_google/README.md b/serverless/serverless_http_google/README.md index 8d20407471..2b92bf9d25 100644 --- a/serverless/serverless_http_google/README.md +++ b/serverless/serverless_http_google/README.md @@ -5,5 +5,5 @@ TODO ## Install the Dependency TODO -# Package com.hexagonkt.serverless.http.google +# Package com.hexagontk.serverless.http.google TODO diff --git a/serverless/serverless_http_google/build.gradle.kts b/serverless/serverless_http_google/build.gradle.kts index f126f4f5bb..2ae0616b53 100644 --- a/serverless/serverless_http_google/build.gradle.kts +++ b/serverless/serverless_http_google/build.gradle.kts @@ -10,7 +10,7 @@ apply(from = "$rootDir/gradle/detekt.gradle") description = "Google Functions Serverless adapter." -private val target = "com.hexagonkt.serverless.http.google.GoogleServerlessHttpAdapter" +private val target = "com.hexagontk.serverless.http.google.GoogleServerlessHttpAdapter" private val invoker by configurations.creating dependencies { diff --git a/serverless/serverless_http_google/src/main/kotlin/com/hexagonkt/serverless/http/google/GoogleServerlessHttpAdapter.kt b/serverless/serverless_http_google/src/main/kotlin/com/hexagonkt/serverless/http/google/GoogleServerlessHttpAdapter.kt index 5da7ce3316..f92cd0445a 100644 --- a/serverless/serverless_http_google/src/main/kotlin/com/hexagonkt/serverless/http/google/GoogleServerlessHttpAdapter.kt +++ b/serverless/serverless_http_google/src/main/kotlin/com/hexagonkt/serverless/http/google/GoogleServerlessHttpAdapter.kt @@ -1,12 +1,12 @@ -package com.hexagonkt.serverless.http.google +package com.hexagontk.serverless.http.google import com.google.cloud.functions.HttpFunction import com.google.cloud.functions.HttpRequest import com.google.cloud.functions.HttpResponse -import com.hexagonkt.http.handlers.HttpContext -import com.hexagonkt.http.handlers.HttpHandler -import com.hexagonkt.http.model.* -import com.hexagonkt.http.parseContentType +import com.hexagontk.http.handlers.HttpContext +import com.hexagontk.http.handlers.HttpHandler +import com.hexagontk.http.model.* +import com.hexagontk.http.parseContentType import java.net.URI class GoogleServerlessHttpAdapter(private val handler: HttpHandler): HttpFunction { @@ -17,7 +17,7 @@ class GoogleServerlessHttpAdapter(private val handler: HttpHandler): HttpFunctio writeResponse(response, handlerContext) } - private fun createRequest(request: HttpRequest): com.hexagonkt.http.model.HttpRequest { + private fun createRequest(request: HttpRequest): com.hexagontk.http.model.HttpRequest { val uri = URI(request.uri) val qp = request.queryParameters?.map { (k, v) -> QueryParameter(k, v) } ?: emptyList() val h = request.headers?.map { (k, v) -> Header(k, v) } ?: emptyList() diff --git a/serverless/serverless_http_google/src/test/kotlin/com/hexagonkt/serverless/http/google/GoogleServerlessHttpAdapterTest.kt b/serverless/serverless_http_google/src/test/kotlin/com/hexagonkt/serverless/http/google/GoogleServerlessHttpAdapterTest.kt index 8730e22057..0cdf8c4ea3 100644 --- a/serverless/serverless_http_google/src/test/kotlin/com/hexagonkt/serverless/http/google/GoogleServerlessHttpAdapterTest.kt +++ b/serverless/serverless_http_google/src/test/kotlin/com/hexagonkt/serverless/http/google/GoogleServerlessHttpAdapterTest.kt @@ -1,14 +1,14 @@ -package com.hexagonkt.serverless.http.google +package com.hexagontk.serverless.http.google import com.google.cloud.functions.HttpFunction import com.google.cloud.functions.HttpRequest import com.google.cloud.functions.HttpResponse import com.google.cloud.functions.invoker.runner.Invoker -import com.hexagonkt.core.freePort -import com.hexagonkt.core.urlOf -import com.hexagonkt.http.client.HttpClient -import com.hexagonkt.http.client.HttpClientSettings -import com.hexagonkt.http.client.java.JavaClientAdapter +import com.hexagontk.core.freePort +import com.hexagontk.core.urlOf +import com.hexagontk.http.client.HttpClient +import com.hexagontk.http.client.HttpClientSettings +import com.hexagontk.http.client.java.JavaClientAdapter import kotlin.reflect.KClass import kotlin.test.Test import kotlin.test.assertEquals diff --git a/site/build.gradle.kts b/site/build.gradle.kts index 92728427e6..6cd63f0faa 100644 --- a/site/build.gradle.kts +++ b/site/build.gradle.kts @@ -96,9 +96,9 @@ task("checkDocs") { dependsOn("mkDocs") doLast { val readme = rootProject.file("README.md") - val helloWorld = "com/hexagonkt/http/server/jetty/HelloWorldTest.kt" + val helloWorld = "com/hexagontk/http/server/jetty/HelloWorldTest.kt" val service = rootProject.file("http/http_server_jetty/src/test/kotlin/$helloWorld") - val examples = "http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples" + val examples = "http/http_test/src/main/kotlin/com/hexagontk/http/test/examples" checkSampleCode(readme, rootProject.file(service), "hello_world") checkSampleCode(readme, rootProject.file("$examples/BooksTest.kt"), "books") diff --git a/site/mkdocs/index.html b/site/mkdocs/index.html index 42d3772b8c..0c9d8fa135 100644 --- a/site/mkdocs/index.html +++ b/site/mkdocs/index.html @@ -20,7 +20,7 @@ Coverage - + Maven Central Repository

diff --git a/site/pages/examples/http_client_examples.md b/site/pages/examples/http_client_examples.md index 9590e407ad..eafdc7b7c2 100644 --- a/site/pages/examples/http_client_examples.md +++ b/site/pages/examples/http_client_examples.md @@ -1,49 +1,49 @@ # HTTP Client Creation Example This example shows how to create HTTP Client instances. Check the -[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt) +[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt) for more information. ## Without setting parameters -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt?clientCreation +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt?clientCreation ## Using client settings -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt?clientSettingsCreation +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt?clientSettingsCreation # Send Requests Example This example shows send HTTP requests to a server. Here you can check the -[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt). +[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt). ## Generic request -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt?genericRequest +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt?genericRequest ## Shortcut without body sending -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt?withoutBodyRequests +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt?withoutBodyRequests ## Shortcut with payload sending -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt?bodyRequests +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt?bodyRequests ## Shortcut including body and content type -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt?bodyAndContentTypeRequests +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ClientTest.kt?bodyAndContentTypeRequests # Use Cookies Example -Check the details at the [full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CookiesTest.kt). +Check the details at the [full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/CookiesTest.kt). -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CookiesTest.kt?clientCookies +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/CookiesTest.kt?clientCookies # Multipart Requests Example -Refer to the [full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FilesTest.kt) +Refer to the [full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/FilesTest.kt) for more details. ## Send form fields -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FilesTest.kt?clientForm +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/FilesTest.kt?clientForm ## Send and attached file -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FilesTest.kt?clientFile +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/FilesTest.kt?clientFile # Mutual TLS Example This example shows how make requests using mutual TLS between the client and the server. You can -check the [full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt) +check the [full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/HttpsTest.kt) for more details. -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt?https +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/HttpsTest.kt?https diff --git a/site/pages/examples/http_server_examples.md b/site/pages/examples/http_server_examples.md index 7c7dca878d..3f6353a35d 100644 --- a/site/pages/examples/http_server_examples.md +++ b/site/pages/examples/http_server_examples.md @@ -1,42 +1,42 @@ # Books Example A simple CRUD example showing how to manage book resources. Here you can check the -[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BooksTest.kt). +[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/BooksTest.kt). -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BooksTest.kt?books +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/BooksTest.kt?books # Cookies Example Demo server to show the use of cookies. Here you can check the -[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CookiesTest.kt). +[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/CookiesTest.kt). -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CookiesTest.kt?cookies +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/CookiesTest.kt?cookies # Error Handling Example Code to show how to handle callback exceptions and HTTP error codes. Here you can check the -[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ErrorsTest.kt). +[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ErrorsTest.kt). -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ErrorsTest.kt?errors +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/ErrorsTest.kt?errors # Filters Example This example shows how to add filters before and after route execution. Here you can check the -[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FiltersTest.kt). +[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/FiltersTest.kt). -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FiltersTest.kt?filters +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/FiltersTest.kt?filters # Files Example The following code shows how to serve resources and receive files. Here you can check the -[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FilesTest.kt). +[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/FilesTest.kt). -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/FilesTest.kt?files +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/FilesTest.kt?files # CORS Example This example shows how to set up CORS for REST APIs used from the browser. Here you can check the -[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CorsTest.kt). +[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/CorsTest.kt). -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/CorsTest.kt?cors +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/CorsTest.kt?cors # HTTPS Example The snippet below shows how to set up your server to use HTTPS and HTTP/2. You can check the -[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt). +[full test](https://github.com/hexagontk/hexagon/blob/master/http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/HttpsTest.kt). -@code http/http_test/src/main/kotlin/com/hexagonkt/http/test/examples/HttpsTest.kt?https +@code http/http_test/src/main/kotlin/com/hexagontk/http/test/examples/HttpsTest.kt?https diff --git a/site/pages/examples/templates_examples.md b/site/pages/examples/templates_examples.md index e4ee346c82..66a3384d0b 100644 --- a/site/pages/examples/templates_examples.md +++ b/site/pages/examples/templates_examples.md @@ -1,16 +1,16 @@ # Register Template Adapters Example to show how to register template adapters. -[full test](https://github.com/hexagontk/hexagon/blob/master/templates/templates/src/test/kotlin/com/hexagonkt/templates/examples/TemplatesTest.kt). +[full test](https://github.com/hexagontk/hexagon/blob/master/templates/templates/src/test/kotlin/com/hexagontk/templates/examples/TemplatesTest.kt). ## Using regular Expressions -@code templates/templates/src/test/kotlin/com/hexagonkt/templates/examples/TemplatesTest.kt?templateRegex +@code templates/templates/src/test/kotlin/com/hexagontk/templates/examples/TemplatesTest.kt?templateRegex ## Using globs -@code templates/templates/src/test/kotlin/com/hexagonkt/templates/examples/TemplatesTest.kt?templateGlob +@code templates/templates/src/test/kotlin/com/hexagontk/templates/examples/TemplatesTest.kt?templateGlob # Process Templates Simple example to show how to process templates. -[full test](https://github.com/hexagontk/hexagon/blob/master/templates/templates/src/test/kotlin/com/hexagonkt/templates/examples/TemplatesTest.kt). +[full test](https://github.com/hexagontk/hexagon/blob/master/templates/templates/src/test/kotlin/com/hexagontk/templates/examples/TemplatesTest.kt). -@code templates/templates/src/test/kotlin/com/hexagonkt/templates/examples/TemplatesTest.kt?templateUsage +@code templates/templates/src/test/kotlin/com/hexagontk/templates/examples/TemplatesTest.kt?templateUsage diff --git a/site/pages/index.md b/site/pages/index.md index dbdcbbad7c..11f28d7c38 100644 --- a/site/pages/index.md +++ b/site/pages/index.md @@ -35,7 +35,7 @@ principles also fit into this architecture. # Hello World Simple Hello World HTTP example. -@code http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/HelloWorldTest.kt?hello_world +@code http/http_server_jetty/src/test/kotlin/com/hexagontk/http/server/jetty/HelloWorldTest.kt?hello_world You can check the [code examples] and [demo projects] for more complex use cases. @@ -159,11 +159,11 @@ Ports with their provided implementations (Adapters). [Rocker]: /templates_rocker [jte]: /templates_jte [Serialization Formats]: /serialization -[JSON]: /api/serialization/serialization_jackson_json/com.hexagonkt.serialization.jackson.json/-json -[YAML]: /api/serialization/serialization_jackson_yaml/com.hexagonkt.serialization.jackson.yaml/-yaml -[CSV]: /api/serialization/serialization_jackson_csv/com.hexagonkt.serialization.jackson.csv/-csv -[XML]: /api/serialization/serialization_jackson_xml/com.hexagonkt.serialization.jackson.xml/-xml -[TOML]: /api/serialization/serialization_jackson_toml/com.hexagonkt.serialization.jackson.toml/-toml +[JSON]: /api/serialization/serialization_jackson_json/com.hexagontk.serialization.jackson.json/-json +[YAML]: /api/serialization/serialization_jackson_yaml/com.hexagontk.serialization.jackson.yaml/-yaml +[CSV]: /api/serialization/serialization_jackson_csv/com.hexagontk.serialization.jackson.csv/-csv +[XML]: /api/serialization/serialization_jackson_xml/com.hexagontk.serialization.jackson.xml/-xml +[TOML]: /api/serialization/serialization_jackson_toml/com.hexagontk.serialization.jackson.toml/-toml # Module Dependencies Module dependencies (including extra modules): diff --git a/site/pages/maven.md b/site/pages/maven.md index 66cc768347..e5a366c2d5 100644 --- a/site/pages/maven.md +++ b/site/pages/maven.md @@ -19,7 +19,7 @@ the features it provides: ```xml - com.hexagonkt + com.hexagontk kotlin_pom $hexagonVersion @@ -35,7 +35,7 @@ using this approach is that it differs of the standard one. ```xml - com.hexagonkt + com.hexagontk kotlin_lean_pom $hexagonVersion diff --git a/site/pages/quick_start.md b/site/pages/quick_start.md index cb36936012..2695a0ec05 100644 --- a/site/pages/quick_start.md +++ b/site/pages/quick_start.md @@ -16,14 +16,14 @@ a project from scratch following these steps: mavenCentral() } - implementation("com.hexagonkt:http_server_jetty:$hexagonVersion") + implementation("com.hexagontk:http_server_jetty:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk http_server_jetty $hexagonVersion @@ -31,7 +31,7 @@ a project from scratch following these steps: 4. Write the code in the `src/main/kotlin/Hello.kt` file: -@code http/http_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/HelloWorldTest.kt?hello_world +@code http/http_server_jetty/src/test/kotlin/com/hexagontk/http/server/jetty/HelloWorldTest.kt?hello_world 5. Run the service and view the results at: [http://localhost:2010/hello/hex][Endpoint] diff --git a/starters/README.md b/starters/README.md index a6af583e49..0ed3c97450 100644 --- a/starters/README.md +++ b/starters/README.md @@ -7,7 +7,7 @@ This module holds the Maven parent POMs with Kotlin setup to ease the project cr ```xml - com.hexagonkt + com.hexagontk kotlin_pom $VERSION @@ -17,7 +17,7 @@ Or: ```xml - com.hexagonkt + com.hexagontk kotlin_lean_pom $VERSION diff --git a/starters/build.gradle.kts b/starters/build.gradle.kts index 681dad765d..03b42c44cf 100644 --- a/starters/build.gradle.kts +++ b/starters/build.gradle.kts @@ -98,7 +98,7 @@ fun PublicationContainer.createPomPublication( developers { developer { - id.set("hexagonkt") + id.set("hexagontk") name.set("Hexagon Toolkit") email.set("project@hexagontk.com") } diff --git a/starters/hexagon_bom.xml b/starters/hexagon_bom.xml index 1a8dae81e1..dd2c61917b 100644 --- a/starters/hexagon_bom.xml +++ b/starters/hexagon_bom.xml @@ -10,167 +10,167 @@ - com.hexagonkt + com.hexagontk core ${hexagon.version} - com.hexagonkt + com.hexagontk http ${hexagon.version} - com.hexagonkt + com.hexagontk http_client ${hexagon.version} - com.hexagonkt + com.hexagontk http_client_java ${hexagon.version} - com.hexagonkt + com.hexagontk http_client_jetty ${hexagon.version} - com.hexagonkt + com.hexagontk http_client_jetty_ws ${hexagon.version} - com.hexagonkt + com.hexagontk http_server_helidon ${hexagon.version} - com.hexagonkt + com.hexagontk http_server ${hexagon.version} - com.hexagonkt + com.hexagontk http_server_jetty ${hexagon.version} - com.hexagonkt + com.hexagontk http_server_netty ${hexagon.version} - com.hexagonkt + com.hexagontk http_server_netty_epoll ${hexagon.version} - com.hexagonkt + com.hexagontk http_server_servlet ${hexagon.version} - com.hexagonkt + com.hexagontk http_test ${hexagon.version} - com.hexagonkt + com.hexagontk rest ${hexagon.version} - com.hexagonkt + com.hexagontk rest_tools ${hexagon.version} - com.hexagonkt + com.hexagontk web ${hexagon.version} - com.hexagonkt + com.hexagontk logging_jul ${hexagon.version} - com.hexagonkt + com.hexagontk logging_logback ${hexagon.version} - com.hexagonkt + com.hexagontk logging_slf4j_jul ${hexagon.version} - com.hexagonkt + com.hexagontk serialization ${hexagon.version} - com.hexagonkt + com.hexagontk serialization_dsl_json ${hexagon.version} - com.hexagonkt + com.hexagontk serialization_jackson ${hexagon.version} - com.hexagonkt + com.hexagontk serialization_jackson_csv ${hexagon.version} - com.hexagonkt + com.hexagontk serialization_jackson_json ${hexagon.version} - com.hexagonkt + com.hexagontk serialization_jackson_xml ${hexagon.version} - com.hexagonkt + com.hexagontk serialization_jackson_yaml ${hexagon.version} - com.hexagonkt + com.hexagontk serialization_jackson_toml ${hexagon.version} - com.hexagonkt + com.hexagontk serialization_test ${hexagon.version} - com.hexagonkt + com.hexagontk templates ${hexagon.version} - com.hexagonkt + com.hexagontk templates_freemarker ${hexagon.version} - com.hexagonkt + com.hexagontk templates_pebble ${hexagon.version} - com.hexagonkt + com.hexagontk templates_rocker ${hexagon.version} - com.hexagonkt + com.hexagontk templates_test ${hexagon.version} diff --git a/starters/kotlin_lean_pom.xml b/starters/kotlin_lean_pom.xml index 35b214d98f..fecb2747ea 100644 --- a/starters/kotlin_lean_pom.xml +++ b/starters/kotlin_lean_pom.xml @@ -1,7 +1,7 @@ - com.hexagonkt + com.hexagontk kotlin_pom diff --git a/templates/templates/README.md b/templates/templates/README.md index 20ace00fc3..284b0b2945 100644 --- a/templates/templates/README.md +++ b/templates/templates/README.md @@ -16,22 +16,22 @@ the same time. # Register a Template Engine You can register multiple template engines using regular expressions: -@code templates/templates/src/test/kotlin/com/hexagonkt/templates/examples/TemplatesTest.kt?templateRegex +@code templates/templates/src/test/kotlin/com/hexagontk/templates/examples/TemplatesTest.kt?templateRegex The template adapter is selected from top to bottom, picking the first matched one. You can use Glob syntax to bind patterns to template adapters if you prefer: -@code templates/templates/src/test/kotlin/com/hexagonkt/templates/examples/TemplatesTest.kt?templateGlob +@code templates/templates/src/test/kotlin/com/hexagontk/templates/examples/TemplatesTest.kt?templateGlob # Usage To render a template, you have to use the [TemplateManager] object. The data to be used inside the template must be supplied in a map (context), the template URL and current time-stamp (`_template_` and `_now_` variables) are added to the context automatically. Check the code below for an example: -@code templates/templates/src/test/kotlin/com/hexagonkt/templates/examples/TemplatesTest.kt?templateUsage +@code templates/templates/src/test/kotlin/com/hexagontk/templates/examples/TemplatesTest.kt?templateUsage -[TemplateManager]: /api/templates/templates/com.hexagonkt.templates/-template-manager +[TemplateManager]: /api/templates/templates/com.hexagontk.templates/-template-manager -# Package com.hexagonkt.templates +# Package com.hexagontk.templates Feature implementation code. diff --git a/templates/templates/api/templates.api b/templates/templates/api/templates.api index 896431ea85..606aafcf2b 100644 --- a/templates/templates/api/templates.api +++ b/templates/templates/api/templates.api @@ -1,21 +1,21 @@ -public final class com/hexagonkt/templates/TemplateManager { - public static final field INSTANCE Lcom/hexagonkt/templates/TemplateManager; +public final class com/hexagontk/templates/TemplateManager { + public static final field INSTANCE Lcom/hexagontk/templates/TemplateManager; public final fun getAdapters ()Ljava/util/Map; public final fun render (Ljava/net/URL;Ljava/util/Map;Ljava/util/Locale;)Ljava/lang/String; - public static synthetic fun render$default (Lcom/hexagonkt/templates/TemplateManager;Ljava/net/URL;Ljava/util/Map;Ljava/util/Locale;ILjava/lang/Object;)Ljava/lang/String; + public static synthetic fun render$default (Lcom/hexagontk/templates/TemplateManager;Ljava/net/URL;Ljava/util/Map;Ljava/util/Locale;ILjava/lang/Object;)Ljava/lang/String; public final fun setAdapters (Ljava/util/Map;)V } -public abstract interface class com/hexagonkt/templates/TemplatePort { +public abstract interface class com/hexagontk/templates/TemplatePort { public abstract fun render (Ljava/lang/String;Ljava/util/Map;Ljava/util/Locale;)Ljava/lang/String; public abstract fun render (Ljava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Locale;)Ljava/lang/String; public abstract fun render (Ljava/net/URL;Ljava/util/Map;Ljava/util/Locale;)Ljava/lang/String; } -public final class com/hexagonkt/templates/TemplatePort$DefaultImpls { - public static fun render (Lcom/hexagonkt/templates/TemplatePort;Ljava/lang/String;Ljava/util/Map;Ljava/util/Locale;)Ljava/lang/String; - public static synthetic fun render$default (Lcom/hexagonkt/templates/TemplatePort;Ljava/lang/String;Ljava/util/Map;Ljava/util/Locale;ILjava/lang/Object;)Ljava/lang/String; - public static synthetic fun render$default (Lcom/hexagonkt/templates/TemplatePort;Ljava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Locale;ILjava/lang/Object;)Ljava/lang/String; - public static synthetic fun render$default (Lcom/hexagonkt/templates/TemplatePort;Ljava/net/URL;Ljava/util/Map;Ljava/util/Locale;ILjava/lang/Object;)Ljava/lang/String; +public final class com/hexagontk/templates/TemplatePort$DefaultImpls { + public static fun render (Lcom/hexagontk/templates/TemplatePort;Ljava/lang/String;Ljava/util/Map;Ljava/util/Locale;)Ljava/lang/String; + public static synthetic fun render$default (Lcom/hexagontk/templates/TemplatePort;Ljava/lang/String;Ljava/util/Map;Ljava/util/Locale;ILjava/lang/Object;)Ljava/lang/String; + public static synthetic fun render$default (Lcom/hexagontk/templates/TemplatePort;Ljava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Locale;ILjava/lang/Object;)Ljava/lang/String; + public static synthetic fun render$default (Lcom/hexagontk/templates/TemplatePort;Ljava/net/URL;Ljava/util/Map;Ljava/util/Locale;ILjava/lang/Object;)Ljava/lang/String; } diff --git a/templates/templates/src/main/kotlin/com/hexagonkt/templates/TemplateManager.kt b/templates/templates/src/main/kotlin/com/hexagonkt/templates/TemplateManager.kt index 6cb03ee22f..398647e3d2 100644 --- a/templates/templates/src/main/kotlin/com/hexagonkt/templates/TemplateManager.kt +++ b/templates/templates/src/main/kotlin/com/hexagonkt/templates/TemplateManager.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.templates +package com.hexagontk.templates -import com.hexagonkt.core.Jvm -import com.hexagonkt.core.localized +import com.hexagontk.core.Jvm +import com.hexagontk.core.localized import java.net.URL import java.time.LocalDateTime import java.util.Locale diff --git a/templates/templates/src/main/kotlin/com/hexagonkt/templates/TemplatePort.kt b/templates/templates/src/main/kotlin/com/hexagonkt/templates/TemplatePort.kt index b653d54371..f70911c738 100644 --- a/templates/templates/src/main/kotlin/com/hexagonkt/templates/TemplatePort.kt +++ b/templates/templates/src/main/kotlin/com/hexagonkt/templates/TemplatePort.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.templates +package com.hexagontk.templates -import com.hexagonkt.core.Jvm +import com.hexagontk.core.Jvm import java.net.URL import java.util.* diff --git a/templates/templates/src/main/kotlin/module-info.java b/templates/templates/src/main/kotlin/module-info.java index da9c87c4ae..ec6138e372 100644 --- a/templates/templates/src/main/kotlin/module-info.java +++ b/templates/templates/src/main/kotlin/module-info.java @@ -1,7 +1,7 @@ -module com.hexagonkt.templates { +module com.hexagontk.templates { - requires transitive com.hexagonkt.core; + requires transitive com.hexagontk.core; - exports com.hexagonkt.templates; + exports com.hexagontk.templates; } diff --git a/templates/templates/src/test/kotlin/com/hexagonkt/templates/CheatSheetTest.kt b/templates/templates/src/test/kotlin/com/hexagonkt/templates/CheatSheetTest.kt index 1923d5967a..05f0a91192 100644 --- a/templates/templates/src/test/kotlin/com/hexagonkt/templates/CheatSheetTest.kt +++ b/templates/templates/src/test/kotlin/com/hexagonkt/templates/CheatSheetTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.templates +package com.hexagontk.templates import org.junit.jupiter.api.Test diff --git a/templates/templates/src/test/kotlin/com/hexagonkt/templates/SampleTemplateAdapter.kt b/templates/templates/src/test/kotlin/com/hexagonkt/templates/SampleTemplateAdapter.kt index f7c531142a..858985f6ec 100644 --- a/templates/templates/src/test/kotlin/com/hexagonkt/templates/SampleTemplateAdapter.kt +++ b/templates/templates/src/test/kotlin/com/hexagonkt/templates/SampleTemplateAdapter.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.templates +package com.hexagontk.templates import java.net.URL import java.util.* diff --git a/templates/templates/src/test/kotlin/com/hexagonkt/templates/TemplateManagerTest.kt b/templates/templates/src/test/kotlin/com/hexagonkt/templates/TemplateManagerTest.kt index 7269867fa5..04edeb3538 100644 --- a/templates/templates/src/test/kotlin/com/hexagonkt/templates/TemplateManagerTest.kt +++ b/templates/templates/src/test/kotlin/com/hexagonkt/templates/TemplateManagerTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.templates +package com.hexagontk.templates -import com.hexagonkt.core.text.Glob -import com.hexagonkt.core.urlOf +import com.hexagontk.core.text.Glob +import com.hexagontk.core.urlOf import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows diff --git a/templates/templates/src/test/kotlin/com/hexagonkt/templates/TemplatePortTest.kt b/templates/templates/src/test/kotlin/com/hexagonkt/templates/TemplatePortTest.kt index ded0a7f416..72ce37aa51 100644 --- a/templates/templates/src/test/kotlin/com/hexagonkt/templates/TemplatePortTest.kt +++ b/templates/templates/src/test/kotlin/com/hexagonkt/templates/TemplatePortTest.kt @@ -1,4 +1,4 @@ -package com.hexagonkt.templates +package com.hexagontk.templates import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/templates/templates/src/test/kotlin/com/hexagonkt/templates/examples/TemplatesTest.kt b/templates/templates/src/test/kotlin/com/hexagonkt/templates/examples/TemplatesTest.kt index c621b762a9..268aa90cb3 100644 --- a/templates/templates/src/test/kotlin/com/hexagonkt/templates/examples/TemplatesTest.kt +++ b/templates/templates/src/test/kotlin/com/hexagonkt/templates/examples/TemplatesTest.kt @@ -1,10 +1,10 @@ -package com.hexagonkt.templates.examples +package com.hexagontk.templates.examples -import com.hexagonkt.core.text.Glob -import com.hexagonkt.core.urlOf -import com.hexagonkt.templates.SampleTemplateAdapter -import com.hexagonkt.templates.TemplateManager -import com.hexagonkt.templates.TemplatePort +import com.hexagontk.core.text.Glob +import com.hexagontk.core.urlOf +import com.hexagontk.templates.SampleTemplateAdapter +import com.hexagontk.templates.TemplateManager +import com.hexagontk.templates.TemplatePort import org.junit.jupiter.api.Test import java.net.URL import java.util.* diff --git a/templates/templates_freemarker/README.md b/templates/templates_freemarker/README.md index 92e7108e06..3cb73c91c0 100644 --- a/templates/templates_freemarker/README.md +++ b/templates/templates_freemarker/README.md @@ -16,18 +16,18 @@ For usage instructions, refer to the [Templates Port documentation](/templates/) mavenCentral() } - implementation("com.hexagonkt:templates_freemarker:$hexagonVersion") + implementation("com.hexagontk:templates_freemarker:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk templates_freemarker $hexagonVersion ``` -# Package com.hexagonkt.templates.freemarker +# Package com.hexagontk.templates.freemarker Classes that implement the Templates Port interface with the [FreeMarker] engine. diff --git a/templates/templates_freemarker/api/templates_freemarker.api b/templates/templates_freemarker/api/templates_freemarker.api index e55ccc7a98..f31cc650d3 100644 --- a/templates/templates_freemarker/api/templates_freemarker.api +++ b/templates/templates_freemarker/api/templates_freemarker.api @@ -1,16 +1,16 @@ -public final class com/hexagonkt/templates/freemarker/FreeMarkerAdapter : com/hexagonkt/templates/TemplatePort { +public final class com/hexagontk/templates/freemarker/FreeMarkerAdapter : com/hexagontk/templates/TemplatePort { public fun ()V public fun render (Ljava/lang/String;Ljava/util/Map;Ljava/util/Locale;)Ljava/lang/String; public fun render (Ljava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Locale;)Ljava/lang/String; public fun render (Ljava/net/URL;Ljava/util/Map;Ljava/util/Locale;)Ljava/lang/String; } -public final class com/hexagonkt/templates/freemarker/FreeMarkerAdapter$AdapterTemplateLoader : freemarker/cache/URLTemplateLoader { - public static final field INSTANCE Lcom/hexagonkt/templates/freemarker/FreeMarkerAdapter$AdapterTemplateLoader; +public final class com/hexagontk/templates/freemarker/FreeMarkerAdapter$AdapterTemplateLoader : freemarker/cache/URLTemplateLoader { + public static final field INSTANCE Lcom/hexagontk/templates/freemarker/FreeMarkerAdapter$AdapterTemplateLoader; } -public final class com/hexagonkt/templates/freemarker/FreeMarkerAdapter$AdapterTemplateLookupStrategy : freemarker/cache/TemplateLookupStrategy { - public static final field INSTANCE Lcom/hexagonkt/templates/freemarker/FreeMarkerAdapter$AdapterTemplateLookupStrategy; +public final class com/hexagontk/templates/freemarker/FreeMarkerAdapter$AdapterTemplateLookupStrategy : freemarker/cache/TemplateLookupStrategy { + public static final field INSTANCE Lcom/hexagontk/templates/freemarker/FreeMarkerAdapter$AdapterTemplateLookupStrategy; public fun lookup (Lfreemarker/cache/TemplateLookupContext;)Lfreemarker/cache/TemplateLookupResult; } diff --git a/templates/templates_freemarker/src/main/kotlin/com/hexagonkt/templates/freemarker/FreeMarkerAdapter.kt b/templates/templates_freemarker/src/main/kotlin/com/hexagonkt/templates/freemarker/FreeMarkerAdapter.kt index ee8b51ddb7..f89e5c3e81 100644 --- a/templates/templates_freemarker/src/main/kotlin/com/hexagonkt/templates/freemarker/FreeMarkerAdapter.kt +++ b/templates/templates_freemarker/src/main/kotlin/com/hexagonkt/templates/freemarker/FreeMarkerAdapter.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.templates.freemarker +package com.hexagontk.templates.freemarker -import com.hexagonkt.core.ResourceNotFoundException -import com.hexagonkt.core.urlOf -import com.hexagonkt.templates.TemplatePort +import com.hexagontk.core.ResourceNotFoundException +import com.hexagontk.core.urlOf +import com.hexagontk.templates.TemplatePort import freemarker.cache.StringTemplateLoader import freemarker.cache.TemplateLookupContext import freemarker.cache.TemplateLookupResult diff --git a/templates/templates_freemarker/src/main/kotlin/module-info.java b/templates/templates_freemarker/src/main/kotlin/module-info.java index 4f1e5a162e..711818d094 100644 --- a/templates/templates_freemarker/src/main/kotlin/module-info.java +++ b/templates/templates_freemarker/src/main/kotlin/module-info.java @@ -1,10 +1,10 @@ -module com.hexagonkt.templates_freemarker { +module com.hexagontk.templates_freemarker { requires transitive kotlin.stdlib; - requires transitive com.hexagonkt.templates; + requires transitive com.hexagontk.templates; requires freemarker; - exports com.hexagonkt.templates.freemarker; + exports com.hexagontk.templates.freemarker; } diff --git a/templates/templates_freemarker/src/test/kotlin/com/hexagonkt/templates/freemarker/FreeMarkerAdapterTest.kt b/templates/templates_freemarker/src/test/kotlin/com/hexagonkt/templates/freemarker/FreeMarkerAdapterTest.kt index ad53e2effb..a59921d34c 100644 --- a/templates/templates_freemarker/src/test/kotlin/com/hexagonkt/templates/freemarker/FreeMarkerAdapterTest.kt +++ b/templates/templates_freemarker/src/test/kotlin/com/hexagonkt/templates/freemarker/FreeMarkerAdapterTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.templates.freemarker +package com.hexagontk.templates.freemarker -import com.hexagonkt.core.urlOf +import com.hexagontk.core.urlOf import org.junit.jupiter.api.Test import java.time.LocalDateTime import java.util.Locale diff --git a/templates/templates_freemarker/src/test/kotlin/com/hexagonkt/templates/freemarker/FreeMarkerTemplateAdapterTest.kt b/templates/templates_freemarker/src/test/kotlin/com/hexagonkt/templates/freemarker/FreeMarkerTemplateAdapterTest.kt index 51736e1921..cb3a1e1836 100644 --- a/templates/templates_freemarker/src/test/kotlin/com/hexagonkt/templates/freemarker/FreeMarkerTemplateAdapterTest.kt +++ b/templates/templates_freemarker/src/test/kotlin/com/hexagonkt/templates/freemarker/FreeMarkerTemplateAdapterTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.templates.freemarker +package com.hexagontk.templates.freemarker -import com.hexagonkt.core.urlOf -import com.hexagonkt.templates.test.TemplateAdapterTest +import com.hexagontk.core.urlOf +import com.hexagontk.templates.test.TemplateAdapterTest internal class FreeMarkerTemplateAdapterTest : TemplateAdapterTest(urlOf("classpath:templates/test.freemarker.html"), FreeMarkerAdapter()) diff --git a/templates/templates_jte/README.md b/templates/templates_jte/README.md index 778a17e29b..8e45b2fe71 100644 --- a/templates/templates_jte/README.md +++ b/templates/templates_jte/README.md @@ -15,14 +15,14 @@ For usage instructions, refer to the [Templates Port documentation](/templates/) mavenCentral() } - implementation("com.hexagonkt:templates_jte:$hexagonVersion") + implementation("com.hexagontk:templates_jte:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk templates_jte $hexagonVersion @@ -59,5 +59,5 @@ jte { * Test file loaded templates * Test plain test templates -# Package com.hexagonkt.templates.jte +# Package com.hexagontk.templates.jte Classes that implement the Templates Port interface with the [jte] engine. diff --git a/templates/templates_jte/src/main/kotlin/com/hexagonkt/templates/jte/JteAdapter.kt b/templates/templates_jte/src/main/kotlin/com/hexagonkt/templates/jte/JteAdapter.kt index 09d9c6eea0..189344b627 100644 --- a/templates/templates_jte/src/main/kotlin/com/hexagonkt/templates/jte/JteAdapter.kt +++ b/templates/templates_jte/src/main/kotlin/com/hexagonkt/templates/jte/JteAdapter.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.templates.jte +package com.hexagontk.templates.jte -import com.hexagonkt.core.media.MediaType -import com.hexagonkt.core.media.TEXT_HTML -import com.hexagonkt.core.media.TEXT_PLAIN -import com.hexagonkt.templates.TemplatePort +import com.hexagontk.core.media.MediaType +import com.hexagontk.core.media.TEXT_HTML +import com.hexagontk.core.media.TEXT_PLAIN +import com.hexagontk.templates.TemplatePort import gg.jte.CodeResolver import gg.jte.ContentType import gg.jte.TemplateEngine diff --git a/templates/templates_jte/src/main/kotlin/module-info.java b/templates/templates_jte/src/main/kotlin/module-info.java index b8e8c82dc3..01db8df02a 100644 --- a/templates/templates_jte/src/main/kotlin/module-info.java +++ b/templates/templates_jte/src/main/kotlin/module-info.java @@ -1,11 +1,11 @@ -module com.hexagonkt.templates_jte { +module com.hexagontk.templates_jte { requires transitive kotlin.stdlib; - requires transitive com.hexagonkt.templates; + requires transitive com.hexagontk.templates; requires gg.jte; requires gg.jte.runtime; - exports com.hexagonkt.templates.jte; + exports com.hexagontk.templates.jte; } diff --git a/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteAdapterTest.kt b/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteAdapterTest.kt index 30eae2d626..954ee7384c 100644 --- a/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteAdapterTest.kt +++ b/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteAdapterTest.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.templates.jte +package com.hexagontk.templates.jte -import com.hexagonkt.core.media.TEXT_CSS -import com.hexagonkt.core.media.TEXT_HTML -import com.hexagonkt.core.urlOf +import com.hexagontk.core.media.TEXT_CSS +import com.hexagontk.core.media.TEXT_HTML +import com.hexagontk.core.urlOf import org.junit.jupiter.api.Test import org.junit.jupiter.api.condition.DisabledInNativeImage import java.time.LocalDateTime diff --git a/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteTemplateAdapterPrecompiledBaseTest.kt b/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteTemplateAdapterPrecompiledBaseTest.kt index 31ed82e3ee..8881b82418 100644 --- a/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteTemplateAdapterPrecompiledBaseTest.kt +++ b/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteTemplateAdapterPrecompiledBaseTest.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.templates.jte +package com.hexagontk.templates.jte -import com.hexagonkt.core.media.TEXT_HTML -import com.hexagonkt.core.urlOf -import com.hexagonkt.templates.test.TemplateAdapterTest +import com.hexagontk.core.media.TEXT_HTML +import com.hexagontk.core.urlOf +import com.hexagontk.templates.test.TemplateAdapterTest internal class JteTemplateAdapterPrecompiledBaseTest : TemplateAdapterTest( diff --git a/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteTemplateAdapterPrecompiledTest.kt b/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteTemplateAdapterPrecompiledTest.kt index 8ef5698806..0772f6d111 100644 --- a/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteTemplateAdapterPrecompiledTest.kt +++ b/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteTemplateAdapterPrecompiledTest.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.templates.jte +package com.hexagontk.templates.jte -import com.hexagonkt.core.media.TEXT_HTML -import com.hexagonkt.core.urlOf -import com.hexagonkt.templates.test.TemplateAdapterTest +import com.hexagontk.core.media.TEXT_HTML +import com.hexagontk.core.urlOf +import com.hexagontk.templates.test.TemplateAdapterTest internal class JteTemplateAdapterPrecompiledTest : TemplateAdapterTest(urlOf("classpath:test.jte"), JteAdapter(TEXT_HTML, precompiled = true)) diff --git a/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteTemplateAdapterTest.kt b/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteTemplateAdapterTest.kt index 383f90be34..668da056da 100644 --- a/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteTemplateAdapterTest.kt +++ b/templates/templates_jte/src/test/kotlin/com/hexagonkt/templates/jte/JteTemplateAdapterTest.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.templates.jte +package com.hexagontk.templates.jte -import com.hexagonkt.core.media.TEXT_HTML -import com.hexagonkt.core.urlOf -import com.hexagonkt.templates.test.TemplateAdapterTest +import com.hexagontk.core.media.TEXT_HTML +import com.hexagontk.core.urlOf +import com.hexagontk.templates.test.TemplateAdapterTest import org.junit.jupiter.api.condition.DisabledInNativeImage @DisabledInNativeImage diff --git a/templates/templates_pebble/README.md b/templates/templates_pebble/README.md index 3772c65038..77e49de2a8 100644 --- a/templates/templates_pebble/README.md +++ b/templates/templates_pebble/README.md @@ -15,18 +15,18 @@ For usage instructions, refer to the [Templates Port documentation](/templates/) mavenCentral() } - implementation("com.hexagonkt:templates_pebble:$hexagonVersion") + implementation("com.hexagontk:templates_pebble:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk templates_pebble $hexagonVersion ``` -# Package com.hexagonkt.templates.pebble +# Package com.hexagontk.templates.pebble Classes that implement the Templates Port interface with the [Pebble] engine. diff --git a/templates/templates_pebble/api/templates_pebble.api b/templates/templates_pebble/api/templates_pebble.api index 655806a9c7..b35acb41b6 100644 --- a/templates/templates_pebble/api/templates_pebble.api +++ b/templates/templates_pebble/api/templates_pebble.api @@ -1,4 +1,4 @@ -public final class com/hexagonkt/templates/pebble/PebbleAdapter : com/hexagonkt/templates/TemplatePort { +public final class com/hexagontk/templates/pebble/PebbleAdapter : com/hexagontk/templates/TemplatePort { public fun ()V public fun (ZI)V public synthetic fun (ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V diff --git a/templates/templates_pebble/src/main/kotlin/com/hexagonkt/templates/pebble/PebbleAdapter.kt b/templates/templates_pebble/src/main/kotlin/com/hexagonkt/templates/pebble/PebbleAdapter.kt index f54e7823a5..ca7cdf87df 100644 --- a/templates/templates_pebble/src/main/kotlin/com/hexagonkt/templates/pebble/PebbleAdapter.kt +++ b/templates/templates_pebble/src/main/kotlin/com/hexagonkt/templates/pebble/PebbleAdapter.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.templates.pebble +package com.hexagontk.templates.pebble -import com.hexagonkt.templates.TemplatePort +import com.hexagontk.templates.TemplatePort import io.pebbletemplates.pebble.PebbleEngine import io.pebbletemplates.pebble.loader.MemoryLoader import java.io.StringWriter diff --git a/templates/templates_pebble/src/main/kotlin/module-info.java b/templates/templates_pebble/src/main/kotlin/module-info.java index 2f5fb7c799..0676e33705 100644 --- a/templates/templates_pebble/src/main/kotlin/module-info.java +++ b/templates/templates_pebble/src/main/kotlin/module-info.java @@ -1,10 +1,10 @@ -module com.hexagonkt.templates_pebble { +module com.hexagontk.templates_pebble { requires transitive kotlin.stdlib; - requires transitive com.hexagonkt.templates; + requires transitive com.hexagontk.templates; requires io.pebbletemplates; - exports com.hexagonkt.templates.pebble; + exports com.hexagontk.templates.pebble; } diff --git a/templates/templates_pebble/src/test/kotlin/com/hexagonkt/templates/pebble/PebbleAdapterTest.kt b/templates/templates_pebble/src/test/kotlin/com/hexagonkt/templates/pebble/PebbleAdapterTest.kt index 14cd7ae5c2..7d0637b9e3 100644 --- a/templates/templates_pebble/src/test/kotlin/com/hexagonkt/templates/pebble/PebbleAdapterTest.kt +++ b/templates/templates_pebble/src/test/kotlin/com/hexagonkt/templates/pebble/PebbleAdapterTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.templates.pebble +package com.hexagontk.templates.pebble -import com.hexagonkt.core.urlOf +import com.hexagontk.core.urlOf import org.junit.jupiter.api.Test import java.time.LocalDateTime import java.util.Locale diff --git a/templates/templates_pebble/src/test/kotlin/com/hexagonkt/templates/pebble/PebbleTemplateAdapterTest.kt b/templates/templates_pebble/src/test/kotlin/com/hexagonkt/templates/pebble/PebbleTemplateAdapterTest.kt index ea6760edd6..fe6913a63f 100644 --- a/templates/templates_pebble/src/test/kotlin/com/hexagonkt/templates/pebble/PebbleTemplateAdapterTest.kt +++ b/templates/templates_pebble/src/test/kotlin/com/hexagonkt/templates/pebble/PebbleTemplateAdapterTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.templates.pebble +package com.hexagontk.templates.pebble -import com.hexagonkt.core.urlOf -import com.hexagonkt.templates.test.TemplateAdapterTest +import com.hexagontk.core.urlOf +import com.hexagontk.templates.test.TemplateAdapterTest internal class PebbleTemplateAdapterTest : TemplateAdapterTest(urlOf("classpath:templates/test.pebble.html"), PebbleAdapter()) diff --git a/templates/templates_rocker/README.md b/templates/templates_rocker/README.md index de13fe1161..82d0e1fecf 100644 --- a/templates/templates_rocker/README.md +++ b/templates/templates_rocker/README.md @@ -19,14 +19,14 @@ Adding the classes used in the templates to the `reflect-config.json` file is al mavenCentral() } - implementation("com.hexagonkt:templates_rocker:$hexagonVersion") + implementation("com.hexagontk:templates_rocker:$hexagonVersion") ``` === "pom.xml" ```xml - com.hexagonkt + com.hexagontk templates_rocker $hexagonVersion @@ -50,5 +50,5 @@ rocker { On top of that, you must also declare the template parameters this way: `@args(java.util.Map context)` and use the data from the map. -# Package com.hexagonkt.templates.rocker +# Package com.hexagontk.templates.rocker Classes that implement the Templates Port interface with the [Rocker] engine. diff --git a/templates/templates_rocker/api/templates_rocker.api b/templates/templates_rocker/api/templates_rocker.api index 3eb6988d55..0cb3e8288d 100644 --- a/templates/templates_rocker/api/templates_rocker.api +++ b/templates/templates_rocker/api/templates_rocker.api @@ -1,4 +1,4 @@ -public final class com/hexagonkt/templates/rocker/RockerAdapter : com/hexagonkt/templates/TemplatePort { +public final class com/hexagontk/templates/rocker/RockerAdapter : com/hexagontk/templates/TemplatePort { public fun ()V public fun (Z)V public synthetic fun (ZILkotlin/jvm/internal/DefaultConstructorMarker;)V diff --git a/templates/templates_rocker/src/main/kotlin/com/hexagonkt/templates/rocker/RockerAdapter.kt b/templates/templates_rocker/src/main/kotlin/com/hexagonkt/templates/rocker/RockerAdapter.kt index d7f71c7336..9544dd7446 100644 --- a/templates/templates_rocker/src/main/kotlin/com/hexagonkt/templates/rocker/RockerAdapter.kt +++ b/templates/templates_rocker/src/main/kotlin/com/hexagonkt/templates/rocker/RockerAdapter.kt @@ -1,9 +1,9 @@ -package com.hexagonkt.templates.rocker +package com.hexagontk.templates.rocker import com.fizzed.rocker.Rocker import com.fizzed.rocker.runtime.RockerRuntime import com.fizzed.rocker.runtime.StringBuilderOutput -import com.hexagonkt.templates.TemplatePort +import com.hexagontk.templates.TemplatePort import java.net.URL import java.util.* diff --git a/templates/templates_rocker/src/main/kotlin/module-info.java_ b/templates/templates_rocker/src/main/kotlin/module-info.java_ index 45415eef59..aca0a1a049 100644 --- a/templates/templates_rocker/src/main/kotlin/module-info.java_ +++ b/templates/templates_rocker/src/main/kotlin/module-info.java_ @@ -1,11 +1,11 @@ // TODO Rename this file when build script is able to handle automatic modules -module com.hexagonkt.templates_rocker { +module com.hexagontk.templates_rocker { requires transitive kotlin.stdlib; - requires transitive com.hexagonkt.templates; + requires transitive com.hexagontk.templates; requires rocker.runtime; - exports com.hexagonkt.templates.rocker; + exports com.hexagontk.templates.rocker; } diff --git a/templates/templates_rocker/src/test/kotlin/com/hexagonkt/templates/rocker/RockerAdapterTest.kt b/templates/templates_rocker/src/test/kotlin/com/hexagonkt/templates/rocker/RockerAdapterTest.kt index 2475b092af..4aa9af2ed3 100644 --- a/templates/templates_rocker/src/test/kotlin/com/hexagonkt/templates/rocker/RockerAdapterTest.kt +++ b/templates/templates_rocker/src/test/kotlin/com/hexagonkt/templates/rocker/RockerAdapterTest.kt @@ -1,6 +1,6 @@ -package com.hexagonkt.templates.rocker +package com.hexagontk.templates.rocker -import com.hexagonkt.core.urlOf +import com.hexagontk.core.urlOf import org.junit.jupiter.api.Test import java.time.LocalDateTime import java.util.Locale diff --git a/templates/templates_rocker/src/test/kotlin/com/hexagonkt/templates/rocker/RockerTemplateAdapterTest.kt b/templates/templates_rocker/src/test/kotlin/com/hexagonkt/templates/rocker/RockerTemplateAdapterTest.kt index 986a455602..eae7d27d9c 100644 --- a/templates/templates_rocker/src/test/kotlin/com/hexagonkt/templates/rocker/RockerTemplateAdapterTest.kt +++ b/templates/templates_rocker/src/test/kotlin/com/hexagonkt/templates/rocker/RockerTemplateAdapterTest.kt @@ -1,7 +1,7 @@ -package com.hexagonkt.templates.rocker +package com.hexagontk.templates.rocker -import com.hexagonkt.core.urlOf -import com.hexagonkt.templates.test.TemplateAdapterTest +import com.hexagontk.core.urlOf +import com.hexagontk.templates.test.TemplateAdapterTest internal class RockerTemplateAdapterTest : TemplateAdapterTest(urlOf("classpath:templates/test.rocker.html"), RockerAdapter()) diff --git a/templates/templates_test/src/main/kotlin/com/hexagonkt/templates/test/TemplateAdapterTest.kt b/templates/templates_test/src/main/kotlin/com/hexagonkt/templates/test/TemplateAdapterTest.kt index 58320f4351..172404063d 100644 --- a/templates/templates_test/src/main/kotlin/com/hexagonkt/templates/test/TemplateAdapterTest.kt +++ b/templates/templates_test/src/main/kotlin/com/hexagonkt/templates/test/TemplateAdapterTest.kt @@ -1,8 +1,8 @@ -package com.hexagonkt.templates.test +package com.hexagontk.templates.test -import com.hexagonkt.core.urlOf -import com.hexagonkt.templates.TemplateManager -import com.hexagonkt.templates.TemplatePort +import com.hexagontk.core.urlOf +import com.hexagontk.templates.TemplateManager +import com.hexagontk.templates.TemplatePort import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance