java compiler warning cleanup

hhund · hhund · commit 61341a7eca43 · 2025-09-03T00:40:19.000+02:00
* disabled annotation processor from log4j2-core by disabling all
annotations processors in modules with a log42-core dependency
* mockito-core configured as java agent for tests in modules where
needed
* added missing deprecation annotations
* fixed bad method signatures in classes implementing HAPIs
IValidationSupport interface
* removed not needed method with potentially unsafe var-arg
* configured maven-resources-plugin propertyEncoding and fixed
BuildInfoReaderImpl to use UTF-8
diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml
@@ -64,10 +64,22 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<testCompilerArgument>-proc:none</testCompilerArgument>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
+					<execution>
+						<goals>
+							<goal>properties</goal>
+						</goals>
+					</execution>
 					<execution>
 						<id>copy-api-v1-dependencies-to-docker</id>
 						<phase>pre-integration-test</phase>
@@ -187,6 +199,13 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/client/fhir/FhirClientFactory.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/client/fhir/FhirClientFactory.java
@@ -222,6 +222,7 @@ public int getConnectTimeout()
 	}
 
 	@Override
+	@Deprecated
 	public ServerValidationModeEnum getServerValidationModeEnum()
 	{
 		return getServerValidationMode();
@@ -294,6 +295,7 @@ public void setProxyCredentials(String theUsername, String thePassword)
 	}
 
 	@Override
