Skip to content

Commit cab73e7

Browse files
joelittlejohnjoelittlejohn
committedFeb 28, 2021
Remove tabs
·
jsonschema2pojo-jdk-annotation-0.0.1jsonschema2pojo-1.1.0
1 parent e7754e1 commit cab73e7

File tree

15 files changed

+168
-168
lines changed

15 files changed

+168
-168
lines changed
 

‎jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/AbstractTypeInfoAwareAnnotator.java

+26-26
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,33 @@
2121

2222
public abstract class AbstractTypeInfoAwareAnnotator extends AbstractAnnotator
2323
{
24-
public AbstractTypeInfoAwareAnnotator(GenerationConfig generationConfig) {
25-
super(generationConfig);
26-
}
24+
public AbstractTypeInfoAwareAnnotator(GenerationConfig generationConfig) {
25+
super(generationConfig);
26+
}
2727

28-
@Override
29-
public void typeInfo(JDefinedClass clazz, JsonNode node) {
30-
if(getGenerationConfig().isIncludeTypeInfo()) {
31-
// Have per-schema JavaTypeInfo configuration override what is defined in generation config; backward comparability
32-
if (node.has("deserializationClassProperty")) {
33-
String annotationName = node.get("deserializationClassProperty").asText();
34-
addJsonTypeInfoAnnotation(clazz, annotationName);
35-
} else {
36-
addJsonTypeInfoAnnotation(clazz, "@class");
37-
}
38-
} else {
39-
// per-schema JsonTypeInfo configuration
40-
if (node.has("deserializationClassProperty")) {
41-
String annotationName = node.get("deserializationClassProperty").asText();
42-
addJsonTypeInfoAnnotation(clazz, annotationName);
43-
}
44-
}
45-
}
28+
@Override
29+
public void typeInfo(JDefinedClass clazz, JsonNode node) {
30+
if(getGenerationConfig().isIncludeTypeInfo()) {
31+
// Have per-schema JavaTypeInfo configuration override what is defined in generation config; backward comparability
32+
if (node.has("deserializationClassProperty")) {
33+
String annotationName = node.get("deserializationClassProperty").asText();
34+
addJsonTypeInfoAnnotation(clazz, annotationName);
35+
} else {
36+
addJsonTypeInfoAnnotation(clazz, "@class");
37+
}
38+
} else {
39+
// per-schema JsonTypeInfo configuration
40+
if (node.has("deserializationClassProperty")) {
41+
String annotationName = node.get("deserializationClassProperty").asText();
42+
addJsonTypeInfoAnnotation(clazz, annotationName);
43+
}
44+
}
45+
}
4646

47-
@Override
48-
public boolean isPolymorphicDeserializationSupported(JsonNode node) {
49-
return getGenerationConfig().isIncludeTypeInfo() || node.has("deserializationClassProperty");
50-
}
47+
@Override
48+
public boolean isPolymorphicDeserializationSupported(JsonNode node) {
49+
return getGenerationConfig().isIncludeTypeInfo() || node.has("deserializationClassProperty");
50+
}
5151

52-
abstract protected void addJsonTypeInfoAnnotation(JDefinedClass clazz, String propertyName);
52+
abstract protected void addJsonTypeInfoAnnotation(JDefinedClass clazz, String propertyName);
5353
}

‎jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/Annotator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,5 +210,5 @@ public interface Annotator {
210210

211211
void additionalPropertiesField(JFieldVar field, JDefinedClass clazz, String propertyName);
212212

213-
boolean isPolymorphicDeserializationSupported(JsonNode node);
213+
boolean isPolymorphicDeserializationSupported(JsonNode node);
214214
}

‎jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/ContentResolver.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ public class ContentResolver {
4242
private final ObjectMapper objectMapper;
4343

4444
public ContentResolver() {
45-
this(null);
46-
}
45+
this(null);
46+
}
4747

4848
public ContentResolver(JsonFactory jsonFactory) {
49-
this.objectMapper = new ObjectMapper(jsonFactory)
49+
this.objectMapper = new ObjectMapper(jsonFactory)
5050
.enable(JsonParser.Feature.ALLOW_COMMENTS)
5151
.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS);
52-
}
52+
}
5353

