Skip to content

Commit bee72ad

Browse files
raydacraydac
committed
code formatting
1 parent 084c6f3 commit bee72ad

File tree

142 files changed

+19112
-16188
lines changed

Some content is hidden

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

142 files changed

+19112
-16188
lines changed

‎README.md‎

Lines changed: 177 additions & 65 deletions
Large diffs are not rendered by default.

‎jbbp-plugins/jbbp-gradle/src/main/java/com/igormaznitsa/jbbp/plugin/gradle/AbstractJBBPTask.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
11
package com.igormaznitsa.jbbp.plugin.gradle;
22

33
import com.igormaznitsa.meta.common.utils.GetUtils;
4+
import java.io.File;
5+
import java.io.IOException;
6+
import java.util.HashSet;
7+
import java.util.Set;
8+
import javax.annotation.Nonnull;
9+
import javax.annotation.Nullable;
410
import org.apache.commons.io.FileUtils;
511
import org.gradle.api.DefaultTask;
612
import org.gradle.api.GradleException;
713
import org.gradle.api.file.FileVisitDetails;
814
import org.gradle.api.file.FileVisitor;
915
import org.gradle.api.tasks.TaskAction;
1016

11-
import javax.annotation.Nonnull;
12-
import javax.annotation.Nullable;
13-
import java.io.File;
14-
import java.io.IOException;
15-
import java.util.HashSet;
16-
import java.util.Set;
17-
1817
public abstract class AbstractJBBPTask extends DefaultTask {
1918

2019
public AbstractJBBPTask() {
2120
super();
2221
}
2322

2423
@Nullable
25-
public static String getTextOrFileContent(@Nonnull final JBBPExtension extension, @Nullable final String text, @Nullable final File file) {
24+
public static String getTextOrFileContent(@Nonnull final JBBPExtension extension,
25+
@Nullable final String text,
26+
@Nullable final File file) {
2627
String result = null;
2728
if (text != null) {
2829
result = text;
2930
} else if (file != null) {
3031
try {
31-
result = FileUtils.readFileToString(file, GetUtils.ensureNonNull(extension.inEncoding, "UTF-8"));
32+
result =
33+
FileUtils.readFileToString(file, GetUtils.ensureNonNull(extension.inEncoding, "UTF-8"));
3234
} catch (IOException ex) {
3335
throw new GradleException("Can't read file " + file, ex);
3436
}

‎jbbp-plugins/jbbp-gradle/src/main/java/com/igormaznitsa/jbbp/plugin/gradle/JBBPCleanTask.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.igormaznitsa.jbbp.plugin.gradle;
22

33
import com.igormaznitsa.jbbp.plugin.common.converters.JBBPScriptTranslator;
4-
import org.gradle.api.GradleException;
5-
6-
import javax.annotation.Nonnull;
74
import java.io.File;
85
import java.io.IOException;
6+
import javax.annotation.Nonnull;
7+
import org.gradle.api.GradleException;
98

109
/**
1110
* Task allows to delete generated files.

‎jbbp-plugins/jbbp-gradle/src/main/java/com/igormaznitsa/jbbp/plugin/gradle/JBBPGenerateTask.java‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ protected void doTaskAction(@Nonnull final JBBPExtension ext) {
5454
final String trimmed = s.trim();
5555
final String normalized = trimmed.toLowerCase(Locale.ENGLISH);
5656
if (!normalized.equals(trimmed)) {
57-
getLogger().warn(String.format("Custom type name '%s' in JBBP normal form is '%s' ", trimmed, normalized));
57+
getLogger().warn(String
58+
.format("Custom type name '%s' in JBBP normal form is '%s' ", trimmed, normalized));
5859
}
5960
normalizedCustomTypeNames.add(normalized);
6061
}
@@ -71,7 +72,9 @@ public String[] getCustomFieldTypes() {
7172
}
7273

7374
@Override
74-
public boolean isAllowed(@Nonnull final JBBPFieldTypeParameterContainer fieldType, @Nullable final String fieldName, final int extraData, final boolean isArray) {
75+
public boolean isAllowed(@Nonnull final JBBPFieldTypeParameterContainer fieldType,
76+
@Nullable final String fieldName, final int extraData,
77+
final boolean isArray) {
7578
final boolean result = normalizedCustomTypeNames.contains(fieldType.getTypeName());
7679
if (!result) {
7780
getLogger().warn("Detected not allowed custom type name : " + fieldType.getTypeName());
@@ -81,7 +84,14 @@ public boolean isAllowed(@Nonnull final JBBPFieldTypeParameterContainer fieldTyp
8184

8285
@Override
8386
@Nonnull
84-
public JBBPAbstractField readCustomFieldType(@Nonnull final JBBPBitInputStream in, @Nonnull final JBBPBitOrder bitOrder, final int parserFlags, @Nonnull final JBBPFieldTypeParameterContainer customTypeFieldInfo, @Nullable final JBBPNamedFieldInfo fieldName, final int extraData, final boolean readWholeStream, final int arrayLength) throws IOException {
87+
public JBBPAbstractField readCustomFieldType(@Nonnull final JBBPBitInputStream in,
88+
@Nonnull final JBBPBitOrder bitOrder,
89+
final int parserFlags, @Nonnull
90+
final JBBPFieldTypeParameterContainer customTypeFieldInfo,
91+
@Nullable final JBBPNamedFieldInfo fieldName,
92+
final int extraData,
93+
final boolean readWholeStream,
94+
final int arrayLength) throws IOException {
8595
throw new Error("Must not be called");
8696
}
8797
};
@@ -117,19 +127,25 @@ public JBBPAbstractField readCustomFieldType(@Nonnull final JBBPBitInputStream i
117127
final Set<File> files = target.getTranslator().translate(parameters, false);
118128
getLogger().debug("Converted " + aScript + " into " + files);
119129
for (final File f : files) {
120-
getLogger().info(String.format("JBBP script '%s' has been converted into '%s'", aScript.getName(), f.getName()));
130+
getLogger().info(String
131+
.format("JBBP script '%s' has been converted into '%s'", aScript.getName(),
132+
f.getName()));
121133
}
122134
} catch (IOException ex) {
123-
throw new GradleException("Error during JBBP script translation : " + aScript.getAbsolutePath(), ex);
135+
throw new GradleException(
136+
"Error during JBBP script translation : " + aScript.getAbsolutePath(), ex);
124137
}
125138
}
126139

127140

128141
if (this.addSource) {
129-
getLogger().debug("Registering path to java sources : " + Assertions.assertNotNull("Output must not be null", ext.output));
142+
getLogger().debug("Registering path to java sources : " +
143+
Assertions.assertNotNull("Output must not be null", ext.output));
130144
if (getProject().getPlugins().hasPlugin(JavaPlugin.class)) {
131-
final JavaPluginConvention javaPluginConvention = getProject().getConvention().getPlugin(JavaPluginConvention.class);
132-
final SourceSet main = javaPluginConvention.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
145+
final JavaPluginConvention javaPluginConvention =
146+
getProject().getConvention().getPlugin(JavaPluginConvention.class);
147+
final SourceSet main =
148+
javaPluginConvention.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
133149
main.getJava().srcDir(ext.output);
134150
getLogger().info("Source folder has been added into Java task : " + ext.output);
135151
} else {

‎jbbp-plugins/jbbp-gradle/src/main/java/com/igormaznitsa/jbbp/plugin/gradle/JBBPPlugin.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.igormaznitsa.jbbp.plugin.gradle;
22

3+
import javax.annotation.Nonnull;
34
import org.gradle.api.Plugin;
45
import org.gradle.api.Project;
56

6-
import javax.annotation.Nonnull;
7-
87
public class JBBPPlugin implements Plugin<Project> {
98

109
@Override

‎jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/jbbp-mvn-test-customvars/src/main/java/com/igormaznitsa/mvn/tst/VarCustomImpl.java‎

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,42 +27,69 @@
2727
import com.igormaznitsa.jbbp.model.JBBPFieldLong;
2828
import com.igormaznitsa.jbbp.model.JBBPFieldShort;
2929
import com.igormaznitsa.mvn.test.jbbp.VarCustom;
30-
3130
import java.io.IOException;
3231

3332
public class VarCustomImpl extends VarCustom {
3433

3534
@Override
36-
public JBBPAbstractField readCustomFieldType(Object sourceStruct, JBBPBitInputStream inStream, JBBPFieldTypeParameterContainer typeParameterContainer, JBBPNamedFieldInfo nullableNamedFieldInfo, int extraValue, boolean readWholeStream, int arraySize) throws IOException {
37-
return new JBBPFieldShort(nullableNamedFieldInfo, (short) inStream.readUnsignedShort(typeParameterContainer.getByteOrder()));
35+
public JBBPAbstractField readCustomFieldType(Object sourceStruct, JBBPBitInputStream inStream,
36+
JBBPFieldTypeParameterContainer typeParameterContainer,
37+
JBBPNamedFieldInfo nullableNamedFieldInfo,
38+
int extraValue, boolean readWholeStream,
39+
int arraySize) throws IOException {
40+
return new JBBPFieldShort(nullableNamedFieldInfo,
41+
(short) inStream.readUnsignedShort(typeParameterContainer.getByteOrder()));
3842
}
3943

4044
@Override
41-
public void writeCustomFieldType(Object sourceStruct, JBBPBitOutputStream outStream, JBBPAbstractField fieldValue, JBBPFieldTypeParameterContainer typeParameterContainer, JBBPNamedFieldInfo nullableNamedFieldInfo, int extraValue, boolean wholeArray, int arraySize) throws IOException {
42-
outStream.writeShort(((JBBPFieldShort) fieldValue).getAsInt(), typeParameterContainer.getByteOrder());
45+
public void writeCustomFieldType(Object sourceStruct, JBBPBitOutputStream outStream,
46+
JBBPAbstractField fieldValue,
47+
JBBPFieldTypeParameterContainer typeParameterContainer,
48+
JBBPNamedFieldInfo nullableNamedFieldInfo, int extraValue,
49+
boolean wholeArray, int arraySize) throws IOException {
50+
outStream.writeShort(((JBBPFieldShort) fieldValue).getAsInt(),
51+
typeParameterContainer.getByteOrder());
4352
}
4453

4554
@Override
46-
public JBBPAbstractField readVarField(Object sourceStruct, JBBPBitInputStream inStream, JBBPByteOrder byteOrder, JBBPNamedFieldInfo nullableNamedFieldInfo, int extraValue) throws IOException {
55+
public JBBPAbstractField readVarField(Object sourceStruct, JBBPBitInputStream inStream,
56+
JBBPByteOrder byteOrder,
57+
JBBPNamedFieldInfo nullableNamedFieldInfo, int extraValue)
58+
throws IOException {
4759
return new JBBPFieldLong(nullableNamedFieldInfo, inStream.readLong(byteOrder));
4860
}
4961

5062
@Override
51-
public JBBPAbstractArrayField<? extends JBBPAbstractField> readVarArray(Object sourceStruct, JBBPBitInputStream inStream, JBBPByteOrder byteOrder, JBBPNamedFieldInfo nullableNamedFieldInfo, int extraValue, boolean readWholeStream, int arraySize) throws IOException {
63+
public JBBPAbstractArrayField<? extends JBBPAbstractField> readVarArray(Object sourceStruct,
64+
JBBPBitInputStream inStream,
65+
JBBPByteOrder byteOrder,
66+
JBBPNamedFieldInfo nullableNamedFieldInfo,
67+
int extraValue,
68+
boolean readWholeStream,
69+
int arraySize)
70+
throws IOException {
5271
if (readWholeStream) {
5372
return new JBBPFieldArrayLong(nullableNamedFieldInfo, inStream.readLongArray(-1, byteOrder));
5473
} else {
55-
return new JBBPFieldArrayLong(nullableNamedFieldInfo, inStream.readLongArray(arraySize, byteOrder));
74+
return new JBBPFieldArrayLong(nullableNamedFieldInfo,
75+
inStream.readLongArray(arraySize, byteOrder));
5676
}
5777
}
5878

5979
@Override
60-
public void writeVarField(Object sourceStruct, JBBPAbstractField value, JBBPBitOutputStream outStream, JBBPByteOrder byteOrder, JBBPNamedFieldInfo nullableNamedFieldInfo, int extraValue) throws IOException {
80+
public void writeVarField(Object sourceStruct, JBBPAbstractField value,
81+
JBBPBitOutputStream outStream, JBBPByteOrder byteOrder,
82+
JBBPNamedFieldInfo nullableNamedFieldInfo, int extraValue)
83+
throws IOException {
6184
outStream.writeLong(((JBBPFieldLong) value).getAsLong(), byteOrder);
6285
}
6386

6487
@Override
65-
public void writeVarArray(Object sourceStruct, JBBPAbstractArrayField<? extends JBBPAbstractField> array, JBBPBitOutputStream outStream, JBBPByteOrder byteOrder, JBBPNamedFieldInfo nullableNamedFieldInfo, int extraValue, int arraySizeToWrite) throws IOException {
88+
public void writeVarArray(Object sourceStruct,
89+
JBBPAbstractArrayField<? extends JBBPAbstractField> array,
90+
JBBPBitOutputStream outStream, JBBPByteOrder byteOrder,
91+
JBBPNamedFieldInfo nullableNamedFieldInfo, int extraValue,
92+
int arraySizeToWrite) throws IOException {
6693
final JBBPFieldArrayLong a = (JBBPFieldArrayLong) array;
6794
if (arraySizeToWrite < 0) {
6895
for (final long l : a.getArray()) {

‎jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/jbbp-mvn-test-customvars/src/test/java/com/igormaznitsa/mvn/test/jbbp/VarCustomTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616

1717
package com.igormaznitsa.mvn.test.jbbp;
1818

19+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
20+
21+
1922
import com.igormaznitsa.jbbp.io.JBBPBitInputStream;
2023
import com.igormaznitsa.jbbp.io.JBBPBitOutputStream;
2124
import com.igormaznitsa.mvn.tst.VarCustomImpl;
22-
import org.junit.jupiter.api.Test;
23-
2425
import java.io.ByteArrayInputStream;
2526
import java.io.ByteArrayOutputStream;
2627
import java.util.Random;
27-
28-
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
28+
import org.junit.jupiter.api.Test;
2929

3030
public class VarCustomTest {
3131

‎jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/jbbp-mvn-test-genannotations-nonstatic/src/test/java/com/igormaznitsa/mvn/test/jbbp/GenAnnotationsNonStaticTest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ class GenAnnotationsNonStaticTest {
3232
void testReadWrite() throws IOException {
3333
final byte[] testData = new byte[] {4, (byte) 0x12, (byte) 0x34, 3, 5, 6, 7};
3434

35-
final GenAnnotationsNonStatic result = new GenAnnotationsNonStatic().read(new JBBPBitInputStream(new ByteArrayInputStream(testData)));
35+
final GenAnnotationsNonStatic result = new GenAnnotationsNonStatic()
36+
.read(new JBBPBitInputStream(new ByteArrayInputStream(testData)));
3637
assertEquals(4, result.getLEN());
3738
assertEquals(3, result.getSOME1().getSOME2().getFIELD().length);
3839

@@ -45,10 +46,12 @@ void testReadWrite() throws IOException {
4546
+ " }"
4647
+ "}";
4748

48-
final GenAnnotationsNonStatic instance = JBBPParser.prepare(script).parse(testData).mapTo(new GenAnnotationsNonStatic());
49+
final GenAnnotationsNonStatic instance =
50+
JBBPParser.prepare(script).parse(testData).mapTo(new GenAnnotationsNonStatic());
4951
assertEquals(result.getLEN(), instance.getLEN());
5052
assertEquals(result.getSOME1().getLEN(), instance.getSOME1().getLEN());
5153
assertArrayEquals(result.getSOME1().getSOMEFIELD(), instance.getSOME1().getSOMEFIELD());
52-
assertArrayEquals(result.getSOME1().getSOME2().getFIELD(), instance.getSOME1().getSOME2().getFIELD());
54+
assertArrayEquals(result.getSOME1().getSOME2().getFIELD(),
55+
instance.getSOME1().getSOME2().getFIELD());
5356
}
5457
}

‎jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/jbbp-mvn-test-genannotations/src/test/java/com/igormaznitsa/mvn/test/jbbp/GenAnnotationsTest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ class GenAnnotationsTest {
3232
void testReadWrite() throws IOException {
3333
final byte[] testData = new byte[] {4, (byte) 0x12, (byte) 0x34, 3, 5, 6, 7};
3434

35-
final GenAnnotations result = new GenAnnotations().read(new JBBPBitInputStream(new ByteArrayInputStream(testData)));
35+
final GenAnnotations result =
36+
new GenAnnotations().read(new JBBPBitInputStream(new ByteArrayInputStream(testData)));
3637
assertEquals(4, result.getLEN());
3738
assertEquals(3, result.getSOME1().getSOME2().getFIELD().length);
3839

@@ -45,10 +46,12 @@ void testReadWrite() throws IOException {
4546
+ " }"
4647
+ "}";
4748

48-
final GenAnnotations instance = JBBPParser.prepare(script).parse(testData).mapTo(new GenAnnotations());
49+
final GenAnnotations instance =
50+
JBBPParser.prepare(script).parse(testData).mapTo(new GenAnnotations());
4951
assertEquals(result.getLEN(), instance.getLEN());
5052
assertEquals(result.getSOME1().getLEN(), instance.getSOME1().getLEN());
5153
assertArrayEquals(result.getSOME1().getSOMEFIELD(), instance.getSOME1().getSOMEFIELD());
52-
assertArrayEquals(result.getSOME1().getSOME2().getFIELD(), instance.getSOME1().getSOME2().getFIELD());
54+
assertArrayEquals(result.getSOME1().getSOME2().getFIELD(),
55+
instance.getSOME1().getSOME2().getFIELD());
5356
}
5457
}

0 commit comments

Comments
 (0)