forked from pentaho/pentaho-kettle
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request pentaho#1786 from TatsianaKasiankova/PDI-13271
[PDI-13271]: External Ids are not handled properly when incoming key is null
- Loading branch information
Showing
9 changed files
with
801 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
plugins/salesforce/src/org/pentaho/di/trans/steps/salesforceutils/SalesforceUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /*! ****************************************************************************** | ||
| * | ||
| * Pentaho Data Integration | ||
| * | ||
| * Copyright (C) 2002-2015 by Pentaho : http://www.pentaho.com | ||
| * | ||
| ******************************************************************************* | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| ******************************************************************************/ | ||
| package org.pentaho.di.trans.steps.salesforceutils; | ||
|
|
||
| import static java.util.regex.Pattern.compile; | ||
|
|
||
| import java.util.regex.Pattern; | ||
|
|
||
| import org.pentaho.di.core.logging.LogChannelInterface; | ||
| import org.pentaho.di.i18n.BaseMessages; | ||
|
|
||
| /** | ||
| * Utility class to process salesforce specific features. | ||
| * | ||
| * @author Tatsiana_Kasiankova | ||
| * | ||
| */ | ||
| public class SalesforceUtils { | ||
| private static Class<?> PKG = SalesforceUtils.class; // for i18n purposes, needed by Translator2!! | ||
|
|
||
| private static final String EXTID_SEPARATOR = "/"; | ||
|
|
||
| private static final String CUSTOM_OBJECT_RELATIONSHIP_FIELD_SUFFIX = "_r"; | ||
|
|
||
| private static final String CUSTOM_OBJECT_SUFFIX = "_c"; | ||
|
|
||
| private static final Pattern FIELD_NAME_WITH_EXTID_PATTERN = compile( "^\\w+\\:\\w+\\/\\w+$" ); | ||
|
|
||
| /** | ||
| * Extract and return the correct name for the field that should be processed as NULL | ||
| * | ||
| * @param log | ||
| * the logging object | ||
| * @param field | ||
| * the field that should be processed as NULL | ||
| * @param isUseExtId | ||
| * the flag that indicates if the field is external id or not | ||
| * @return return the correct name for the field that should be processed as NULL | ||
| */ | ||
| public static String getFieldToNullName( LogChannelInterface log, String field, boolean isUseExtId ) { | ||
| String fieldToNullName = field; | ||
| if ( isUseExtId ) { | ||
| // verify if the field has correct syntax | ||
| if ( !FIELD_NAME_WITH_EXTID_PATTERN.matcher( field ).matches() ) { | ||
| if ( log.isDebug() ) { | ||
| log.logDebug( BaseMessages.getString( PKG, "SalesforceUtils.Warn.IncorrectExternalKeySyntax", field, | ||
| fieldToNullName ) ); | ||
| } | ||
| return fieldToNullName; | ||
| } | ||
|
|
||
| String lookupField = field.substring( field.indexOf( EXTID_SEPARATOR ) + 1 ); | ||
| // working with custom objects and relationship | ||
| // cut off _r and then add _c in the end of the name | ||
| if ( lookupField.endsWith( CUSTOM_OBJECT_RELATIONSHIP_FIELD_SUFFIX ) ) { | ||
| fieldToNullName = | ||
| lookupField.substring( 0, lookupField.length() - CUSTOM_OBJECT_RELATIONSHIP_FIELD_SUFFIX.length() ) | ||
| + CUSTOM_OBJECT_SUFFIX; | ||
| if ( log.isDebug() ) { | ||
| log.logDebug( BaseMessages.getString( PKG, "SalesforceUtils.Debug.NullFieldName", fieldToNullName ) ); | ||
| } | ||
| return fieldToNullName; | ||
| } | ||
|
|
||
| fieldToNullName = lookupField + "Id"; | ||
| } | ||
|
|
||
| if ( log.isDebug() ) { | ||
| log.logDebug( BaseMessages.getString( PKG, "SalesforceUtils.Debug.NullFieldName", fieldToNullName ) ); | ||
| } | ||
|
|
||
| return fieldToNullName; | ||
| } | ||
|
|
||
| } |
2 changes: 2 additions & 0 deletions
2
...esforce/src/org/pentaho/di/trans/steps/salesforceutils/messages/messages_en_US.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| SalesforceUtils.Warn.IncorrectExternalKeySyntax=The field has incorrect external key syntax: {0}. Syntax for external key should be : object:externalId/lookupField. Trying to use fieldToNullName={1}. | ||
| SalesforceUtils.Debug.NullFieldName=fieldToNullName={0} |
Oops, something went wrong.