Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[BACKLOG-13475] Fix misspelled MDI Key with migration code (#3388)
- Loading branch information
1 parent
52eaed4
commit 346895d
Showing
6 changed files
with
136 additions
and
16 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
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
50 changes: 50 additions & 0 deletions
50
...nject-plugin/src/main/java/org/pentaho/di/trans/steps/metainject/MetaInjectMigration.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,50 @@ | ||
| /*! ****************************************************************************** | ||
| * | ||
| * Pentaho Data Integration | ||
| * | ||
| * Copyright (C) 2017 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.metainject; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * This class converts old mapping info into new one. | ||
| * | ||
| * @author Alexander Buloichik | ||
| */ | ||
| public class MetaInjectMigration { | ||
| /** | ||
| * Migrate mapping from 7.0 version. | ||
| */ | ||
| public static void migrateFrom70( Map<TargetStepAttribute, SourceStepField> targetSourceMapping ) { | ||
| /* | ||
| * Need to convert GetTableNamesMeta.SCHENAMENAMEFIELD to the GetTableNamesMeta.SCHEMANAMEFIELD | ||
| */ | ||
| for ( TargetStepAttribute target : new ArrayList<>( targetSourceMapping.keySet() ) ) { | ||
| if ( "SCHENAMENAMEFIELD".equals( target.getAttributeKey() ) ) { | ||
| SourceStepField so = targetSourceMapping.remove( target ); | ||
| TargetStepAttribute target2 = | ||
| new TargetStepAttribute( target.getStepname(), "SCHEMANAMEFIELD", target.isDetail() ); | ||
| targetSourceMapping.put( target2, so ); | ||
| } | ||
| } | ||
| } | ||
| } |
50 changes: 50 additions & 0 deletions
50
...t-plugin/src/test/java/org/pentaho/di/trans/steps/metainject/MetaInjectMigrationTest.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,50 @@ | ||
| /*! ****************************************************************************** | ||
| * | ||
| * Pentaho Data Integration | ||
| * | ||
| * Copyright (C) 2017 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.metainject; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| public class MetaInjectMigrationTest { | ||
| @Test | ||
| public void test70() { | ||
| Map<TargetStepAttribute, SourceStepField> targetSourceMapping = new HashMap<>(); | ||
| TargetStepAttribute target = new TargetStepAttribute( "step", "SCHENAMENAMEFIELD", true ); | ||
| SourceStepField source = new SourceStepField( "step", "field" ); | ||
| targetSourceMapping.put( target, source ); | ||
|
|
||
| MetaInjectMigration.migrateFrom70( targetSourceMapping ); | ||
|
|
||
| assertEquals( 1, targetSourceMapping.size() ); | ||
| TargetStepAttribute target2 = targetSourceMapping.keySet().iterator().next(); | ||
| assertEquals( "SCHEMANAMEFIELD", target2.getAttributeKey() ); | ||
| assertEquals( target.getStepname(), target2.getStepname() ); | ||
| assertEquals( target.isDetail(), target2.isDetail() ); | ||
|
|
||
| assertEquals( source, targetSourceMapping.get( target2 ) ); | ||
| } | ||
| } |