Skip to content

Commit 2cff152

Browse files
ronreynoldsronreynolds
authored
adding Intellij style xml and applied to all java code (#20734)
* added intellij-codestyle.xml and sample of it being applied to some java code-gen classes * code-format changes ONLY * few more format changes since last merge with master * applied code-style to all java one last time
1 parent 3ad5303 commit 2cff152

File tree

481 files changed

+5575
-5761
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

481 files changed

+5575
-5761
lines changed

‎intellij-codestyle.xml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<code_scheme name="Project" version="173">
2+
<JavaCodeStyleSettings>
3+
<option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
4+
<option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION_IN_PARAMETER" value="true" />
5+
</JavaCodeStyleSettings>
6+
<codeStyleSettings language="JAVA">
7+
<option name="FIELD_ANNOTATION_WRAP" value="0" />
8+
</codeStyleSettings>
9+
</code_scheme>

‎modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/Constants.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package org.openapitools.codegen;
22

33
public class Constants {
4-
private Constants(){ }
4+
private Constants() {
5+
}
56

67
public static final String CLI_NAME = "openapi-generator-cli";
78
public static final String GIT_REPO = "https://github.com/openapitools/openapi-generator";

‎modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/AuthorTemplate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void execute() {
138138
} else {
139139
LOGGER.warn("The library filter '{}' extracted an unexpected library path: {}", library, p.toAbsolutePath());
140140
}
141-
});
141+
});
142142
}
143143

144144
LOGGER.info("Extracted templates to '{}' directory. Refer to https://openapi-generator.tech/docs/templating for customization details.", outputDirPath);

‎modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java

+20-24
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@
2020
import io.airlift.airline.Command;
2121
import io.airlift.airline.Option;
2222
import org.apache.commons.lang3.StringUtils;
23-
import org.openapitools.codegen.CliOption;
24-
import org.openapitools.codegen.CodegenConfig;
25-
import org.openapitools.codegen.CodegenConfigLoader;
26-
import org.openapitools.codegen.GeneratorNotFoundException;
27-
import org.openapitools.codegen.VendorExtension;
23+
import org.openapitools.codegen.*;
2824
import org.openapitools.codegen.meta.FeatureSet;
2925
import org.slf4j.Logger;
3026
import org.slf4j.LoggerFactory;
@@ -37,10 +33,10 @@
3733
import java.util.function.Function;
3834
import java.util.stream.Collectors;
3935

40-
import static org.apache.commons.text.StringEscapeUtils.escapeHtml4;
4136
import static org.apache.commons.lang3.StringUtils.isEmpty;
37+
import static org.apache.commons.text.StringEscapeUtils.escapeHtml4;
4238

