From 1b6515c1ae3f98e25b60c9a681f559c5b394af48 Mon Sep 17 00:00:00 2001 From: Shubhangi-cs Date: Tue, 8 Aug 2023 21:35:22 +0530 Subject: [PATCH] Rework --- .../successfactors/common/util/ResourceConstants.java | 2 +- .../source/config/SuccessFactorsPluginConfig.java | 9 +++++---- .../source/metadata/SuccessFactorsSchemaGenerator.java | 2 +- .../source/service/SuccessFactorsService.java | 2 +- .../i10n/SuccessFactorsBatchSourceBundle.properties | 3 ++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/cdap/plugin/successfactors/common/util/ResourceConstants.java b/src/main/java/io/cdap/plugin/successfactors/common/util/ResourceConstants.java index 1eb28bc..debbe80 100644 --- a/src/main/java/io/cdap/plugin/successfactors/common/util/ResourceConstants.java +++ b/src/main/java/io/cdap/plugin/successfactors/common/util/ResourceConstants.java @@ -39,7 +39,7 @@ public enum ResourceConstants { ERR_CHECK_ADVANCED_PARAM(null, "err.check.advanced.parameter"), ERR_NOT_FOUND(null, "err.resource.not.found"), ERR_NO_COLUMN_FOUND(null, "err.no.column.found"), - ERR_UNSUPPORTED_ASSOCIATEDENTITY(null, "err.unsupported.associatedEntity"), + ERR_UNSUPPORTED_ASSOCIATED_ENTITY(null, "err.unsupported.associated.entity"), ERR_BUILDING_COLUMNS(null, "err.building.columns"), DEBUG_NAVIGATION_NOT_FOUND(null, "debug.navigation.not.found"), DEBUG_NAV_PROP_NOT_FOUND(null, "debug.nav.prop.not.found"), diff --git a/src/main/java/io/cdap/plugin/successfactors/source/config/SuccessFactorsPluginConfig.java b/src/main/java/io/cdap/plugin/successfactors/source/config/SuccessFactorsPluginConfig.java index 0771904..b441c87 100644 --- a/src/main/java/io/cdap/plugin/successfactors/source/config/SuccessFactorsPluginConfig.java +++ b/src/main/java/io/cdap/plugin/successfactors/source/config/SuccessFactorsPluginConfig.java @@ -32,6 +32,7 @@ import java.io.IOException; import java.util.regex.Pattern; + import javax.annotation.Nullable; /** @@ -261,11 +262,11 @@ private void validateEntityParameter(FailureCollector failureCollector) { .withConfigProperty(ENTITY_NAME); } } - if (SuccessFactorsUtil.isNotNullOrEmpty(associateEntityName)) { - if (SuccessFactorsUtil.isNullOrEmpty(getExpandOption()) && !containsMacro(EXPAND_OPTION)) { - failureCollector.addFailure(ResourceConstants.ERR_INVALID_ENTITY_CALL.getMsgForKey(), null); - } + if (SuccessFactorsUtil.isNotNullOrEmpty(associateEntityName)) { + if (SuccessFactorsUtil.isNullOrEmpty(getExpandOption()) && !containsMacro(EXPAND_OPTION)) { + failureCollector.addFailure(ResourceConstants.ERR_INVALID_ENTITY_CALL.getMsgForKey(), null); } + } } /** diff --git a/src/main/java/io/cdap/plugin/successfactors/source/metadata/SuccessFactorsSchemaGenerator.java b/src/main/java/io/cdap/plugin/successfactors/source/metadata/SuccessFactorsSchemaGenerator.java index 7fb2cec..64b2979 100644 --- a/src/main/java/io/cdap/plugin/successfactors/source/metadata/SuccessFactorsSchemaGenerator.java +++ b/src/main/java/io/cdap/plugin/successfactors/source/metadata/SuccessFactorsSchemaGenerator.java @@ -323,7 +323,7 @@ public Schema buildExpandOutputSchema(String entityName, String expandOption, St throw new SuccessFactorsServiceException(ResourceConstants.ERR_NO_COLUMN_FOUND.getMsgForKey(expandOption, entityName), 4); } else if (!pluginConfig.containsMacro(SuccessFactorsPluginConfig.ASSOCIATED_ENTITY_NAME)) { - throw new SuccessFactorsServiceException(ResourceConstants.ERR_UNSUPPORTED_ASSOCIATEDENTITY. + throw new SuccessFactorsServiceException(ResourceConstants.ERR_UNSUPPORTED_ASSOCIATED_ENTITY. getMsgForKey(associatedEntity, entityName), 4); } diff --git a/src/main/java/io/cdap/plugin/successfactors/source/service/SuccessFactorsService.java b/src/main/java/io/cdap/plugin/successfactors/source/service/SuccessFactorsService.java index ee1f744..0780dc6 100644 --- a/src/main/java/io/cdap/plugin/successfactors/source/service/SuccessFactorsService.java +++ b/src/main/java/io/cdap/plugin/successfactors/source/service/SuccessFactorsService.java @@ -284,7 +284,7 @@ public ODataFeed readServiceEntityData(Edm edm, Long skip, Long top) } catch (EdmException | EntityProviderException | IOException ex) { if (pluginConfig.getAssociatedEntityName() != null) { String errMsg = - ResourceConstants.ERR_UNSUPPORTED_ASSOCIATEDENTITY. + ResourceConstants.ERR_UNSUPPORTED_ASSOCIATED_ENTITY. getMsgForKey(pluginConfig.getAssociatedEntityName(), pluginConfig.getEntityName()); throw new SuccessFactorsServiceException(errMsg, ex); } else { diff --git a/src/main/resources/i10n/SuccessFactorsBatchSourceBundle.properties b/src/main/resources/i10n/SuccessFactorsBatchSourceBundle.properties index cda418d..9e432c5 100644 --- a/src/main/resources/i10n/SuccessFactorsBatchSourceBundle.properties +++ b/src/main/resources/i10n/SuccessFactorsBatchSourceBundle.properties @@ -31,7 +31,8 @@ err.missing.dataservice.version=No data service version number found. Please ens ## SAP SuccessFactors - metadata processing related messages err.no.column.found=''{0}'' not found in the ''{1}'' entity. -err.unsupported.associatedEntity=''{0}'' not found in the ''{1}'' entity. Please ensure that associated entity is correct. Please check the property name in Admin Center > OData API Data Dictionary or entity metadata. +err.unsupported.associated.entity=''{0}'' not found in the ''{1}'' entity. Please ensure that associated entity is \ +correct. Please check the property name in Admin Center > OData API Data Dictionary or entity metadata. err.building.columns=Error while building ''{0}'' from service metadata for the given ''{1}'' entity. debug.navigation.not.found=''{0}'' navigation property not found from the ''{1}''.