|
1 | 1 | package io.swagger.codegen; |
2 | 2 |
|
| 3 | +import com.google.common.base.Function; |
| 4 | +import com.google.common.collect.Lists; |
| 5 | +import com.samskivert.mustache.Mustache; |
| 6 | +import com.samskivert.mustache.Mustache.Compiler; |
| 7 | +import com.samskivert.mustache.Template; |
| 8 | +import io.swagger.codegen.examples.ExampleGenerator; |
| 9 | +import io.swagger.models.*; |
| 10 | +import io.swagger.models.auth.*; |
| 11 | +import io.swagger.models.parameters.*; |
| 12 | +import io.swagger.models.properties.*; |
| 13 | +import io.swagger.models.properties.PropertyBuilder.PropertyId; |
| 14 | +import io.swagger.util.Json; |
| 15 | +import org.apache.commons.lang3.ObjectUtils; |
| 16 | +import org.apache.commons.lang3.StringEscapeUtils; |
| 17 | +import org.apache.commons.lang3.StringUtils; |
| 18 | +import org.slf4j.Logger; |
| 19 | +import org.slf4j.LoggerFactory; |
| 20 | + |
3 | 21 | import javax.annotation.Nullable; |
4 | 22 | import java.io.File; |
5 | 23 | import java.io.IOException; |
|
12 | 30 | import java.util.regex.Matcher; |
13 | 31 | import java.util.regex.Pattern; |
14 | 32 |
|
15 | | -import com.samskivert.mustache.Mustache; |
16 | | -import com.samskivert.mustache.Template; |
17 | | -import io.swagger.models.properties.UntypedProperty; |
18 | | -import org.apache.commons.lang3.ObjectUtils; |
19 | | -import org.apache.commons.lang3.StringEscapeUtils; |
20 | | -import org.apache.commons.lang3.StringUtils; |
21 | | -import org.slf4j.Logger; |
22 | | -import org.slf4j.LoggerFactory; |
23 | | - |
24 | | -import com.google.common.base.Function; |
25 | | -import com.google.common.collect.Lists; |
26 | | -import com.samskivert.mustache.Mustache.Compiler; |
27 | | - |
28 | | -import io.swagger.codegen.examples.ExampleGenerator; |
29 | | -import io.swagger.models.ArrayModel; |
30 | | -import io.swagger.models.ComposedModel; |
31 | | -import io.swagger.models.Model; |
32 | | -import io.swagger.models.ModelImpl; |
33 | | -import io.swagger.models.Operation; |
34 | | -import io.swagger.models.RefModel; |
35 | | -import io.swagger.models.Response; |
36 | | -import io.swagger.models.Swagger; |
37 | | -import io.swagger.models.auth.ApiKeyAuthDefinition; |
38 | | -import io.swagger.models.auth.BasicAuthDefinition; |
39 | | -import io.swagger.models.auth.In; |
40 | | -import io.swagger.models.auth.OAuth2Definition; |
41 | | -import io.swagger.models.auth.SecuritySchemeDefinition; |
42 | | -import io.swagger.models.parameters.BodyParameter; |
43 | | -import io.swagger.models.parameters.CookieParameter; |
44 | | -import io.swagger.models.parameters.FormParameter; |
45 | | -import io.swagger.models.parameters.HeaderParameter; |
46 | | -import io.swagger.models.parameters.Parameter; |
47 | | -import io.swagger.models.parameters.PathParameter; |
48 | | -import io.swagger.models.parameters.QueryParameter; |
49 | | -import io.swagger.models.parameters.SerializableParameter; |
50 | | -import io.swagger.models.properties.AbstractNumericProperty; |
51 | | -import io.swagger.models.properties.ArrayProperty; |
52 | | -import io.swagger.models.properties.BaseIntegerProperty; |
53 | | -import io.swagger.models.properties.BinaryProperty; |
54 | | -import io.swagger.models.properties.BooleanProperty; |
55 | | -import io.swagger.models.properties.ByteArrayProperty; |
56 | | -import io.swagger.models.properties.DateProperty; |
57 | | -import io.swagger.models.properties.DateTimeProperty; |
58 | | -import io.swagger.models.properties.DecimalProperty; |
59 | | -import io.swagger.models.properties.DoubleProperty; |
60 | | -import io.swagger.models.properties.FileProperty; |
61 | | -import io.swagger.models.properties.FloatProperty; |
62 | | -import io.swagger.models.properties.IntegerProperty; |
63 | | -import io.swagger.models.properties.LongProperty; |
64 | | -import io.swagger.models.properties.MapProperty; |
65 | | -import io.swagger.models.properties.Property; |
66 | | -import io.swagger.models.properties.PropertyBuilder; |
67 | | -import io.swagger.models.properties.PropertyBuilder.PropertyId; |
68 | | -import io.swagger.models.properties.RefProperty; |
69 | | -import io.swagger.models.properties.StringProperty; |
70 | | -import io.swagger.models.properties.UUIDProperty; |
71 | | -import io.swagger.util.Json; |
72 | | - |
73 | 33 | public class DefaultCodegen { |
74 | 34 | protected static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class); |
75 | 35 |
|
@@ -2313,7 +2273,7 @@ public CodegenOperation fromOperation(String path, |
2313 | 2273 | op.isResponseFile = Boolean.TRUE; |
2314 | 2274 | } |
2315 | 2275 | if (Boolean.TRUE.equals(r.isString) |
2316 | | - && operation.getProduces().contains("plain/text") // otherwise if "application/json" => wrap text with "..", and escape |
| 2276 | + && operation.getProduces() != null && operation.getProduces().contains("text/plain") // otherwise if "application/json" => wrap text with "..", and escape |
2317 | 2277 | && Boolean.TRUE.equals(r.isDefault)){ |
2318 | 2278 | op.isResponseText = Boolean.TRUE; |
2319 | 2279 | } |
|
0 commit comments