Skip to content

Commit f8f784a

Browse files
Fixed optional TransmittingCountry in config
1 parent ff09284 commit f8f784a

File tree

2 files changed

+29
-3
lines changed

2 files changed

+29
-3
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,8 @@ public BzstDipConfiguration buildAndValidate()
438438
final BzstDipConfiguration configuration = new BzstDipConfiguration(
439439
this.getSetPropertyOrReadFromFileTransmittingCountry(
440440
this.transmittingCountry,
441-
PropertiesSupplier.PROPERTY_NAME_TRANSMITTING_COUNTRY
441+
PropertiesSupplier.PROPERTY_NAME_TRANSMITTING_COUNTRY,
442+
BzstDipCountryCode.DE
442443
),
443444
this.getSetPropertyOrReadFromFileMessageType(
444445
this.messageType,
@@ -730,15 +731,17 @@ private ZonedDateTime getSetPropertyOrReadFromFileTimestamp(
730731

731732
private BzstDipCountryCode getSetPropertyOrReadFromFileTransmittingCountry(
732733
final BzstDipCountryCode builderProperty,
733-
final String propertyNameInFile)
734+
final String propertyNameInFile,
735+
final BzstDipCountryCode defaultProperty)
734736
{
735737
if(builderProperty != null)
736738
{
737739
return builderProperty;
738740
}
739741
return BzstDipCountryCode.valueOf(this.getSetPropertyOrReadFromFile(
740742
null,
741-
propertyNameInFile));
743+
propertyNameInFile,
744+
defaultProperty.toString()));
742745
}
743746

744747
private BzstCesopMessageTypeEnum getSetPropertyOrReadFromFileMessageType(

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,29 @@ void buildAndValidate_defaultRealmBaseUrl()
190190
);
191191
}
192192

193+
@Test
194+
void buildAndValidate_cesop()
195+
{
196+
Assertions.assertDoesNotThrow(
197+
() -> new BzstDipConfigurationBuilder()
198+
.setApplicationCode(BzstDipConfiguration.SupportedApplicationCode.CESOP)
199+
// TODO
200+
.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
201+
.setTaxID("86095742719")
202+
.setTaxNumber("123")
203+
.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
204+
.getResourceAsStream("DemoKeystore.jks"))
205+
.setCertificateKeystorePassword("test123")
206+
.setMessageTypeIndic(BzstDipDpiMessageType.DPI_401)
207+
.setReportingPeriod(LocalDate.now())
208+
.setDocTypeIndic(BzstDipOecdDocType.OECD_1)
209+
.setPlatformOperatorOrganizationName("TestOrg")
210+
.setPlatformOperatorPlatformName("TestApp")
211+
.setPlatformOperatorAddress(new BzstDipAddressFix("TestCity"))
212+
.buildAndValidate()
213+
);
214+
}
215+
193216
@Test
194217
void buildAndValidate_missingMessageTypeIndic()
195218
{

0 commit comments

Comments
 (0)