raml2code - npm Package Compare versions

Comparing version 0.0.12 to 0.0.13

lib/generators/groovy/jaxrsInterface.js

@@ -40,9 +40,10 @@ var commonHelpers, dirname, fs, generator, path, template, util, _;
   });
-  data.extra["package"] = "" + data.extra["package"] + "." + data.version;
+  if (data.extra) {
+    data.extra["package"] = "" + data.extra["package"] + "." + data.version;
+    data.extra.importPojos = "" + data.extra.importPojos + "." + data.version;
+  }
   for (k in resourceGroup) {
     v = resourceGroup[k];
     model = {};
-    if (data.extra) {
-      model.extra = data.extra;
-    }
+    model.extra = data.extra;
     first = _.first(v);
@@ -49,0 +50,0 @@ model.uri = first.uri;

lib/generators/groovy/pojo.js

@@ -34,3 +34,5 @@ var commonHelpers, dirname, fs, generator, path, sanitize, template, util;
   parsed = [];
-  datos.extra["package"] = "" + datos.extra["package"] + "." + datos.version;
+  if (datos.extra) {
+    datos.extra["package"] = "" + datos.extra["package"] + "." + datos.version;
+  }
   _ref = datos.schemas;
@@ -57,5 +59,3 @@ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
       }
-      if (datos.extra) {
-        model.extra = datos.extra;
-      }
+      model.extra = datos.extra;
       parsed.push({
@@ -62,0 +62,0 @@ name: datos.version + "/" + util.capitalize("" + (sanitize(schemaName)) + ".groovy"),

lib/generators/groovy/retrofitClient.js

@@ -39,2 +39,3 @@ var commonHelpers, dirname, fs, generator, path, template, util;
   if (data.extra) {
+    data.extra.importPojos = "" + data.extra.importPojos + "." + data.version;
     model.extra = data.extra;
@@ -41,0 +42,0 @@ }

package.json

 {
   "name": "raml2code",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "Raml spec to code",
@@ -5,0 +5,0 @@ "main": "index.js",

src/generators/groovy/jaxrsInterface.coffee

@@ -28,6 +28,8 @@ fs = require('fs')
 
-  data.extra.package = "#{data.extra.package}.#{data.version}"
+  if data.extra
+    data.extra.package = "#{data.extra.package}.#{data.version}"
+    data.extra.importPojos = "#{data.extra.importPojos}.#{data.version}"
   for k,v of resourceGroup
     model = {}
-    model.extra = data.extra if data.extra
+    model.extra = data.extra
     first = _.first(v)
@@ -34,0 +36,0 @@ model.uri = first.uri

src/generators/groovy/pojo.coffee

@@ -22,3 +22,4 @@ fs = require('fs')
   parsed = []
-  datos.extra.package = "#{datos.extra.package}.#{datos.version}"
+  if datos.extra
+    datos.extra.package = "#{datos.extra.package}.#{datos.version}"
   for row in datos.schemas
@@ -39,3 +40,3 @@ for schemaName of row
         model.classMembers.push util.mapProperty(p, key)
-      model.extra = datos.extra if datos.extra
+      model.extra = datos.extra
       parsed.push {name: datos.version + "/" + util.capitalize("#{sanitize(schemaName)}.groovy") , model}
@@ -42,0 +43,0 @@ parsed

src/generators/groovy/retrofitClient.coffee

@@ -25,3 +25,5 @@ fs = require('fs')
   model.version = data.version
-  model.extra = data.extra if data.extra
+  if data.extra
+    data.extra.importPojos = "#{data.extra.importPojos}.#{data.version}"
+    model.extra = data.extra
 
@@ -28,0 +30,0 @@ model.className = data.title.split(" ").join("")

test/examples/GatitosApi.java

@@ -11,3 +11,3 @@ package org.gex.client;
 import rx.Observable;
-import com.pojos.*;
+import com.pojos.v1.*;
 
@@ -14,0 +14,0 @@

test/examples/GatitosResource.groovy

 package org.gex.v1
 import javax.ws.rs.*
 import javax.ws.rs.core.*
+import org.gex.dto.v1.*
 
-
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON
@@ -7,0 +7,0 @@

test/groovy/jasrxInterface-spec.js

@@ -14,3 +14,3 @@ var raml2code =require('../..');
     var gen = require("../../lib/generators/groovy/jaxrsInterface");
-    var raml2codeInstance = raml2code({generator:gen, extra: {package: 'org.gex'}});
+    var raml2codeInstance = raml2code({generator:gen, extra: {package: 'org.gex', importPojos: 'org.gex.dto'}});
     var ramlPath = path.join(__dirname, '../raml/cats.raml');
@@ -17,0 +17,0 @@ var examplePath = path.join(__dirname, '../examples/GatitosResource.groovy');

No alert changes

Improved metrics

Total package byte prevSize

35675

1.01%

Lines of code

665

0.3%

No dependency changes