Skip to content

Commit b851a26

Browse files
JohannesRabauerJohannesRabauer
committed
Logging changed to slf4j
1 parent d5641fa commit b851a26

File tree

16 files changed

+54
-46
lines changed

16 files changed

+54
-46
lines changed

‎.run/Run Demo.run.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Demo" type="Application" factoryName="Application">
3-
<option name="MAIN_CLASS_NAME" value="software.xdev.bzst.dip.client.Application"/>
4-
<module name="bzst-dip-java-client-demo"/>
3+
<option name="MAIN_CLASS_NAME" value="software.demo.bzst.dip.client.demo.Application" />
4+
<module name="bzst-dip-java-client-demo" />
55
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
66
<extension name="coverage">
77
<pattern>
88
<option name="PATTERN" value="software.xdev.*" />
99
<option name="ENABLED" value="true" />
1010
</pattern>
1111
</extension>
12+
<extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
13+
<option name="credential" />
14+
<option name="region" />
15+
<option name="useCurrentConnection" value="false" />
16+
</extension>
1217
<method v="2">
1318
<option name="Make" enabled="true" />
1419
</method>
1520
</configuration>
16-
</component>
21+
</component>

‎bzst-dip-java-client-demo/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</dependency>
3535
<dependency>
3636
<groupId>org.apache.logging.log4j</groupId>
37-
<artifactId>log4j-core</artifactId>
37+
<artifactId>log4j-slf4j2-impl</artifactId>
3838
<version>2.23.1</version>
3939
</dependency>
4040
</dependencies>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import java.util.List;
66
import java.util.UUID;
77

8-
import org.apache.logging.log4j.LogManager;
9-
import org.apache.logging.log4j.Logger;
8+
import org.slf4j.Logger;
9+
import org.slf4j.LoggerFactory;
1010