5454
/**
5555
* Resolve a given URI to read its contents and parse the result as JSON.

‎jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/GenerationConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public interface GenerationConfig {
5252
*/
5353
boolean isIncludeTypeInfo();
5454

55-
/**
55+
/**
5656
* Gets the 'includeConstructorPropertiesAnnotation' configuration option.
5757
*
5858
* @return whether to include JDK Constructor Properties. Used by serialization libraries to get parameter names of constructors at runtime. (Not Available on Android)

‎jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/Jsonschema2Pojo.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ public static void generate(GenerationConfig config, RuleLogger logger) throws I
9090
}
9191

9292
private static ContentResolver createContentResolver(GenerationConfig config) {
93-
if (config.getSourceType() == SourceType.YAMLSCHEMA || config.getSourceType() == SourceType.YAML) {
94-
return new ContentResolver(new YAMLFactory());
95-
} else {
96-
return new ContentResolver();
97-
}
93+
if (config.getSourceType() == SourceType.YAMLSCHEMA || config.getSourceType() == SourceType.YAML) {
94+
return new ContentResolver(new YAMLFactory());
95+
} else {
96+
return new ContentResolver();
97+
}
9898
}
9999

100100
private static SchemaGenerator createSchemaGenerator(GenerationConfig config) {

‎jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/RuleLogger.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@
1818

1919
public interface RuleLogger
2020
{
21-
void debug(String msg);
21+
void debug(String msg);
2222

23-
void error(String msg);
23+
void error(String msg);
2424

25-
void error(String s, Throwable e);
25+
void error(String s, Throwable e);
2626

27-
void info(String msg);
27+
void info(String msg);
2828

29-
boolean isDebugEnabled();
29+
boolean isDebugEnabled();
3030

31-
boolean isErrorEnabled();
31+
boolean isErrorEnabled();
3232

33-
boolean isInfoEnabled();
33+
boolean isInfoEnabled();
3434

35-
boolean isTraceEnabled();
35+
boolean isTraceEnabled();
3636

37-
boolean isWarnEnabled();
37+
boolean isWarnEnabled();
3838

39-
void trace(String msg);
39+
void trace(String msg);
4040

41-
void warn(String s, Throwable e);
41+
void warn(String s, Throwable e);
4242

43-
void warn(String msg);
43+
void warn(String msg);
4444
}

‎jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/SchemaStore.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ public class SchemaStore {
3333
protected final ContentResolver contentResolver;
3434

3535
public SchemaStore() {
36-
this.contentResolver = new ContentResolver();
37-
}
36+
this.contentResolver = new ContentResolver();
37+
}
3838

3939
public SchemaStore(ContentResolver contentResolver) {
40-
this.contentResolver = contentResolver;
41-
}
40+
this.contentResolver = contentResolver;
41+
}
4242

43-
/**
43+
/**
4444
* Create or look up a new schema which has the given ID and read the
4545
* contents of the given ID as a URL. If a schema with the given ID is
4646
* already known, then a reference to the original schema will be returned.

‎jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/model/EnumDefinitionExtensionType.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@
1818

1919
public enum EnumDefinitionExtensionType {
2020

21-
/**
22-
* Enum defined just by JSON Schema
23-
*/
24-
NONE,
21+
/**
22+
* Enum defined just by JSON Schema
23+
*/
24+
NONE,
2525

26-
/**
27-
* Enum defined by JSON Schema and javaEnumNames jsonschema2pojo extension.
28-
*/
29-
JAVA_ENUM_NAMES,
26+
/**
27+
* Enum defined by JSON Schema and javaEnumNames jsonschema2pojo extension.
28+
*/
29+
JAVA_ENUM_NAMES,
3030

31-
/**
32-
* Enum defined by JSON Schema and javaEnums jsonschema2pojo extension.
33-
*/
34-
JAVA_ENUMS,
31+
/**
32+
* Enum defined by JSON Schema and javaEnums jsonschema2pojo extension.
33+
*/
34+
JAVA_ENUMS,
3535

