From ed48f4c805e6874ed7bd7bbe74ea01a4b88ebb62 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 28 Jun 2024 09:02:57 +0200 Subject: [PATCH] PMD fixes --- pom.xml | 3 +++ .../xdev/tci/demo/persistence/base/DAOInjector.java | 2 ++ tci-advanced-demo/pom.xml | 6 ++++++ .../software/xdev/tci/demo/security/AuthUserService.java | 2 +- tci-base/pom.xml | 3 +++ .../prestart/loadbalancing/DefaultDockerLoadMonitor.java | 2 +- 6 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4af8e71..f8c9166 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,9 @@ .config/pmd/ruleset.xml + + **/entities/**/*_.java + diff --git a/tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/DAOInjector.java b/tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/DAOInjector.java index eed3f50..dfdcd9f 100644 --- a/tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/DAOInjector.java +++ b/tci-advanced-demo/persistence-it/src/test/java/software/xdev/tci/demo/persistence/base/DAOInjector.java @@ -74,6 +74,7 @@ public T runWithTransaction(final Supplier supplier) }); } + @SuppressWarnings("PMD.PreserveStackTrace") private Object createProxiedDAO(final Class fieldType, final EntityManager em, final Object original) { // java.lang.reflect.Proxy only proxies interfaces and doesn't work here! @@ -124,6 +125,7 @@ private Object createProxiedDAO(final Class fieldType, final EntityManager em } } + @SuppressWarnings("PMD.PreserveStackTrace") private Object createDAO(final Class fieldType, final EntityManager em) { try diff --git a/tci-advanced-demo/pom.xml b/tci-advanced-demo/pom.xml index 9cf3cc5..e0f6edc 100644 --- a/tci-advanced-demo/pom.xml +++ b/tci-advanced-demo/pom.xml @@ -4,6 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + software.xdev + tci-base-root + 1.0.2-SNAPSHOT + + software.xdev.tci.demo tci-advanced-demo 1.0.2-SNAPSHOT diff --git a/tci-advanced-demo/webapp/src/main/java/software/xdev/tci/demo/security/AuthUserService.java b/tci-advanced-demo/webapp/src/main/java/software/xdev/tci/demo/security/AuthUserService.java index b54a4d3..58f4c3f 100644 --- a/tci-advanced-demo/webapp/src/main/java/software/xdev/tci/demo/security/AuthUserService.java +++ b/tci-advanced-demo/webapp/src/main/java/software/xdev/tci/demo/security/AuthUserService.java @@ -30,7 +30,7 @@ protected boolean shouldRetrieveUserInfo(final OidcUserRequest userRequest) } @Override - public OidcUser loadUser(final OidcUserRequest req) throws OAuth2AuthenticationException + public OidcUser loadUser(final OidcUserRequest req) { final OidcUser oidcUser = super.loadUser(req); diff --git a/tci-base/pom.xml b/tci-base/pom.xml index 9ea6d5a..10e8099 100644 --- a/tci-base/pom.xml +++ b/tci-base/pom.xml @@ -342,6 +342,9 @@ ../.config/pmd/ruleset.xml + + **/entities/**/*_.java + diff --git a/tci-base/src/main/java/software/xdev/tci/factory/prestart/loadbalancing/DefaultDockerLoadMonitor.java b/tci-base/src/main/java/software/xdev/tci/factory/prestart/loadbalancing/DefaultDockerLoadMonitor.java index 907197b..29d135a 100644 --- a/tci-base/src/main/java/software/xdev/tci/factory/prestart/loadbalancing/DefaultDockerLoadMonitor.java +++ b/tci-base/src/main/java/software/xdev/tci/factory/prestart/loadbalancing/DefaultDockerLoadMonitor.java @@ -104,7 +104,7 @@ public void scrape() .map(parts -> { final String startCPU = "cpu=\""; final String cpu = parts[0].substring(parts[0].indexOf(startCPU) + startCPU.length()); - final int cpuIndex = Integer.parseInt(cpu.substring(0, cpu.indexOf("\""))); + final int cpuIndex = Integer.parseInt(cpu.substring(0, cpu.indexOf('\"'))); final double idleSec = Double.parseDouble(parts[1]); return Map.entry(cpuIndex, idleSec);