43-
@SuppressWarnings({"unused","java:S106", "java:S1192"})
39+
@SuppressWarnings({"unused", "java:S106", "java:S1192"})
4440
@Command(name = "config-help", description = "Config help for chosen lang")
4541
public class ConfigHelp extends OpenApiGeneratorCommand {
4642

@@ -49,7 +45,7 @@ public class ConfigHelp extends OpenApiGeneratorCommand {
4945
private static final String FORMAT_TEXT = "text";
5046
private static final String FORMAT_MARKDOWN = "markdown";
5147
private static final String FORMAT_YAMLSAMPLE = "yamlsample";
52-
private static final int FEATURE_SET_DISPLAY_WIDTH= 20;
48+
private static final int FEATURE_SET_DISPLAY_WIDTH = 20;
5349

5450
@Option(name = {"-g",
5551
"--generator-name"}, title = "generator name", description = "generator to get config help for")
@@ -121,7 +117,7 @@ public class ConfigHelp extends OpenApiGeneratorCommand {
121117
private Boolean markdownHeader;
122118

123119
@Option(name = {
124-
"--supported-vendor-extensions"}, title = "supported vendor extensions", description = "List supported vendor extensions")
120+
"--supported-vendor-extensions"}, title = "supported vendor extensions", description = "List supported vendor extensions")
125121
private Boolean supportedVendorExtensions;
126122

127123
@Option(name = {"--full-details"}, title = "full generator details", description = "displays CLI options as well as other configs/mappings (implies --instantiation-types, --reserved-words, --language-specific-primitives, --import-mappings, --feature-set)")
@@ -241,16 +237,16 @@ private void generateMdSupportedVendorExtensions(StringBuilder sb, CodegenConfig
241237
}
242238

243239
sb
244-
.append(newline).append("## SUPPORTED VENDOR EXTENSIONS").append(newline).append(newline)
245-
.append("| Extension name | Description | Applicable for | Default value |").append(newline)
246-
.append("| -------------- | ----------- | -------------- | ------------- |").append(newline);
240+
.append(newline).append("## SUPPORTED VENDOR EXTENSIONS").append(newline).append(newline)
241+
.append("| Extension name | Description | Applicable for | Default value |").append(newline)
242+
.append("| -------------- | ----------- | -------------- | ------------- |").append(newline);
247243

248244
supportedVendorExtensions.forEach(
249-
extension -> sb.append("|").append(extension.getName())
250-
.append("|").append(extension.getDescription())
251-
.append("|").append(extension.getLevels().stream().map(Objects::toString).collect(Collectors.joining(", ")))
252-
.append("|").append(extension.getDefaultValue())
253-
.append(newline)
245+
extension -> sb.append("|").append(extension.getName())
246+
.append("|").append(extension.getDescription())
247+
.append("|").append(extension.getLevels().stream().map(Objects::toString).collect(Collectors.joining(", ")))
248+
.append("|").append(extension.getDefaultValue())
249+
.append(newline)
254250
);
255251
sb.append(newline);
256252
}
@@ -359,17 +355,17 @@ private void generateMdMetadata(StringBuilder sb, CodegenConfig config) {
359355

360356
sb.append("| Property | Value | Notes |").append(newline);
361357
sb.append("| -------- | ----- | ----- |").append(newline);
362-
sb.append("| generator name | "+config.getName()+" | pass this to the generate command after -g |").append(newline);
363-
sb.append("| generator stability | "+config.getGeneratorMetadata().getStability()+" | |").append(newline);
364-
sb.append("| generator type | "+config.getTag()+" | |").append(newline);
358+
sb.append("| generator name | " + config.getName() + " | pass this to the generate command after -g |").append(newline);
359+
sb.append("| generator stability | " + config.getGeneratorMetadata().getStability() + " | |").append(newline);
360+
sb.append("| generator type | " + config.getTag() + " | |").append(newline);
365361
if (config.generatorLanguage() != null) {
366-
sb.append("| generator language | "+config.generatorLanguage().toString()+" | |").append(newline);
362+
sb.append("| generator language | " + config.generatorLanguage().toString() + " | |").append(newline);
367363
}
368364
if (config.generatorLanguageVersion() != null) {
369-
sb.append("| generator language version | "+config.generatorLanguageVersion()+" | |").append(newline);
365+
sb.append("| generator language version | " + config.generatorLanguageVersion() + " | |").append(newline);
370366
}
371-
sb.append("| generator default templating engine | "+config.defaultTemplatingEngine()+" | |").append(newline);
372-
sb.append("| helpTxt | "+config.getHelp()+" | |").append(newline);
367+
sb.append("| generator default templating engine | " + config.defaultTemplatingEngine() + " | |").append(newline);
368+
sb.append("| helpTxt | " + config.getHelp() + " | |").append(newline);
373369

374370
sb.append(newline);
375371
}

‎modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@
1717

1818
package org.openapitools.codegen.cmd;
1919

20-
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
21-
import static org.openapitools.codegen.config.CodegenConfiguratorUtils.*;
22-
2320
import ch.qos.logback.classic.LoggerContext;
2421
import ch.qos.logback.core.spi.FilterAttachable;
2522
import io.airlift.airline.Command;
2623
import io.airlift.airline.Option;
27-
import java.io.File;
28-
import java.util.ArrayList;
29-
import java.util.List;
30-
import java.util.stream.Stream;
31-
3224
import org.apache.commons.lang3.StringUtils;
3325
import org.openapitools.codegen.*;
3426
import org.openapitools.codegen.config.CodegenConfigurator;
3527
import org.openapitools.codegen.config.MergedSpecBuilder;
3628
import org.slf4j.Logger;
3729
import org.slf4j.LoggerFactory;
3830

