Skip to content

Commit adafcb3

Browse files
committed
Fix NPE & use correct mime for plain text
1 parent 9164b28 commit adafcb3

File tree

1 file changed

+19
-59
lines changed

1 file changed

+19
-59
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

Lines changed: 19 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
package io.swagger.codegen;
22

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+
321
import javax.annotation.Nullable;
422
import java.io.File;
523
import java.io.IOException;
@@ -12,64 +30,6 @@
1230
import java.util.regex.Matcher;
1331
import java.util.regex.Pattern;
1432

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-
7333
public class DefaultCodegen {
7434
protected static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class);
7535

@@ -2313,7 +2273,7 @@ public CodegenOperation fromOperation(String path,
23132273
op.isResponseFile = Boolean.TRUE;
23142274
}
23152275
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
23172277
&& Boolean.TRUE.equals(r.isDefault)){
23182278
op.isResponseText = Boolean.TRUE;
23192279
}

0 commit comments

Comments
 (0)