Skip to content

Commit a10f383

Browse files
JohannesRabauerJohannesRabauer
committed
Fixed merge
1 parent a2d0070 commit a10f383

File tree

7 files changed

+24
-68
lines changed

7 files changed

+24
-68
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static BzstDipConfiguration createConfiguration()
3939
{
4040
return new BzstDipConfigurationBuilder()
4141
.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
42-
.setTaxID("123")
42+
.setTaxID("86095742719")
4343
.setTaxNumber("123")
4444
.setSigningProvider(new SigningProviderByPem("DemoCert.pem", "DemoKey.pem"))
4545
.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,6 @@
154154
<version>${junit-jupiter.version}</version>
155155
<scope>test</scope>
156156
</dependency>
157-
<dependency>
158-
<groupId>org.junit.jupiter</groupId>
159-
<artifactId>junit-jupiter-params</artifactId>
160-
<version>5.10.2</version>
161-
<scope>test</scope>
162-
</dependency>
163157
<dependency>
164158
<groupId>org.apache.logging.log4j</groupId>
165159
<artifactId>log4j-slf4j2-impl</artifactId>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ public class BzstDipConfigurationValidator
2525
{
2626
public static void validateConfiguration(final BzstDipConfiguration configuration)
2727
{
28-
checkForNullOrBlank(
29-
PropertiesSupplier.PROPERTY_NAME_CERTIFICATE_KEYSTORE_PASSWORD,
30-
configuration.getCertificateKeystorePassword());
3128
checkForNullOrBlank(
3229
PropertiesSupplier.PROPERTY_NAME_CLIENT_ID, configuration.getClientId());
3330
checkForNullOrBlank(
@@ -40,7 +37,6 @@ public static void validateConfiguration(final BzstDipConfiguration configuratio
4037
checkForNull(PropertiesSupplier.PROPERTY_NAME_ENVIRONMENT, configuration.getEnvironment());
4138
checkForNull(PropertiesSupplier.PROPERTY_NAME_MESSAGE_TYPE_INDIC, configuration.getMessageTypeIndic());
4239
checkForNull(PropertiesSupplier.PROPERTY_NAME_DOC_TYPE_INDIC, configuration.getDocType());
43-
checkForNull("certificate keystore input", configuration.getCertificateKeystoreInputStream());
4440
checkForNullOrBlank(
4541
PropertiesSupplier.PROPERTY_NAME_PLATFORM_OPERATOR_ORGANIZATION,
4642
configuration.getPlatformOperatorOrganizationName());

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.security.KeyStore;
2121
import java.security.PrivateKey;
2222
import java.security.cert.X509Certificate;
23+
import java.util.Objects;
2324
import java.util.function.Supplier;
2425

2526
import org.slf4j.Logger;
@@ -49,15 +50,16 @@ public SigningProviderByJks(
4950
() -> ClassLoader.getSystemClassLoader().getResourceAsStream(certificateKeystorePath),
5051
certificateKeystorePassword
5152
);
53+
Objects.requireNonNull(certificateKeystorePath);
5254
}
5355

5456
public SigningProviderByJks(
5557
final Supplier<InputStream> certificateKeystoreInputStream,
5658
final String certificateKeystorePassword
5759
)
5860
{
59-
this.certificateKeystoreInputStream = certificateKeystoreInputStream;
60-
this.certificateKeystorePassword = certificateKeystorePassword;
61+
this.certificateKeystoreInputStream = Objects.requireNonNull(certificateKeystoreInputStream);
62+
this.certificateKeystorePassword = Objects.requireNonNull(certificateKeystorePassword);
6163
}
6264

6365
@Override

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.security.cert.CertificateFactory;
2525
import java.security.cert.X509Certificate;
2626
import java.security.spec.PKCS8EncodedKeySpec;
27+
import java.util.Objects;
2728
import java.util.function.Supplier;
2829

2930
import org.apache.hc.client5.http.utils.Base64;
@@ -72,6 +73,9 @@ public SigningProviderByPem(
7273
() -> ClassLoader.getSystemClassLoader().getResourceAsStream(privateKeyPemFilePath),
7374
privateKeyAlgorithm
7475
);
76+
Objects.requireNonNull(certificatePemFilePath);
77+
Objects.requireNonNull(privateKeyPemFilePath);
78+
Objects.requireNonNull(privateKeyAlgorithm);
7579
}
7680

7781
/**
@@ -94,9 +98,9 @@ public SigningProviderByPem(
9498
final Supplier<InputStream> privateKeyPemInputStream,
9599
final String privateKeyAlgorithm)
96100
{
97-
this.certificatePemInputStream = certificatePemInputStream;
98-
this.privateKeyPemInputStream = privateKeyPemInputStream;
99-
this.privateKeyAlgorithm = privateKeyAlgorithm;
101+
this.certificatePemInputStream = Objects.requireNonNull(certificatePemInputStream);
102+
this.privateKeyPemInputStream = Objects.requireNonNull(privateKeyPemInputStream);
103+
this.privateKeyAlgorithm = Objects.requireNonNull(privateKeyAlgorithm);
100104
}
101105

102106
@Override

‎bzst-dip-java-client/src/test/java/software/xdev/bzst/dip/client/ConfigurationTestUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private static BzstDipConfigurationBuilder createBuilderWithoutSigning()
5050
{
5151
return new BzstDipConfigurationBuilder()
5252
.setClientId("TestClient")
53-
.setTaxID("123")
53+
.setTaxID("86095742719")
5454
.setTaxNumber("123")
5555
.setSigningProvider(new SigningProviderByPem("DemoKey.pem", "DemoCert.pem"))
5656
.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)

‎bzst-dip-java-client/src/test/java/software/xdev/bzst/dip/client/model/configuration/BzstDipConfigurationBuilderTest.java‎

Lines changed: 11 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import software.xdev.bzst.dip.client.exception.ConfigurationException;
2424
import software.xdev.bzst.dip.client.model.message.BzstDipAddressFix;
25+
import software.xdev.bzst.dip.client.signing.SigningProviderByJks;
2526

2627

2728
class BzstDipConfigurationBuilderTest
@@ -44,9 +45,7 @@ void buildAndValidate_goodValue()
4445
.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
4546
.setTaxID("86095742719")
4647
.setTaxNumber("123")
47-
.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
48-
.getResourceAsStream("DemoKeystore.jks"))
49-
.setCertificateKeystorePassword("test123")
48+
.setSigningProvider(new SigningProviderByJks("DemoKeystore.jks", "test123"))
5049
.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
5150
.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
5251
.setReportingPeriod(LocalDate.now())
@@ -66,9 +65,7 @@ void buildAndValidate_missingClientId()
6665
() -> new BzstDipConfigurationBuilder()
6766
.setTaxID("86095742719")
6867
.setTaxNumber("123")
69-
.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
70-
.getResourceAsStream("DemoKeystore.jks"))
71-
.setCertificateKeystorePassword("test123")
68+
.setSigningProvider(new SigningProviderByJks("DemoKeystore.jks", "test123"))
7269
.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
7370
.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
7471
.setReportingPeriod(LocalDate.now())
@@ -88,9 +85,7 @@ void buildAndValidate_missingTaxId()
8885
() -> new BzstDipConfigurationBuilder()
8986
.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
9087
.setTaxNumber("123")
91-
.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
92-
.getResourceAsStream("DemoKeystore.jks"))
93-
.setCertificateKeystorePassword("test123")
88+
.setSigningProvider(new SigningProviderByJks("DemoKeystore.jks", "test123"))
9489
.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
9590
.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
9691
.setReportingPeriod(LocalDate.now())
@@ -110,9 +105,7 @@ void buildAndValidate_missingTaxNumber()
110105
() -> new BzstDipConfigurationBuilder()
111106
.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
112107
.setTaxID("86095742719")
113-
.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
114-
.getResourceAsStream("DemoKeystore.jks"))
115-
.setCertificateKeystorePassword("test123")
108+
.setSigningProvider(new SigningProviderByJks("DemoKeystore.jks", "test123"))
116109
.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
117110
.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
118111
.setReportingPeriod(LocalDate.now())
@@ -125,37 +118,14 @@ void buildAndValidate_missingTaxNumber()
125118
}
126119

127120
@Test
128-
void buildAndValidate_missingKeystore()
121+
void buildAndValidate_missingSigningProvider()
129122
{
130123
Assertions.assertThrows(
131124
ConfigurationException.class,
132125
() -> new BzstDipConfigurationBuilder()
133126
.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
134127
.setTaxID("86095742719")
135128
.setTaxNumber("123")
136-
.setCertificateKeystorePassword("test123")
137-
.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
138-
.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
139-
.setReportingPeriod(LocalDate.now())
140-
.setDocTypeIndic(BzstDipOecdDocType.OECD_1)
141-
.setPlatformOperatorOrganizationName("TestOrg")
142-
.setPlatformOperatorPlatformName("TestApp")
143-
.setPlatformOperatorAddress(new BzstDipAddressFix("TestCity"))
144-
.buildAndValidate()
145-
);
146-
}
147-
148-
@Test
149-
void buildAndValidate_missingKeystorePassword()
150-
{
151-
Assertions.assertThrows(
152-
ConfigurationException.class,
153-
() -> new BzstDipConfigurationBuilder()
154-
.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
155-
.setTaxID("86095742719")
156-
.setTaxNumber("123")
157-
.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
158-
.getResourceAsStream("DemoKeystore.jks"))
159129
.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
160130
.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
161131
.setReportingPeriod(LocalDate.now())
@@ -175,9 +145,7 @@ void buildAndValidate_defaultRealmBaseUrl()
175145
.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
176146
.setTaxID("86095742719")
177147
.setTaxNumber("123")
178-
.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
179-
.getResourceAsStream("DemoKeystore.jks"))
180-
.setCertificateKeystorePassword("test123")
148+
.setSigningProvider(new SigningProviderByJks("DemoKeystore.jks", "test123"))
181149
.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
182150
.setReportingPeriod(LocalDate.now())
183151
.setDocTypeIndic(BzstDipOecdDocType.OECD_1)
@@ -197,9 +165,7 @@ void buildAndValidate_missingMessageTypeIndic()
197165
.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
198166
.setTaxID("86095742719")
199167
.setTaxNumber("123")
200-
.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
201-
.getResourceAsStream("DemoKeystore.jks"))
202-
.setCertificateKeystorePassword("test123")
168+
.setSigningProvider(new SigningProviderByJks("DemoKeystore.jks", "test123"))
203169
.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
204170
.setReportingPeriod(LocalDate.now())
205171
.setDocTypeIndic(BzstDipOecdDocType.OECD_1)
@@ -219,9 +185,7 @@ void buildAndValidate_wrongReportingPeriod()
219185
.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
220186
.setTaxID("86095742719")
221187
.setTaxNumber("123")
222-
.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
223-
.getResourceAsStream("DemoKeystore.jks"))
224-
.setCertificateKeystorePassword("test123")
188+
.setSigningProvider(new SigningProviderByJks("DemoKeystore.jks", "test123"))
225189
.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
226190
.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
227191
.setReportingPeriod(LocalDate.now().plusDays(1))
@@ -242,9 +206,7 @@ void buildAndValidate_missingReportingPeriod()
242206
.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
243207
.setTaxID("86095742719")
244208
.setTaxNumber("123")
245-
.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
246-
.getResourceAsStream("DemoKeystore.jks"))
247-
.setCertificateKeystorePassword("test123")
209+
.setSigningProvider(new SigningProviderByJks("DemoKeystore.jks", "test123"))
248210
.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
249211
.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
250212
.setDocTypeIndic(BzstDipOecdDocType.OECD_1)
@@ -264,9 +226,7 @@ void buildAndValidate_missingAddress()
264226
.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
265227
.setTaxID("86095742719")
266228
.setTaxNumber("123")
267-
.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
268-
.getResourceAsStream("DemoKeystore.jks"))
269-
.setCertificateKeystorePassword("test123")
229+
.setSigningProvider(new SigningProviderByJks("DemoKeystore.jks", "test123"))
270230
.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
271231
.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
272232
.setReportingPeriod(LocalDate.now())

0 commit comments

Comments
 (0)