@@ -140,11 +140,6 @@ public String toDefaultValue(Schema p) {
140
140
141
141
@ Override
142
142
public String getSchemaType (Schema p ) {
143
- // pants ... this is also used in the imports, so
144
- // we're getting stuff like this:
145
- //
146
- // import docstore.model.ujson.Value
147
- //
148
143
if (ModelUtils .isFreeFormObject (p )) {
149
144
// We're opinionated in this template to use ujson
150
145
return "Value" ;
@@ -287,25 +282,42 @@ public String toApiName(String name) {
287
282
288
283
@ Override
289
284
public String apiFilename (String templateName , String tag ) {
290
- String suffix = apiTemplateFiles ().get (templateName );
291
- String fn = toApiFilename (tag );
285
+
286
+ final String suffix = apiTemplateFiles ().get (templateName );
287
+ final String fn = toApiFilename (tag );
292
288
if (templateName .equals (ApiServiceTemplate )) {
293
- return apiFileFolder () + '/' + fn + suffix ;
289
+ return apiInterfaceFileFolder () + '/' + fn + suffix ;
290
+ }
291
+ return apiFileFolder () + '/' + fn + "Routes" + suffix ;
292
+ }
293
+ @ Override
294
+ public String modelFilename (String templateName , String modelName ) {
295
+ final String defaultFilename = super .modelFilename (templateName , modelName );
296
+ if (templateName .equals (ApiServiceTemplate )) {
297
+ final String suffix = apiTemplateFiles ().get (templateName );
298
+ final String fn = toApiFilename (modelName );
299
+ final String path = modelFileFolder () + '/' + fn + suffix ;
300
+ return path ;
294
301
} else {
295
- return apiFileFolder () + '/' + fn + "Routes" + suffix ;
302
+ return defaultFilename ;
296
303
}
297
304
}
298
305
299
306
@ Override
300
307
public String apiFileFolder () {
301
- return outputFolder + "/jvm/" + sourceFolder + "/" + apiPackage ().replace ('.' , File .separatorChar );
308
+ final String folder = outputFolder + "/jvm/" + sourceFolder + "/" + apiPackage ().replace ('.' , File .separatorChar );;
309
+ return folder ;
302
310
}
303
311
304
312
@ Override
305
313
public String modelFileFolder () {
306
314
return outputFolder + "/shared/" + sourceFolder + "/" + modelPackage ().replace ('.' , File .separatorChar );
307
315
}
308
316
317
+ public String apiInterfaceFileFolder () {
318
+ return outputFolder + "/shared/" + sourceFolder + "/" + apiPackage ().replace ('.' , File .separatorChar );
319
+ }
320
+
309
321
static String capitalise (String p ) {
310
322
if (p .length () < 2 ) {
311
323
return p .toUpperCase (Locale .ROOT );
0 commit comments