Refactoring

Author: JohannesRabauer

bzst-dip-java-client-demo/src/main/java/software/demo/bzst/dip/client/demo/Application.java

@@ -41,11 +41,9 @@ public static void main(final String[] args)
 		final BzstDipClient bzstDipClient = new BzstDipClient(configuration);
 		final BzstDipCompleteResult bzstDipCompleteResult = bzstDipClient.sendDipAndQueryResult(createMessage());
 		LOGGER.info(
-			String.format(
-				"Sending dip message with transfer number %s %s",
+			"Sending dip message with transfer number {} {}",
 				bzstDipCompleteResult.dataTransferNumber(),
 				bzstDipCompleteResult.isSuccessful() ? "was successful." : "has failed!"
-			)
 		);
 	}
 

bzst-dip-java-client-demo/src/main/java/software/demo/bzst/dip/client/demo/ApplicationWithConfigurationFromProperties.java

@@ -26,11 +26,9 @@ public static void main(final String[] args)
 		final BzstDipCompleteResult bzstDipCompleteResult =
 			bzstDipClient.sendDipAndQueryResult(Application.createMessage());
 		LOGGER.info(
-			String.format(
-				"Sending dip message with transfer number %s %s",
-				bzstDipCompleteResult.dataTransferNumber(),
-				bzstDipCompleteResult.isSuccessful() ? "was successful." : "has failed!"
-			)
+			"Sending dip message with transfer number {} {}",
+			bzstDipCompleteResult.dataTransferNumber(),
+			bzstDipCompleteResult.isSuccessful() ? "was successful." : "has failed!"
 		);
 	}
 

bzst-dip-java-client-demo/src/main/java/software/demo/bzst/dip/client/demo/ApplicationWithCsvInput.java

@@ -30,11 +30,9 @@ public static void main(final String[] args)
 		final BzstDipClient bzstDipClient = new BzstDipClient(configuration);
 		final BzstDipCompleteResult bzstDipCompleteResult = bzstDipClient.sendDipAndQueryResult(csvData);
 		LOGGER.info(
-			String.format(
-				"Sending dip message with transfer number %s %s",
-				bzstDipCompleteResult.dataTransferNumber(),
-				bzstDipCompleteResult.isSuccessful() ? "was successful." : "has failed!"
-			)
+			"Sending dip message with transfer number {} {}",
+			bzstDipCompleteResult.dataTransferNumber(),
+			bzstDipCompleteResult.isSuccessful() ? "was successful." : "has failed!"
 		);
 	}
 

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/model/configuration/BzstDipConfigurationBuilder.java

@@ -232,16 +232,16 @@ public BzstDipConfiguration buildAndValidate()
 
 	private void validateConfiguration(final BzstDipConfiguration configuration)
 	{
-		if(configuration.getDocType().isNewTransmission())
+		if(
+			configuration.getDocType().isNewTransmission()
+				&& (configuration.getPlatformOperatorDocRefId() == null
+				|| configuration.getPlatformOperatorDocRefId().isBlank())
+		)
 		{
-			if(configuration.getPlatformOperatorDocRefId() == null || configuration.getPlatformOperatorDocRefId()
-				.isBlank())
-			{
-				throw new ConfigurationException(
-					PropertiesSupplier.PROPERTY_NAME_PLATFORM_OPERATOR_DOC_REF_ID,
-					"When sending a new transmission (OECD_0) a DocRefId must be set!"
-				);
-			}
+			throw new ConfigurationException(
+				PropertiesSupplier.PROPERTY_NAME_PLATFORM_OPERATOR_DOC_REF_ID,
+				"When sending a new transmission (OECD_0) a DocRefId must be set!"
+			);
 		}
 	}
 

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/model/configuration/PropertiesSupplier.java

@@ -68,9 +68,9 @@ public PropertiesSupplier(final String propertiesFileName)
 	{
 		try(final FileInputStream fileInputStream = new FileInputStream(propertiesFileName))
 		{
-			final Properties properties = new Properties();
-			properties.load(fileInputStream);
-			this.properties = properties;
+			final Properties newProperties = new Properties();
+			newProperties.load(fileInputStream);
+			this.properties = newProperties;
 		}
 		catch(final Exception e)
 		{
@@ -82,9 +82,9 @@ public PropertiesSupplier(final InputStream propertiesInput)
 	{
 		try
 		{
-			final Properties properties = new Properties();
-			properties.load(propertiesInput);
-			this.properties = properties;
+			final Properties newProperties = new Properties();
+			newProperties.load(propertiesInput);
+			this.properties = newProperties;
 		}
 		catch(final IOException e)
 		{

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/WebClient.java

@@ -71,10 +71,9 @@ private HttpResponse<String> executeRequest(final HttpRequest httpRequest)
 	{
 		try
 		{
-			final HttpResponse<String> httpResponse = this.httpClient.send(
+			return this.httpClient.send(
 				httpRequest,
 				HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
-			return httpResponse;
 		}
 		catch(final IOException | InterruptedException e)
 		{