36-
/**
37-
* Enum defined by JSON Schema and a custom jsonschema2pojo extension,
36+
/**
37+
* Enum defined by JSON Schema and a custom jsonschema2pojo extension,
3838
* defined by custom {@link org.jsonschema2pojo.rules.EnumRule} implementation provided by custom {@link org.jsonschema2pojo.rules.RuleFactory}.
39-
*/
40-
CUSTOM
39+
*/
40+
CUSTOM
4141
}

‎jsonschema2pojo-core/src/test/java/org/jsonschema2pojo/rules/FormatRuleArraysTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static Collection<Object[]> data() {
5353
}
5454

5555
public FormatRuleArraysTest(String formatValue, Class<?> expectedType) {
56-
this.formatValue = formatValue;
56+
this.formatValue = formatValue;
5757
this.expectedType = expectedType;
5858

5959
when(config.getFormatTypeMapping()).thenReturn(Collections.singletonMap("test", formatValue));

‎jsonschema2pojo-core/src/test/java/org/jsonschema2pojo/util/MakeUniqueClassNameTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323

2424
public class MakeUniqueClassNameTest {
2525

26-
@Test
27-
public void testClassNameStrategy() {
28-
assertThat(MakeUniqueClassName.makeUnique("NodeMode"), equalTo("NodeMode__1"));
29-
assertThat(MakeUniqueClassName.makeUnique("NodeMode__5"), equalTo("NodeMode__6"));
30-
assertThat(MakeUniqueClassName.makeUnique("NodeMode__10"), equalTo("NodeMode__11"));
31-
assertThat(MakeUniqueClassName.makeUnique("NodeMode__100"), equalTo("NodeMode__101"));
32-
}
26+
@Test
27+
public void testClassNameStrategy() {
28+
assertThat(MakeUniqueClassName.makeUnique("NodeMode"), equalTo("NodeMode__1"));
29+
assertThat(MakeUniqueClassName.makeUnique("NodeMode__5"), equalTo("NodeMode__6"));
30+
assertThat(MakeUniqueClassName.makeUnique("NodeMode__10"), equalTo("NodeMode__11"));
31+
assertThat(MakeUniqueClassName.makeUnique("NodeMode__100"), equalTo("NodeMode__101"));
32+
}
3333

3434
}

‎jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/PolymorphicIT.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ public void extendsWithPolymorphicDeserializationWithDefaultAnnotationStyle() th
5454
assertNotNull(supertype.getAnnotation(JsonTypeInfo.class));
5555
}
5656

57-
@Test
58-
public void extendsWithPolymorphicDeserializationWithJackson2() throws ClassNotFoundException {
57+
@Test
58+
public void extendsWithPolymorphicDeserializationWithJackson2() throws ClassNotFoundException {
5959

60-
ClassLoader resultsClassLoader = schemaRule.generateAndCompile("/schema/polymorphic/extendsSchema.json", "com.example",
61-
config("annotationStyle", "JACKSON2"));
60+
ClassLoader resultsClassLoader = schemaRule.generateAndCompile("/schema/polymorphic/extendsSchema.json", "com.example",
61+
config("annotationStyle", "JACKSON2"));
6262

63-
Class<?> subtype = resultsClassLoader.loadClass("com.example.ExtendsSchema");
64-
Class<?> supertype = subtype.getSuperclass();
63+
Class<?> subtype = resultsClassLoader.loadClass("com.example.ExtendsSchema");
64+
Class<?> supertype = subtype.getSuperclass();
6565

66-
assertNotNull(supertype.getAnnotation(JsonTypeInfo.class));
67-
}
66+
assertNotNull(supertype.getAnnotation(JsonTypeInfo.class));
67+
}
6868
}

‎jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/config/IncludeTypeInfoIT.java

+64-64
Original file line numberDiff line numberDiff line change
@@ -29,94 +29,94 @@
2929