+	@Deprecated
 	public void setServerValidationModeEnum(ServerValidationModeEnum theServerValidationMode)
 	{
 		throw notSupported();
diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml
@@ -63,6 +63,15 @@
 		</resources>
 
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<compilerArgs>
+						<arg>-proc:none</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml
@@ -259,6 +259,15 @@
 		</testResources>
 
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<compilerArgs>
+						<arg>-proc:none</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
diff --git a/dsf-common/dsf-common-auth/pom.xml b/dsf-common/dsf-common-auth/pom.xml
@@ -60,4 +60,16 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<testCompilerArgument>-proc:none</testCompilerArgument>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/dsf-common/dsf-common-build-info-reader/src/main/java/dev/dsf/common/build/BuildInfoReaderImpl.java b/dsf-common/dsf-common-build-info-reader/src/main/java/dev/dsf/common/build/BuildInfoReaderImpl.java
@@ -2,6 +2,9 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
@@ -34,10 +37,11 @@ private Properties getVersionProperties()
 	{
 		if (versionProperties == null)
 		{
-			try (InputStream in = BuildInfoReaderImpl.class.getResourceAsStream(VERSION_PROPERTIES_FILE))
+			try (InputStream in = BuildInfoReaderImpl.class.getResourceAsStream(VERSION_PROPERTIES_FILE);
+					Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8))
 			{
 				versionProperties = new Properties();
-				versionProperties.load(in);
+				versionProperties.load(reader);
 			}
 			catch (IOException e)
 			{
diff --git a/dsf-common/dsf-common-config/pom.xml b/dsf-common/dsf-common-config/pom.xml
@@ -31,4 +31,16 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<testCompilerArgument>-proc:none</testCompilerArgument>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/dsf-common/dsf-common-jetty/pom.xml b/dsf-common/dsf-common-jetty/pom.xml
@@ -76,4 +76,18 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<compilerArgs>
+						<arg>-proc:none</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml
@@ -33,4 +33,16 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<testCompilerArgument>-proc:none</testCompilerArgument>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml
@@ -39,4 +39,16 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<testCompilerArgument>-proc:none</testCompilerArgument>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml
@@ -74,6 +74,15 @@
 		</resources>
 
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<compilerArgs>
+						<arg>-proc:none</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml
@@ -246,6 +246,24 @@
 		</testResources>
 
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<testCompilerArgument>-proc:none</testCompilerArgument>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>properties</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -257,6 +275,7 @@
 						<exclude>**/*DaoTest</exclude>
 						<exclude>**/*IntegrationTest</exclude>
 					</excludes>
+					<argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/search/SearchQuery.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/search/SearchQuery.java
@@ -85,13 +85,7 @@ public SearchQueryBuilder<R> with(SearchQueryParameterFactory<R> searchParameter
 			return this;
 		}
 
-		public SearchQueryBuilder<R> with(
-				@SuppressWarnings("unchecked") SearchQueryParameterFactory<R>... searchParameters)
-		{
-			return with(List.of(searchParameters));
-		}
-
-		public SearchQueryBuilder<R> with(List<? extends SearchQueryParameterFactory<R>> searchParameters)
+		public SearchQueryBuilder<R> with(List<SearchQueryParameterFactory<R>> searchParameters)
 		{
 			this.searchParameters.addAll(searchParameters);
 			return this;
diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/service/ValidationSupportWithFetchFromDb.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/service/ValidationSupportWithFetchFromDb.java
@@ -84,14 +84,16 @@ public List<IBaseResource> fetchAllConformanceResources()
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
-	public List<StructureDefinition> fetchAllStructureDefinitions()
+	public <T extends IBaseResource> List<T> fetchAllStructureDefinitions()
 	{
 		Map<String, StructureDefinition> byUrl = new HashMap<>();
 		throwRuntimeException(() -> structureDefinitionSnapshotDao.readAll()).forEach(s -> byUrl.put(s.getUrl(), s));
 		throwRuntimeException(() -> structureDefinitionDao.readAll()).forEach(s -> byUrl.putIfAbsent(s.getUrl(), s));
 
-		return new ArrayList<>(byUrl.values());
+		@SuppressWarnings("unchecked")
+		List<T> definitions = (List<T>) new ArrayList<>(byUrl.values());
+
+		return definitions;
 	}
 
 	@Override
diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/service/ValidationSupportWithFetchFromDbWithTransaction.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/service/ValidationSupportWithFetchFromDbWithTransaction.java
@@ -90,16 +90,18 @@ public List<IBaseResource> fetchAllConformanceResources()
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
-	public List<StructureDefinition> fetchAllStructureDefinitions()
+	public <T extends IBaseResource> List<T> fetchAllStructureDefinitions()
 	{
 		Map<String, StructureDefinition> byUrl = new HashMap<>();
 		throwRuntimeException(() -> structureDefinitionSnapshotDao.readAllWithTransaction(connection))
 				.forEach(s -> byUrl.put(s.getUrl(), s));
 		throwRuntimeException(() -> structureDefinitionDao.readAllWithTransaction(connection))
 				.forEach(s -> byUrl.putIfAbsent(s.getUrl(), s));
 
-		return new ArrayList<>(byUrl.values());
+		@SuppressWarnings("unchecked")
+		List<T> definitions = (List<T>) new ArrayList<>(byUrl.values());
+
+		return definitions;
 	}
 
 	@Override
diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml
@@ -60,6 +60,13 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<testCompilerArgument>-proc:none</testCompilerArgument>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>dev.dsf</groupId>
 				<artifactId>dsf-maven-plugin</artifactId>
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/java/dev/dsf/fhir/validation/ValidationSupportWithCustomResources.java b/dsf-fhir/dsf-fhir-validation/src/main/java/dev/dsf/fhir/validation/ValidationSupportWithCustomResources.java
@@ -59,18 +59,22 @@ public List<IBaseResource> fetchAllConformanceResources()
 				.collect(Collectors.toList());
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
-	public List<StructureDefinition> fetchAllStructureDefinitions()
+	public <T extends IBaseResource> List<T> fetchAllStructureDefinitions()
 	{
-		return new ArrayList<>(structureDefinitionsByUrl.values());
+		@SuppressWarnings("unchecked")
+		List<T> definition = (List<T>) new ArrayList<>(structureDefinitionsByUrl.values());
+
+		return definition;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
-	public List<StructureDefinition> fetchAllNonBaseStructureDefinitions()
+	public <T extends IBaseResource> List<T> fetchAllNonBaseStructureDefinitions()
 	{
-		return new ArrayList<>(structureDefinitionsByUrl.values());
+		@SuppressWarnings("unchecked")
+		List<T> definition = (List<T>) new ArrayList<>(structureDefinitionsByUrl.values());
+
+		return definition;
 	}
 
 	@Override
diff --git a/dsf-maven/dsf-maven-plugin/src/main/java/dev/dsf/maven/bundle/ValidationSupportWithCustomResources.java b/dsf-maven/dsf-maven-plugin/src/main/java/dev/dsf/maven/bundle/ValidationSupportWithCustomResources.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent;
 import org.hl7.fhir.r4.model.CodeSystem;
@@ -60,11 +61,13 @@ public FhirContext getFhirContext()
 		return context;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
-	public List<StructureDefinition> fetchAllStructureDefinitions()
+	public <T extends IBaseResource> List<T> fetchAllStructureDefinitions()
 	{
-		return new ArrayList<>(structureDefinitionsByUrl.values());
+		@SuppressWarnings("unchecked")
+		List<T> definitions = (List<T>) new ArrayList<>(structureDefinitionsByUrl.values());
+
+		return definitions;
 	}
 
 	@Override
diff --git a/pom.xml b/pom.xml
@@ -849,6 +849,13 @@
 		</pluginManagement>
 
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<configuration>
+					<propertiesEncoding>UTF-8</propertiesEncoding>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -222,6 +222,7 @@ public int getConnectTimeout()`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`@Override`
	`225`	`+ @Deprecated`
`225`	`226`	`public ServerValidationModeEnum getServerValidationModeEnum()`
`226`	`227`	`{`
`227`	`228`	`return getServerValidationMode();`
`@@ -294,6 +295,7 @@ public void setProxyCredentials(String theUsername, String thePassword)`
`294`	`295`	`}`
`295`	`296`
`296`	`297`	`@Override`
	`298`	`+ @Deprecated`
`297`	`299`	`public void setServerValidationModeEnum(ServerValidationModeEnum theServerValidationMode)`
`298`	`300`	`{`
`299`	`301`	`throw notSupported();`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@`
`2`	`2`
`3`	`3`	`import java.io.IOException;`
`4`	`4`	`import java.io.InputStream;`
	`5`	`+import java.io.InputStreamReader;`
	`6`	`+import java.io.Reader;`
	`7`	`+import java.nio.charset.StandardCharsets;`
`5`	`8`	`import java.time.ZoneId;`
`6`	`9`	`import java.time.ZoneOffset;`
`7`	`10`	`import java.time.ZonedDateTime;`
`@@ -34,10 +37,11 @@ private Properties getVersionProperties()`
`34`	`37`	`{`
`35`	`38`	`if (versionProperties == null)`
`36`	`39`	`{`
`37`		`- try (InputStream in = BuildInfoReaderImpl.class.getResourceAsStream(VERSION_PROPERTIES_FILE))`
	`40`	`+ try (InputStream in = BuildInfoReaderImpl.class.getResourceAsStream(VERSION_PROPERTIES_FILE);`
	`41`	`+ Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8))`
`38`	`42`	`{`
`39`	`43`	`versionProperties = new Properties();`
`40`		`- versionProperties.load(in);`
	`44`	`+ versionProperties.load(reader);`
`41`	`45`	`}`
`42`	`46`	`catch (IOException e)`
`43`	`47`	`{`