fix(cli): fixes final datasource class name on repository and service

closes #1771

Author: marioestradarosa

packages/cli/generators/repository/index.js

@@ -86,7 +86,7 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
     );
 
     this.artifactInfo.dataSourceClassName =
-      this.artifactInfo.dataSourceName + 'DataSource';
+      utils.toClassName(this.artifactInfo.dataSourceName) + 'DataSource';
   }
 
   /**

packages/cli/generators/service/index.js

@@ -205,7 +205,7 @@ module.exports = class ServiceGenerator extends ArtifactGenerator {
     );
 
     this.artifactInfo.dataSourceClassName =
-      this.artifactInfo.dataSourceName + 'DataSource';
+      utils.toClassName(this.artifactInfo.dataSourceName) + 'DataSource';
 
     // Setting up data for templates
     this.artifactInfo.className = utils.toClassName(this.artifactInfo.name);

packages/cli/test/integration/generators/service.integration.js

@@ -86,7 +86,7 @@ describe('lb4 service', () => {
       );
       assert.fileContent(
         expectedFile,
-        /protected datasource: mydsDataSource = new mydsDataSource\(\),/,
+        /protected datasource: mydsDataSource = new MydsDataSource\(\),/,
       );
       assert.fileContent(
         expectedFile,