1111
import software.xdev.bzst.dip.client.BzstDipClient;
1212
import software.xdev.bzst.dip.client.exception.HttpStatusCodeNotExceptedException;
@@ -32,7 +32,7 @@
3232
@SuppressWarnings("checkstyle:MagicNumber")
3333
public final class Application
3434
{
35-
private static final Logger LOGGER = LogManager.getLogger(Application.class);
35+
private static final Logger LOGGER = LoggerFactory.getLogger(Application.class);
3636

3737
public static void main(final String[] args)
3838
throws InterruptedException, HttpStatusCodeNotExceptedException, IOException

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.io.IOException;
44

5-
import org.apache.logging.log4j.LogManager;
6-
import org.apache.logging.log4j.Logger;
5+
import org.slf4j.Logger;
6+
import org.slf4j.LoggerFactory;
77

88
import software.xdev.bzst.dip.client.BzstDipClient;
99
import software.xdev.bzst.dip.client.exception.HttpStatusCodeNotExceptedException;
@@ -16,7 +16,7 @@
1616
@SuppressWarnings("checkstyle:MagicNumber")
1717
public final class ApplicationWithConfigurationFromProperties
1818
{
19-
private static final Logger LOGGER = LogManager.getLogger(ApplicationWithConfigurationFromProperties.class);
19+
private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationWithConfigurationFromProperties.class);
2020

2121
public static void main(final String[] args)
2222
throws InterruptedException, HttpStatusCodeNotExceptedException, IOException

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import java.io.InputStreamReader;
77
import java.util.stream.Collectors;
88

9-
import org.apache.logging.log4j.LogManager;
10-
import org.apache.logging.log4j.Logger;
9+
import org.slf4j.Logger;
10+
import org.slf4j.LoggerFactory;
1111

1212
import software.xdev.bzst.dip.client.BzstDipClient;
1313
import software.xdev.bzst.dip.client.exception.HttpStatusCodeNotExceptedException;
@@ -18,7 +18,7 @@
1818
@SuppressWarnings("checkstyle:MagicNumber")
1919
public final class ApplicationWithCsvInput
2020
{
21-
private static final Logger LOGGER = LogManager.getLogger(ApplicationWithCsvInput.class);
21+
private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationWithCsvInput.class);
2222

2323
public static void main(final String[] args)
2424
throws InterruptedException, HttpStatusCodeNotExceptedException, IOException

‎bzst-dip-java-client/pom.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,10 @@
112112
<artifactId>jackson-dataformat-xml</artifactId>
113113
<version>${jackson.version}</version>
114114
</dependency>
115-
116115
<dependency>
117-
<groupId>org.apache.logging.log4j</groupId>
118-
<artifactId>log4j-api</artifactId>
119-
<version>2.23.1</version>
116+
<groupId>org.slf4j</groupId>
117+
<artifactId>slf4j-api</artifactId>
118+
<version>2.0.12</version>
120119
</dependency>
121120

122121
<dependency>
@@ -127,7 +126,7 @@
127126
</dependency>
128127
<dependency>
129128
<groupId>org.apache.logging.log4j</groupId>
130-
<artifactId>log4j-core</artifactId>
129+
<artifactId>log4j-slf4j2-impl</artifactId>
131130
<version>2.23.1</version>
132131
<scope>test</scope>
133132
</dependency>

‎bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/BzstDipClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import java.io.IOException;
1919
import java.util.List;
2020

21-
import org.apache.logging.log4j.LogManager;
22-
import org.apache.logging.log4j.Logger;
21+
import org.slf4j.Logger;
22+
import org.slf4j.LoggerFactory;
2323

2424
import software.xdev.bzst.dip.client.exception.HttpStatusCodeNotExceptedException;
2525
import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration;
@@ -40,7 +40,7 @@
4040
@SuppressWarnings({"unused", "UnusedReturnValue"})
4141
public class BzstDipClient
4242
{
43-
private static final Logger LOGGER = LogManager.getLogger(BzstDipClient.class);
43+
private static final Logger LOGGER = LoggerFactory.getLogger(BzstDipClient.class);
4444
private final BzstDipConfiguration configuration;
4545

4646
public BzstDipClient(final BzstDipConfiguration configuration)

‎bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/factory/DocumentBuilderFactoryNoExternalEntities.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,13 @@
2020
import javax.xml.parsers.ParserConfigurationException;
2121

2222

23-
public class DocumentBuilderFactoryNoExternalEntities
23+
public final class DocumentBuilderFactoryNoExternalEntities
2424
{
25+
private DocumentBuilderFactoryNoExternalEntities()
26+
{
27+
28+
}
29+
2530
public static DocumentBuilderFactory newInstance()
2631
{
2732
try

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import java.time.LocalDate;
2121
import java.util.function.Supplier;
2222

23-
import org.apache.logging.log4j.util.Strings;
24-
2523
import software.xdev.bzst.dip.client.exception.ConfigurationException;
2624
import software.xdev.bzst.dip.client.exception.PropertyNotSetException;
2725
import software.xdev.bzst.dip.client.model.message.BzstDipAddressFix;
@@ -236,7 +234,8 @@ private void validateConfiguration(final BzstDipConfiguration configuration)
236234
{
237235
if(configuration.getDocType().isNewTransmission())
238236
{
239-
if(Strings.isBlank(configuration.getPlatformOperatorDocRefId()))
237+
if(configuration.getPlatformOperatorDocRefId() == null || configuration.getPlatformOperatorDocRefId()
238+
.isBlank())
240239
{
241240
throw new ConfigurationException(
242241
PropertiesSupplier.PROPERTY_NAME_PLATFORM_OPERATOR_DOC_REF_ID,

‎bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/parser/ReportableSellerCsvFileParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import java.util.Arrays;
2424
import java.util.List;
2525

26-
import org.apache.logging.log4j.LogManager;
27-
import org.apache.logging.log4j.Logger;
26+
import org.slf4j.Logger;
27+
import org.slf4j.LoggerFactory;
2828

2929
import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration;
3030
import software.xdev.bzst.dip.client.xmldocument.ReportableSellerCreator;
@@ -43,7 +43,7 @@
4343

4444
public final class ReportableSellerCsvFileParser
4545
{
46-
private static final Logger LOGGER = LogManager.getLogger(ReportableSellerCsvFileParser.class);
46+
private static final Logger LOGGER = LoggerFactory.getLogger(ReportableSellerCsvFileParser.class);
4747
private static final String DELIMITER = ";";
4848

4949
private ReportableSellerCsvFileParser()

0 commit comments

Comments
 (0)