3030
public class IncludeTypeInfoIT
3131
{
32-
@Rule
33-
public Jsonschema2PojoRule schemaRule = new Jsonschema2PojoRule();
32+
@Rule
33+
public Jsonschema2PojoRule schemaRule = new Jsonschema2PojoRule();
3434

35-
@Test
36-
public void defaultConfig() throws ClassNotFoundException
37-
{
35+
@Test
36+
public void defaultConfig() throws ClassNotFoundException
37+
{
3838

39-
ClassLoader classLoader = schemaRule.generateAndCompile("/schema/typeInfo/typeInfo.json", "com.example");
39+
ClassLoader classLoader = schemaRule.generateAndCompile("/schema/typeInfo/typeInfo.json", "com.example");
4040

41-
Class<?> classWithTypeInfo = classLoader.loadClass("com.example.TypeInfo");
41+
Class<?> classWithTypeInfo = classLoader.loadClass("com.example.TypeInfo");
4242

43-
assertNull(classWithTypeInfo.getAnnotation(JsonTypeInfo.class));
44-
}
43+
assertNull(classWithTypeInfo.getAnnotation(JsonTypeInfo.class));
44+
}
4545

46-
@Test
47-
public void defaultWithSchemaProperty() throws ClassNotFoundException
48-
{
46+
@Test
47+
public void defaultWithSchemaProperty() throws ClassNotFoundException
48+
{
4949

50-
ClassLoader classLoader = schemaRule.generateAndCompile("/schema/typeInfo/typeInfoWithSchemaProperty.json", "com.example");
50+
ClassLoader classLoader = schemaRule.generateAndCompile("/schema/typeInfo/typeInfoWithSchemaProperty.json", "com.example");
5151

52-
Class<?> classWithTypeInfo = classLoader.loadClass("com.example.TypeInfoWithSchemaProperty");
52+
Class<?> classWithTypeInfo = classLoader.loadClass("com.example.TypeInfoWithSchemaProperty");
5353

54-
assertNotNull(classWithTypeInfo.getAnnotation(JsonTypeInfo.class));
54+
assertNotNull(classWithTypeInfo.getAnnotation(JsonTypeInfo.class));
5555

56-
JsonTypeInfo jsonTypeInfo = classWithTypeInfo.getAnnotation(JsonTypeInfo.class);
57-
assertThat(jsonTypeInfo.use(), is(JsonTypeInfo.Id.CLASS));
58-
assertThat(jsonTypeInfo.include(), is(JsonTypeInfo.As.PROPERTY));
59-
assertThat(jsonTypeInfo.property(), is("@clazz"));
60-
}
56+
JsonTypeInfo jsonTypeInfo = classWithTypeInfo.getAnnotation(JsonTypeInfo.class);
57+
assertThat(jsonTypeInfo.use(), is(JsonTypeInfo.Id.CLASS));
58+
assertThat(jsonTypeInfo.include(), is(JsonTypeInfo.As.PROPERTY));
59+
assertThat(jsonTypeInfo.property(), is("@clazz"));
60+
}
6161

62-
@Test
63-
public void disabled() throws ClassNotFoundException
64-
{
62+
@Test
63+
public void disabled() throws ClassNotFoundException
64+
{
6565

66-
ClassLoader classLoader = schemaRule.generateAndCompile("/schema/typeInfo/typeInfo.json", "com.example",
67-
config("includeTypeInfo", false));
66+
ClassLoader classLoader = schemaRule.generateAndCompile("/schema/typeInfo/typeInfo.json", "com.example",
67+
config("includeTypeInfo", false));
6868

69-
Class<?> classWithTypeInfo = classLoader.loadClass("com.example.TypeInfo");
69+
Class<?> classWithTypeInfo = classLoader.loadClass("com.example.TypeInfo");
7070

71-
assertNull(classWithTypeInfo.getAnnotation(JsonTypeInfo.class));
72-
}
71+
assertNull(classWithTypeInfo.getAnnotation(JsonTypeInfo.class));
72+
}
7373

74-
@Test
75-
public void disabledWithSchemaProperty() throws ClassNotFoundException
76-
{
74+
@Test
75+
public void disabledWithSchemaProperty() throws ClassNotFoundException
76+
{
7777

78-
ClassLoader classLoader = schemaRule.generateAndCompile("/schema/typeInfo/typeInfoWithSchemaProperty.json", "com.example",
79-
config("includeTypeInfo", false));
80-
Class<?> classWithTypeInfo = classLoader.loadClass("com.example.TypeInfoWithSchemaProperty");
78+
ClassLoader classLoader = schemaRule.generateAndCompile("/schema/typeInfo/typeInfoWithSchemaProperty.json", "com.example",
79+
config("includeTypeInfo", false));
80+
Class<?> classWithTypeInfo = classLoader.loadClass("com.example.TypeInfoWithSchemaProperty");
8181

82-
assertNotNull(classWithTypeInfo.getAnnotation(JsonTypeInfo.class));
82+
assertNotNull(classWithTypeInfo.getAnnotation(JsonTypeInfo.class));
8383

84-
JsonTypeInfo jsonTypeInfo = classWithTypeInfo.getAnnotation(JsonTypeInfo.class);
85-
assertThat(jsonTypeInfo.use(), is(JsonTypeInfo.Id.CLASS));
86-
assertThat(jsonTypeInfo.include(), is(JsonTypeInfo.As.PROPERTY));
87-
assertThat(jsonTypeInfo.property(), is("@clazz"));
88-
}
84+
JsonTypeInfo jsonTypeInfo = classWithTypeInfo.getAnnotation(JsonTypeInfo.class);
85+
assertThat(jsonTypeInfo.use(), is(JsonTypeInfo.Id.CLASS));
86+
assertThat(jsonTypeInfo.include(), is(JsonTypeInfo.As.PROPERTY));
87+
assertThat(jsonTypeInfo.property(), is("@clazz"));
88+
}
8989

90-
@Test
91-
public void enabled() throws ClassNotFoundException
92-
{
90+
@Test
91+
public void enabled() throws ClassNotFoundException
92+
{
9393

94-
ClassLoader classLoader = schemaRule.generateAndCompile("/schema/typeInfo/typeInfo.json", "com.example",
95-
config("includeTypeInfo", true));
94+
ClassLoader classLoader = schemaRule.generateAndCompile("/schema/typeInfo/typeInfo.json", "com.example",
95+
config("includeTypeInfo", true));
9696

97-
Class<?> classWithTypeInfo = classLoader.loadClass("com.example.TypeInfo");
97+
Class<?> classWithTypeInfo = classLoader.loadClass("com.example.TypeInfo");
9898

99-
assertNotNull(classWithTypeInfo.getAnnotation(JsonTypeInfo.class));
99+
assertNotNull(classWithTypeInfo.getAnnotation(JsonTypeInfo.class));
100100

101-
JsonTypeInfo jsonTypeInfo = classWithTypeInfo.getAnnotation(JsonTypeInfo.class);
102-
assertThat(jsonTypeInfo.use(), is(JsonTypeInfo.Id.CLASS));
103-
assertThat(jsonTypeInfo.include(), is(JsonTypeInfo.As.PROPERTY));
104-
assertThat(jsonTypeInfo.property(), is("@class"));
105-
}
101+
JsonTypeInfo jsonTypeInfo = classWithTypeInfo.getAnnotation(JsonTypeInfo.class);
102+
assertThat(jsonTypeInfo.use(), is(JsonTypeInfo.Id.CLASS));
103+
assertThat(jsonTypeInfo.include(), is(JsonTypeInfo.As.PROPERTY));
104+
assertThat(jsonTypeInfo.property(), is("@class"));
105+
}
106106

107-
@Test
108-
public void enabledWithSchemaProperty() throws ClassNotFoundException
109-
{
107+
@Test
108+
public void enabledWithSchemaProperty() throws ClassNotFoundException
109+
{
110110

111-
ClassLoader classLoader = schemaRule.generateAndCompile("/schema/typeInfo/typeInfoWithSchemaProperty.json", "com.example",
112-
config("includeTypeInfo", true));
113-
Class<?> classWithTypeInfo = classLoader.loadClass("com.example.TypeInfoWithSchemaProperty");
111+
ClassLoader classLoader = schemaRule.generateAndCompile("/schema/typeInfo/typeInfoWithSchemaProperty.json", "com.example",
112+
config("includeTypeInfo", true));
113+
Class<?> classWithTypeInfo = classLoader.loadClass("com.example.TypeInfoWithSchemaProperty");
114114

115-
assertNotNull(classWithTypeInfo.getAnnotation(JsonTypeInfo.class));
115+
assertNotNull(classWithTypeInfo.getAnnotation(JsonTypeInfo.class));
116116

117-
JsonTypeInfo jsonTypeInfo = classWithTypeInfo.getAnnotation(JsonTypeInfo.class);
118-
assertThat(jsonTypeInfo.use(), is(JsonTypeInfo.Id.CLASS));
119-
assertThat(jsonTypeInfo.include(), is(JsonTypeInfo.As.PROPERTY));
120-
assertThat(jsonTypeInfo.property(), is("@clazz"));
121-
}
117+
JsonTypeInfo jsonTypeInfo = classWithTypeInfo.getAnnotation(JsonTypeInfo.class);
118+
assertThat(jsonTypeInfo.use(), is(JsonTypeInfo.Id.CLASS));
119+
assertThat(jsonTypeInfo.include(), is(JsonTypeInfo.As.PROPERTY));
120+
assertThat(jsonTypeInfo.property(), is("@clazz"));
121+
}
122122
}

