From 3b8ad8e441e7c12ae5ddc9235fd70c0ee9a18eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Tue, 21 Nov 2023 11:40:38 +0100 Subject: [PATCH] improve logging of requests that can not be resolved --- gradle.properties | 2 +- gradle/test/junit5.gradle | 10 +++++----- .../net/http/server/nio/demo/ByteArray.java | 2 +- .../net/http/server/route/BaseHttpRouter.java | 3 ++- settings.gradle | 19 ++++++++++--------- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4ba1a76..9f58952 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.xbib name = net-http -version = 4.0.3 +version = 4.0.4 org.gradle.warning.mode = ALL diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle index b3226c3..38cf13c 100644 --- a/gradle/test/junit5.gradle +++ b/gradle/test/junit5.gradle @@ -1,9 +1,9 @@ dependencies { - testImplementation libs.junit.jupiter.api - testImplementation libs.junit.jupiter.params - testImplementation libs.hamcrest - testRuntimeOnly libs.junit.jupiter.engine - testRuntimeOnly libs.junit.jupiter.platform.launcher + testImplementation testLibs.junit.jupiter.api + testImplementation testLibs.junit.jupiter.params + testImplementation testLibs.hamcrest + testRuntimeOnly testLibs.junit.jupiter.engine + testRuntimeOnly testLibs.junit.jupiter.platform.launcher } test { diff --git a/net-http-server-nio/src/main/java/org/xbib/net/http/server/nio/demo/ByteArray.java b/net-http-server-nio/src/main/java/org/xbib/net/http/server/nio/demo/ByteArray.java index 0b767f4..ecee514 100644 --- a/net-http-server-nio/src/main/java/org/xbib/net/http/server/nio/demo/ByteArray.java +++ b/net-http-server-nio/src/main/java/org/xbib/net/http/server/nio/demo/ByteArray.java @@ -70,7 +70,7 @@ public class ByteArray { if (newTotalSize >= capacity) { capacity = (int) (newTotalSize * (1 + factor)); } else { - capacity *= (1 + factor); + capacity *= (int) (1 + factor); } source = Arrays.copyOf(source, capacity); } diff --git a/net-http-server/src/main/java/org/xbib/net/http/server/route/BaseHttpRouter.java b/net-http-server/src/main/java/org/xbib/net/http/server/route/BaseHttpRouter.java index 2942bb6..3293413 100644 --- a/net-http-server/src/main/java/org/xbib/net/http/server/route/BaseHttpRouter.java +++ b/net-http-server/src/main/java/org/xbib/net/http/server/route/BaseHttpRouter.java @@ -135,7 +135,8 @@ public class BaseHttpRouter implements HttpRouter { return; } if (httpRouteResolverResults.isEmpty()) { - logger.log(Level.FINE, "route resolver results is empty, generating a not found message"); + logger.log(Level.FINE, "route resolver results is empty for request " + httpRouterContext.getRequest() + + ", generating a not found message"); setResolverResult(httpRouterContext, null); routeStatus(NOT_FOUND, httpRouterContext); return; diff --git a/settings.gradle b/settings.gradle index ddfd5ca..9b3b095 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,24 +2,17 @@ dependencyResolutionManagement { versionCatalogs { libs { version('gradle', '8.4') - version('junit', '5.10.0') version('groovy', '4.0.15') - version('netty', '4.1.100.Final') + version('netty', '4.1.101.Final') version('netty-tcnative', '2.0.62.Final') version('datastructures', '5.0.5') version('net', '4.0.0') - library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') - library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit') - library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit') - library('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.0') - library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2') library('netty-codec-http2', 'io.netty', 'netty-codec-http2').versionRef('netty') library('netty-handler', 'io.netty', 'netty-handler').versionRef('netty') library('netty-handler-proxy', 'io.netty', 'netty-handler-proxy').versionRef('netty') library('netty-epoll', 'io.netty', 'netty-transport-native-epoll').versionRef('netty') library('netty-kqueue', 'io.netty', 'netty-transport-native-kqueue').versionRef('netty') library('netty-boringssl', 'io.netty', 'netty-tcnative-boringssl-static').versionRef('netty-tcnative') - library('bouncycastle', 'org.bouncycastle', 'bcpkix-jdk18on').version('1.76') // test only library('conscrypt', 'org.conscrypt', 'conscrypt-openjdk-uber').version('2.5.2') library('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').version('2.14.2') library('jna', 'net.java.dev.jna', 'jna').version('5.13.0') @@ -42,7 +35,15 @@ dependencyResolutionManagement { library('settings-datastructures-yaml', 'org.xbib', 'settings-datastructures-yaml').versionRef('datastructures') library('jdbc-query', 'org.xbib', 'jdbc-query').version('1.3.0') library('jdbc-connection-pool', 'org.xbib', 'jdbc-connection-pool').version('1.3.0') - library('event', 'org.xbib', 'event').version('0.0.2') + library('event', 'org.xbib', 'event').version('0.0.6') + } + testLibs { + version('junit', '5.10.0') + library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') + library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit') + library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit') + library('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.0') + library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2') } } }