From 62ad51fa41f5c532934296bcb14921411ded9479 Mon Sep 17 00:00:00 2001
From: Harald Fielker <egandro@gmail.com>
Date: Fri, 23 Feb 2018 13:14:11 +0100
Subject: [PATCH] minor bug fixes

---
 .../android.ormlite.dal/android.ormlite.dal.generator.ts    | 2 +-
 .../android.retrofit.client.generator.ts                    | 2 +-
 lib/generator/angular.client/templates/entities.ts.ejs      | 2 +-
 lib/generator/angular.client/templates/services.ts.ejs      | 6 +++---
 package.json                                                | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/generator/android.ormlite.dal/android.ormlite.dal.generator.ts b/lib/generator/android.ormlite.dal/android.ormlite.dal.generator.ts
index 357b396..7aa328b 100644
--- a/lib/generator/android.ormlite.dal/android.ormlite.dal.generator.ts
+++ b/lib/generator/android.ormlite.dal/android.ormlite.dal.generator.ts
@@ -144,7 +144,7 @@ export class AndroidORMLiteDalGenerator extends BaseGenerator {
 
         await RenderTemplate.renderTemplate(createGitIgnore, this, 'gitignore.ejs', data, '.gitignore');
         await RenderTemplate.renderTemplate(createBuildGradle, this, 'build.gradle.ejs', data);
-        await RenderTemplate.renderTemplate(createBuildGradle, this, 'proguard-rules.pro.ejs', data);
+        await RenderTemplate.renderTemplate(createProguardRulesPro, this, 'proguard-rules.pro.ejs', data);
         await RenderTemplate.renderTemplateToDir(path.join(this.getTargetDir(), 'src/main'), createAndroidManifestXml, this, 'AndroidManifest.xml.ejs', data);
         await RenderTemplate.renderTemplateToDir(path.join(this.getTargetDir(), 'src/main/res/values'), createStringsXml, this, 'strings.xml.ejs', data);
 
diff --git a/lib/generator/android.retrofit.client/android.retrofit.client.generator.ts b/lib/generator/android.retrofit.client/android.retrofit.client.generator.ts
index 98cdb09..aa6582f 100644
--- a/lib/generator/android.retrofit.client/android.retrofit.client.generator.ts
+++ b/lib/generator/android.retrofit.client/android.retrofit.client.generator.ts
@@ -125,7 +125,7 @@ export class AndroidRetrofitClientGenerator extends BaseGenerator {
 
         await RenderTemplate.renderTemplate(createGitIgnore, this, 'gitignore.ejs', data, '.gitignore');
         await RenderTemplate.renderTemplate(createBuildGradle, this, 'build.gradle.ejs', data);
-        await RenderTemplate.renderTemplate(createBuildGradle, this, 'proguard-rules.pro.ejs', data);
+        await RenderTemplate.renderTemplate(createProguardRulesPro, this, 'proguard-rules.pro.ejs', data);
         await RenderTemplate.renderTemplateToDir(path.join(this.getTargetDir(), 'src/main'), createAndroidManifestXml, this, 'AndroidManifest.xml.ejs', data);
         await RenderTemplate.renderTemplateToDir(path.join(this.getTargetDir(), 'src/main/res/values'), createStringsXml, this, 'strings.xml.ejs', data);
         await RenderTemplate.renderTemplateToDir(namespaceControllerDir, createConfiguration, this, 'configuration.java.ejs', data, 'Configuration.java');
diff --git a/lib/generator/angular.client/templates/entities.ts.ejs b/lib/generator/angular.client/templates/entities.ts.ejs
index 4ba2411..993c5aa 100644
--- a/lib/generator/angular.client/templates/entities.ts.ejs
+++ b/lib/generator/angular.client/templates/entities.ts.ejs
@@ -21,6 +21,6 @@ type.properties.forEach(function(prop){%><%
     %>: <%- prop.getMappedType('TypeScript')
     %><%if(prop.isArray) {%>[]<%}%>;<%
 }); %>
-};
+}
 
 <%}); %>
diff --git a/lib/generator/angular.client/templates/services.ts.ejs b/lib/generator/angular.client/templates/services.ts.ejs
index f7c38f9..9a63e49 100644
--- a/lib/generator/angular.client/templates/services.ts.ejs
+++ b/lib/generator/angular.client/templates/services.ts.ejs
@@ -132,16 +132,16 @@ if(method.hasParameterType('path')) {
             method.parameter.forEach(function(headerParam){
                 if(headerParam.in == 'header') {%>
         _headers.append('<%- headerParam.name%>', <%- headerParam.name%> ? encodeURI(<%- headerParam.name%>) : '');
-                <%}});%><%
+<%}});%><%
 }%><%   if(method.security == 'jwt') {%>
         _headers.append('x-access-token', Configuration.token);
-                %><%
+%><%
 }%>
         return this.__http.<%- method.verb%>(__url<%if(needBody) {%>, _body<%}%>, { headers: _headers } )
             .map((response: Response) => <<%- resultTypeHttp %>> ( <%
                     if(resultTypeIsPrimitive){
                         %><any>response.json()<%
-                    }else{
+                    } else {
                         %>response.json()<%}%> ))
             .catch((error: Response) => this.__errorreporter.handleError(error));
     }
diff --git a/package.json b/package.json
index 6287f7e..cb1e59a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nicassa-generator",
   "description": "CLI based code generator for Sequelize, Node, Typescript, Angular 2, Android, Swagger, ORM Lite",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "author": "Harald Fielker <harald.fielker@gmail.com>",
   "repository": {
     "type": "git",