‎jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/yaml/YamlPropertiesIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import com.fasterxml.jackson.databind.ObjectMapper;
3535

3636
public class YamlPropertiesIT {
37-
37+
3838
@Rule public Jsonschema2PojoRule schemaRule = new Jsonschema2PojoRule();
3939

4040
private final ObjectMapper mapper = new ObjectMapper();

‎jsonschema2pojo-upload-release

+6-6
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ pushd $WORKING_DIR
9797

9898
# clone wiki to update version references
9999
if [[ ! -z $OLD_VERSION ]]; then
100-
git clone git@github.com:joelittlejohn/jsonschema2pojo.wiki.git wiki
101-
pushd wiki
100+
git clone git@github.com:joelittlejohn/jsonschema2pojo.wiki.git wiki
101+
pushd wiki
102102

103103
# replace any references to old version with new version
104104
sed -i "s/$OLD_VERSION/$VERSION/g" *.md
@@ -123,19 +123,19 @@ pushd $WORKING_DIR
123123
git commit -m "[release] updating example code to $VERSION" || true
124124
git push origin master || true
125125

126-
popd
126+
popd
127127
fi
128128

129129
# clone main repo to update version references in the README.md
130130
if [[ ! -z $OLD_VERSION ]]; then
131-
git clone git@github.com:joelittlejohn/jsonschema2pojo.git main
132-
pushd main
131+
git clone git@github.com:joelittlejohn/jsonschema2pojo.git main
132+
pushd main
133133
sed -i "s/$OLD_VERSION/$VERSION/g" README.md
134134

135135
git add .
136136
git commit -m "[release] updating README.md for $VERSION"
137137
git push origin master
138-
popd
138+
popd
139139
fi
140140

141141
# upload to github

‎license-plugin-definition.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<additionalHeaders>
3-
<java_style>
4-
<firstLine>/**</firstLine>
5-
<beforeEachLine> * </beforeEachLine>
6-
<endLine> */EOL</endLine>
7-
<afterEachLine> </afterEachLine>
8-
<firstLineDetectionPattern>(\s|\t)*/\*.*$</firstLineDetectionPattern>
9-
<lastLineDetectionPattern>.*\*/(\s|\t)*$</lastLineDetectionPattern>
10-
<allowBlankLines>false</allowBlankLines>
11-
<isMultiline>true</isMultiline>
12-
<padLines>false</padLines>
13-
</java_style>
3+
<java_style>
4+
<firstLine>/**</firstLine>
5+
<beforeEachLine> * </beforeEachLine>
6+
<endLine> */EOL</endLine>
7+
<afterEachLine> </afterEachLine>
8+
<firstLineDetectionPattern>(\s|\t)*/\*.*$</firstLineDetectionPattern>
9+
<lastLineDetectionPattern>.*\*/(\s|\t)*$</lastLineDetectionPattern>
10+
<allowBlankLines>false</allowBlankLines>
11+
<isMultiline>true</isMultiline>
12+
<padLines>false</padLines>
13+
</java_style>
1414
</additionalHeaders>

0 commit comments

Comments
 (0)
Please sign in to comment.