31+
import java.io.File;
32+
import java.util.ArrayList;
33+
import java.util.List;
34+
import java.util.stream.Stream;
35+
36+
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
37+
import static org.openapitools.codegen.config.CodegenConfiguratorUtils.*;
38+
3939
@SuppressWarnings({"java:S106"})
4040
@Command(name = "generate", description = "Generate code with the specified generator.")
4141
public class Generate extends OpenApiGeneratorCommand {
@@ -101,7 +101,7 @@ public class Generate extends OpenApiGeneratorCommand {
101101
+ "overwritten during the generation.")
102102
private Boolean skipOverwrite;
103103

104-
@Option(name = { "--dry-run" }, title = "Dry run",
104+
@Option(name = {"--dry-run"}, title = "Dry run",
105105
description = "Try things out and report on potential changes (without actually making changes).")
106106
private Boolean isDryRun;
107107

@@ -327,15 +327,15 @@ public class Generate extends OpenApiGeneratorCommand {
327327
private Boolean legacyDiscriminatorBehavior;
328328

329329
@Option(name = {"--minimal-update"},
330-
title = "Minimal update",
331-
description = "Only write output files that have changed.")
330+
title = "Minimal update",
331+
description = "Only write output files that have changed.")
332332
private Boolean minimalUpdate;
333333

334334
@Override
335335
public void execute() {
336336
if (StringUtils.isNotBlank(inputSpecRootDirectory)) {
337337
spec = new MergedSpecBuilder(inputSpecRootDirectory, StringUtils.isBlank(mergedFileName) ? "_merged_spec" : mergedFileName)
338-
.buildMergedSpec();
338+
.buildMergedSpec();
339339
System.out.println("Merge input spec would be used - " + spec);
340340
}
341341

‎modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/GenerateBatch.java

+12-14
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818

1919
import ch.qos.logback.classic.Level;
2020
import ch.qos.logback.classic.LoggerContext;
21-
2221
import com.fasterxml.jackson.core.JsonParser;
2322
import com.fasterxml.jackson.core.JsonToken;
2423
import com.fasterxml.jackson.databind.*;
2524
import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
2625
import com.fasterxml.jackson.databind.deser.std.DelegatingDeserializer;
2726
import com.fasterxml.jackson.databind.module.SimpleModule;
2827
import com.fasterxml.jackson.databind.util.TokenBuffer;
29-
3028
import io.airlift.airline.Arguments;
3129
import io.airlift.airline.Command;
3230
import io.airlift.airline.Option;
@@ -211,7 +209,7 @@ public void run() {
211209
ClientOptInput opts = configurator.toClientOptInput();
212210
CodegenConfig config = opts.getConfig();
213211
name = config.getName();
214-
212+
215213
Path target = Paths.get(config.getOutputDir());
216214
Path updated = rootDir.resolve(target);
217215
config.setOutputDir(updated.toString());
@@ -308,34 +306,34 @@ protected JsonDeserializer<?> newDelegatingInstance(JsonDeserializer<?> newDeleg
308306
public Object deserialize(JsonParser p, DeserializationContext ctx) throws IOException {
309307
ObjectMapper codec = (ObjectMapper) ctx.getParser().getCodec();
310308
TokenBuffer buffer = new TokenBuffer(p);
311-
309+
312310
recurse(buffer, p, codec, false);
313-
311+
314312
JsonParser newParser = buffer.asParser(codec);
315313
newParser.nextToken();
316-
314+
317315
return super.deserialize(newParser, ctx);
318316
}
319-
317+
320318
private void recurse(TokenBuffer buffer, JsonParser p, ObjectMapper codec, boolean skipOuterbraces) throws IOException {
321319
boolean firstToken = true;
322-
JsonToken token;
323-
320+
JsonToken token;
321+
324322
while ((token = p.nextToken()) != null) {
325323
String name = p.currentName();
326-
324+
327325
if (skipOuterbraces && firstToken && JsonToken.START_OBJECT.equals(token)) {
328326
continue;
329327
}
330-
328+
331329
if (skipOuterbraces && p.getParsingContext().inRoot() && JsonToken.END_OBJECT.equals(token)) {
332330
continue;
333331
}
334-
332+
335333
if (JsonToken.VALUE_NULL.equals(token)) {
336334
continue;
337335
}
338-
336+
339337
if (name != null && JsonToken.FIELD_NAME.equals(token) && name.startsWith(INCLUDE)) {
340338
p.nextToken();
341339
String fileName = p.getText();
@@ -348,7 +346,7 @@ private void recurse(TokenBuffer buffer, JsonParser p, ObjectMapper codec, boole
348346
} else {
349347
buffer.copyCurrentEvent(p);
350348
}
351-
349+
352350
firstToken = false;
353351
}
354352
}

‎modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package org.openapitools.codegen.cmd;
22

33
import com.google.common.base.Objects;
4-
54
import io.airlift.airline.Command;
65
import io.airlift.airline.Option;
7-
86
import org.apache.commons.lang3.StringUtils;
97
import org.openapitools.codegen.CodegenConfig;
108
import org.openapitools.codegen.CodegenConfigLoader;
@@ -20,18 +18,18 @@
2018
@Command(name = "list", description = "Lists the available generators")
2119
public class ListGenerators extends OpenApiGeneratorCommand {
2220

23-
@Option(name = {"-s", "--short" }, description = "shortened output (suitable for scripting)")
21+
@Option(name = {"-s", "--short"}, description = "shortened output (suitable for scripting)")
2422
private Boolean shortened = false;
2523

26-
@Option(name = {"-d", "--docsite" }, description = "format for docusaurus site output", hidden = true)
24+
@Option(name = {"-d", "--docsite"}, description = "format for docusaurus site output", hidden = true)
2725
private Boolean docusaurus = false;
2826

29-
@Option(name = {"--github-nested-index" }, description = "format for github index at docs/generators/README.md", hidden = true)
30-
private Boolean githubNestedIndex = false;
27+
@Option(name = {"--github-nested-index"}, description = "format for github index at docs/generators/README.md", hidden = true)
28+
private Boolean githubNestedIndex = false;
3129

32-
@Option(name = {"-i", "--include" },
30+
@Option(name = {"-i", "--include"},
3331
description = "comma-separated list of stability indexes to include (value: all,beta,stable,experimental,deprecated). Excludes deprecated by default.",
34-
allowedValues = { "all", "beta", "stable", "experimental", "deprecated" })
32+
allowedValues = {"all", "beta", "stable", "experimental", "deprecated"})
3533
private String include = "stable,beta,experimental";
3634

3735
@Override
@@ -88,7 +86,7 @@ private void appendForType(StringBuilder sb, CodegenType type, String typeName,
8886
.sorted(Comparator.comparing(CodegenConfig::getName))
8987
.collect(Collectors.toList());
9088

91-
if(!list.isEmpty()) {
89+
if (!list.isEmpty()) {
9290
if (docusaurus || githubNestedIndex) {
9391
sb.append("## ").append(typeName).append(" generators");
9492
} else {

‎modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Meta.java

+17-18
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717

1818
package org.openapitools.codegen.cmd;
1919

20-
import static ch.lambdaj.collection.LambdaCollections.with;
21-
import static com.google.common.base.Joiner.on;
22-
20+
import ch.lambdaj.function.convert.Converter;
2321
import com.google.common.base.CaseFormat;
2422
import com.google.common.collect.ImmutableList;
2523
import com.google.common.collect.ImmutableMap;
@@ -31,9 +29,9 @@
3129
import org.openapitools.codegen.SupportingFile;
3230
import org.openapitools.codegen.TemplateManager;
3331
import org.openapitools.codegen.api.TemplatePathLocator;
32+
import org.openapitools.codegen.templating.CommonTemplateContentLocator;
3433
import org.openapitools.codegen.templating.MustacheEngineAdapter;
3534
import org.openapitools.codegen.templating.TemplateManagerOptions;
36-
import org.openapitools.codegen.templating.CommonTemplateContentLocator;
3735
import org.slf4j.Logger;
3836
import org.slf4j.LoggerFactory;
3937

@@ -43,7 +41,8 @@
4341
import java.util.List;
4442
import java.util.Map;
4543

46-
import ch.lambdaj.function.convert.Converter;
44+
import static ch.lambdaj.collection.LambdaCollections.with;
45+
import static com.google.common.base.Joiner.on;
4746

4847
/**
4948
* User: lanwen Date: 24.03.15 Time: 20:22
@@ -99,19 +98,19 @@ public void execute() {
9998
new SupportingFile("kotlin/generatorClassTest.mustache", on(File.separator).join("src/test/kotlin", asPath(targetPackage)), mainClass.concat("Test.kt")),
10099
new SupportingFile("kotlin/README.mustache", "", "README.md"),
101100

102-
new SupportingFile("api.template", "src/main/resources" + File.separator + name,"api.mustache"),
103-
new SupportingFile("model.template", "src/main/resources" + File.separator + name,"model.mustache"),
101+
new SupportingFile("api.template", "src/main/resources" + File.separator + name, "api.mustache"),
102+
new SupportingFile("model.template", "src/main/resources" + File.separator + name, "model.mustache"),
104103
new SupportingFile("myFile.template", String.join(File.separator, "src", "main", "resources", name), "myFile.mustache"),
105104
new SupportingFile("services.mustache", "src/main/resources/META-INF/services", CodegenConfig.class.getCanonicalName()))
106105
: ImmutableList.of(
107-
new SupportingFile("pom.mustache", "", "pom.xml"),
108-
new SupportingFile("generatorClass.mustache", on(File.separator).join("src/main/java", asPath(targetPackage)), mainClass.concat(".java")),
109-
new SupportingFile("generatorClassTest.mustache", on(File.separator).join("src/test/java", asPath(targetPackage)), mainClass.concat("Test.java")),
110-
new SupportingFile("README.mustache", "", "README.md"),
111-
new SupportingFile("api.template", "src/main/resources" + File.separator + name,"api.mustache"),
112-
new SupportingFile("model.template", "src/main/resources" + File.separator + name,"model.mustache"),
113-
new SupportingFile("myFile.template", String.join(File.separator, "src", "main", "resources", name), "myFile.mustache"),
114-
new SupportingFile("services.mustache", "src/main/resources/META-INF/services", CodegenConfig.class.getCanonicalName()));
106+
new SupportingFile("pom.mustache", "", "pom.xml"),
107+
new SupportingFile("generatorClass.mustache", on(File.separator).join("src/main/java", asPath(targetPackage)), mainClass.concat(".java")),
108+
new SupportingFile("generatorClassTest.mustache", on(File.separator).join("src/test/java", asPath(targetPackage)), mainClass.concat("Test.java")),
109+
new SupportingFile("README.mustache", "", "README.md"),
110+
new SupportingFile("api.template", "src/main/resources" + File.separator + name, "api.mustache"),
111+
new SupportingFile("model.template", "src/main/resources" + File.separator + name, "model.mustache"),
112+
new SupportingFile("myFile.template", String.join(File.separator, "src", "main", "resources", name), "myFile.mustache"),
113+
new SupportingFile("services.mustache", "src/main/resources/META-INF/services", CodegenConfig.class.getCanonicalName()));
115114

116115
String currentVersion = buildInfo.getVersion();
117116

@@ -134,11 +133,11 @@ public void execute() {
134133
* destination directory
135134
*
136135
* @param targetDir - destination directory
137-
* @param data - map with additional params needed to process templates
136+
* @param data - map with additional params needed to process templates
138137
* @return converter object to pass to lambdaj
139138
*/
140139
private static Converter<SupportingFile, File> processFiles(final File targetDir,
141-
final Map<String, Object> data) {
140+
final Map<String, Object> data) {
142141
return support -> {
143142
try {
144143
File destinationFolder =
@@ -148,7 +147,7 @@ private static Converter<SupportingFile, File> processFiles(final File targetDir
148147
TemplateManager templateProcessor = new TemplateManager(
149148
new TemplateManagerOptions(false, false),
150149
new MustacheEngineAdapter(),
151-
new TemplatePathLocator[]{ new CommonTemplateContentLocator("codegen") }
150+
new TemplatePathLocator[]{new CommonTemplateContentLocator("codegen")}
152151
);
153152

154153
String template = templateProcessor.readTemplate(new File(TEMPLATE_DIR_CLASSPATH, support.getTemplateFile()).getPath());

0 commit comments

Comments
 (0)