Skip to content

Commit ffd7896

Browse files
committed
Added default Value for Application Code
1 parent a90aef7 commit ffd7896

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public BzstDipConfiguration(
235235
final int reportingPeriodCesopQuarter,
236236
final ZonedDateTime timestamp,
237237
final BzstCesopMessageTypeIndicEnum messageTypeIndicEnum,
238-
final String applicationCode,
238+
final SupportedApplicationCode applicationCode,
239239
final String certificateKeystorePassword,
240240
final String keyStorePrivateKeyAlias,
241241
final String clientId,
@@ -262,7 +262,7 @@ public BzstDipConfiguration(
262262
this.reportingPeriodCesopQuarter = reportingPeriodCesopQuarter;
263263
this.timestamp = timestamp;
264264
this.messageTypeIndicEnum = messageTypeIndicEnum;
265-
this.applicationCode = applicationCode;
265+
this.applicationCode = applicationCode.value;
266266
this.certificateKeystorePassword = certificateKeystorePassword;
267267
this.keyStorePrivateKeyAlias = keyStorePrivateKeyAlias;
268268
this.clientId = clientId;

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

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,10 @@ public BzstDipConfiguration buildAndValidate()
472472
PropertiesSupplier.PROPERTY_NAME_MESSAGE_TYPE_INDIC_CESOP,
473473
BzstCesopMessageTypeIndicEnum.CESOP_100
474474
),
475-
this.getSetPropertyOrReadFromFile(
476-
this.applicationCode.value,
477-
PropertiesSupplier.PROPERTY_NAME_APPLICATION_CODE),
475+
this.getSetPropertyOrReadFromFileApplicationCode(
476+
this.applicationCode,
477+
PropertiesSupplier.PROPERTY_NAME_APPLICATION_CODE,
478+
BzstDipConfiguration.SupportedApplicationCode.DAC7),
478479
this.getSetPropertyOrReadFromFile(
479480
this.certificateKeystorePassword,
480481
PropertiesSupplier.PROPERTY_NAME_CERTIFICATE_KEYSTORE_PASSWORD,
@@ -783,4 +784,19 @@ private BzstCesopMessageTypeIndicEnum getSetPropertyOrReadFromFileMessageTypeInd
783784
propertyNameInFile,
784785
defaultProperty.toString()));
785786
}
787+
788+
private BzstDipConfiguration.SupportedApplicationCode getSetPropertyOrReadFromFileApplicationCode(
789+
final BzstDipConfiguration.SupportedApplicationCode builderProperty,
790+
final String propertyNameInFile,
791+
final BzstDipConfiguration.SupportedApplicationCode defaultProperty)
792+
{
793+
if(builderProperty != null)
794+
{
795+
return builderProperty;
796+
}
797+
return BzstDipConfiguration.SupportedApplicationCode.valueOf(this.getSetPropertyOrReadFromFile(
798+
null,
799+
propertyNameInFile,
800+
defaultProperty.toString()));
801+
}
786802
}

0 commit comments

Comments
 (0)