[PDI-14150]Set databaseMeta name to file title

Name is not set by the DataNode transformer
pentaho · Sep 14, 2015 · 6de4b2f · 6de4b2f
1 parent ddce129
commit 6de4b2f
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/plugins/pdi-pur-plugin/src/org/pentaho/di/repository/pur/PurRepository.java b/plugins/pdi-pur-plugin/src/org/pentaho/di/repository/pur/PurRepository.java
@@ -17,22 +17,6 @@
 
 package org.pentaho.di.repository.pur;
 
-import java.io.Serializable;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.EnumMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.pentaho.di.cluster.ClusterSchema;
 import org.pentaho.di.cluster.SlaveServer;
@@ -92,10 +76,27 @@
 import org.pentaho.platform.api.repository2.unified.RepositoryFileAcl;
 import org.pentaho.platform.api.repository2.unified.RepositoryFileTree;
 import org.pentaho.platform.api.repository2.unified.VersionSummary;
+import org.pentaho.platform.api.repository2.unified.data.node.DataNode;
 import org.pentaho.platform.api.repository2.unified.data.node.NodeRepositoryFileData;
 import org.pentaho.platform.repository.RepositoryFilenameUtils;
 import org.pentaho.platform.repository2.ClientRepositoryPaths;
 
+import java.io.Serializable;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.EnumMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
 /**
  * Implementation of {@link Repository} that delegates to the Pentaho unified repository (PUR), an instance of {@link
  * IUnifiedRepository}.
@@ -1155,8 +1156,10 @@ public List<DatabaseMeta> readDatabases() throws KettleException {
       List<RepositoryFile> children = getAllFilesOfType( null, RepositoryObjectType.DATABASE, false );
       List<DatabaseMeta> dbMetas = new ArrayList<DatabaseMeta>();
       for ( RepositoryFile file : children ) {
-        dbMetas.add( (DatabaseMeta) databaseMetaTransformer.dataNodeToElement( pur.getDataForRead( file.getId(),
-          NodeRepositoryFileData.class ).getNode() ) );
+        DataNode node = pur.getDataForRead( file.getId(), NodeRepositoryFileData.class ).getNode();
+        DatabaseMeta databaseMeta = (DatabaseMeta) databaseMetaTransformer.dataNodeToElement( node );
+        databaseMeta.setName( file.getTitle() );
+        dbMetas.add( databaseMeta );
       }
       return dbMetas;
     } catch ( Exception e ) {