[Java] Code tidy up after merge.

mjpt777 · mjpt777 · commit 23a995ce7000 · 2016-05-30T22:15:41.000+01:00
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/SbeTool.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/SbeTool.java
@@ -125,6 +125,7 @@ public class SbeTool
      * Package in which the generated Java interfaces will be placed.
      */
     public static final String JAVA_INTERFACE_PACKAGE = "org.agrona.sbe";
+
     /**
      * Default class to use as the buffer mutable implementation in generated code.
      */
@@ -153,7 +154,7 @@ public static void main(final String[] args) throws Exception
     {
         if (args.length == 0)
         {
-            System.err.format("Usage: %s <filenames>...\n", SbeTool.class.getName());
+            System.err.format("Usage: %s <filenames>...%n", SbeTool.class.getName());
             System.exit(-1);
         }
 
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
@@ -33,8 +33,8 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
-import static uk.co.real_logic.sbe.SbeTool.JAVA_INTERFACE_PACKAGE;
 
+import static uk.co.real_logic.sbe.SbeTool.JAVA_INTERFACE_PACKAGE;
 import static uk.co.real_logic.sbe.generation.java.JavaUtil.*;
 import static uk.co.real_logic.sbe.ir.GenerationUtil.*;
 
@@ -137,8 +137,8 @@ private void copyInterface(String simpleInterfaceName) throws IOException
         final Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8);
         try (final Writer out = interfaceOutputManager.createOutput(simpleInterfaceName))
         {
-            int bytes = 0;
-            final char[] buffer = new char[512];
+            int bytes;
+            final char[] buffer = new char[4096];
             while (-1 != (bytes = reader.read(buffer)))
             {
                 out.write(buffer, 0, bytes);
@@ -148,31 +148,30 @@ private void copyInterface(String simpleInterfaceName) throws IOException
 
     public void generateInterfaces() throws IOException
     {
-        if (!generateInterfaces)
+        if (generateInterfaces)
         {
-            return;
+            copyInterface(GEN_COMPOSITE_DECODER_FLYWEIGHT);
+            copyInterface(GEN_COMPOSITE_ENCODER_FLYWEIGHT);
+            copyInterface(GEN_COMPOSITE_STRUCTURE);
+            copyInterface(GEN_DECODER_FLYWEIGHT);
+            copyInterface(GEN_ENCODER_FLYWEIGHT);
+            copyInterface(GEN_FLYWEIGHT);
+            copyInterface(GEN_MESSAGE_DECODER_FLYWEIGHT);
+            copyInterface(GEN_MESSAGE_ENCODER_FLYWEIGHT);
+            copyInterface(GEN_MESSAGE_FLYWEIGHT);
+            copyInterface(GEN_MESSAGE_STRUCTURE);
+            copyInterface(GEN_STRUCTURE);
         }
-        copyInterface(GEN_COMPOSITE_DECODER_FLYWEIGHT);
-        copyInterface(GEN_COMPOSITE_ENCODER_FLYWEIGHT);
-        copyInterface(GEN_COMPOSITE_STRUCTURE);
-        copyInterface(GEN_DECODER_FLYWEIGHT);
-        copyInterface(GEN_ENCODER_FLYWEIGHT);
-        copyInterface(GEN_FLYWEIGHT);
-        copyInterface(GEN_MESSAGE_DECODER_FLYWEIGHT);
-        copyInterface(GEN_MESSAGE_ENCODER_FLYWEIGHT);
-        copyInterface(GEN_MESSAGE_FLYWEIGHT);
-        copyInterface(GEN_MESSAGE_STRUCTURE);
-        copyInterface(GEN_STRUCTURE);
     }
 
-    private String implementsInterface(String tokenName, String interfaceName)
+    private String implementsInterface(final String tokenName, final String interfaceName)
     {
         if (!generateInterfaces)
         {
             return "";
         }
-        final String structName = formatClassName(structureName(tokenName));
-        return String.format(" implements %s<%s>", interfaceName, structName);
+
+        return String.format(" implements %s<%s>", interfaceName, formatClassName(structureName(tokenName)));
     }
 
     public void generateMessageHeaderStub() throws IOException
@@ -201,6 +200,7 @@ private void generateMessageStructure(final Token msgToken) throws IOException
         {
             return;
         }
+
         final String structName = formatClassName(structureName(msgToken.name()));
         try (final Writer out = outputManager.createOutput(structName))
         {
@@ -1011,7 +1011,6 @@ private void generateBitSet(final List<Token> tokens) throws IOException
         {
             generateFixedFlyweightHeader(token, decoderName, out, readOnlyBuffer, fqReadOnlyBuffer, "");
             out.append(generateChoiceDecoders(messageBody));
-
             out.append("}\n");
         }
 
@@ -1025,7 +1024,11 @@ private void generateBitSet(final List<Token> tokens) throws IOException
     }
 
     private void generateFixedFlyweightHeader(
-        final Token token, final String encoderName, final Writer out, final String buffer, final String fqBuffer,
+        final Token token,
+        final String encoderName,
+        final Writer out,
+        final String buffer,
+        final String fqBuffer,
         final String implementsString) throws IOException
     {
         out.append(generateFileHeader(encoderName, ir.applicableNamespace(), fqBuffer));
@@ -1295,6 +1298,7 @@ private CharSequence interfaceImportLine(final String packageName)
         {
             return "\n";
         }
+
         return String.format("import %s.*;\n\n", JAVA_INTERFACE_PACKAGE);
     }
 
@@ -2224,8 +2228,8 @@ private CharSequence generateEnumEncoder(
             formatClassName(containingClassName),
             propertyName,
             enumName,
-            generatePut(encoding.primitiveType(), "offset + " + offset, "value.value()", byteOrderString(encoding))
-        );
+            generatePut(encoding.primitiveType(), "offset + " + offset, "value.value()", byteOrderString(encoding)
+        ));
     }
 
     private CharSequence generateBitSetProperty(
diff --git a/sbe-tool/src/main/resources/java/interfaces/CompositeDecoderFlyweight.java b/sbe-tool/src/main/resources/java/interfaces/CompositeDecoderFlyweight.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 - 2016 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.agrona.sbe;
 
 import org.agrona.DirectBuffer;
@@ -7,5 +22,5 @@
  */
 public interface CompositeDecoderFlyweight<T extends CompositeStructure> extends Flyweight<T>, DecoderFlyweight<T>
 {
-    CompositeDecoderFlyweight<T> wrap(final DirectBuffer buffer, final int offset);
+    CompositeDecoderFlyweight<T> wrap(DirectBuffer buffer, int offset);
 }
diff --git a/sbe-tool/src/main/resources/java/interfaces/CompositeEncoderFlyweight.java b/sbe-tool/src/main/resources/java/interfaces/CompositeEncoderFlyweight.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 - 2016 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.agrona.sbe;
 
 /**
diff --git a/sbe-tool/src/main/resources/java/interfaces/CompositeStructure.java b/sbe-tool/src/main/resources/java/interfaces/CompositeStructure.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 - 2016 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.agrona.sbe;
 
 /**
diff --git a/sbe-tool/src/main/resources/java/interfaces/DecoderFlyweight.java b/sbe-tool/src/main/resources/java/interfaces/DecoderFlyweight.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 - 2016 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.agrona.sbe;
 
 /**
diff --git a/sbe-tool/src/main/resources/java/interfaces/EncoderFlyweight.java b/sbe-tool/src/main/resources/java/interfaces/EncoderFlyweight.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 - 2016 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.agrona.sbe;
 
 import org.agrona.MutableDirectBuffer;
@@ -7,5 +22,5 @@
  */
 public interface EncoderFlyweight<T extends Structure> extends Flyweight<T>
 {
-    EncoderFlyweight<T> wrap(final MutableDirectBuffer buffer, final int offset);
+    EncoderFlyweight<T> wrap(MutableDirectBuffer buffer, int offset);
 }
diff --git a/sbe-tool/src/main/resources/java/interfaces/Flyweight.java b/sbe-tool/src/main/resources/java/interfaces/Flyweight.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 - 2016 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.agrona.sbe;
 
 /**
diff --git a/sbe-tool/src/main/resources/java/interfaces/MessageDecoderFlyweight.java b/sbe-tool/src/main/resources/java/interfaces/MessageDecoderFlyweight.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 - 2016 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.agrona.sbe;
 
 import org.agrona.DirectBuffer;
diff --git a/sbe-tool/src/main/resources/java/interfaces/MessageEncoderFlyweight.java b/sbe-tool/src/main/resources/java/interfaces/MessageEncoderFlyweight.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 - 2016 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.agrona.sbe;
 
 /**
diff --git a/sbe-tool/src/main/resources/java/interfaces/MessageFlyweight.java b/sbe-tool/src/main/resources/java/interfaces/MessageFlyweight.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 - 2016 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.agrona.sbe;
 
 /**
diff --git a/sbe-tool/src/main/resources/java/interfaces/MessageStructure.java b/sbe-tool/src/main/resources/java/interfaces/MessageStructure.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 - 2016 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.agrona.sbe;
 
 /**
diff --git a/sbe-tool/src/main/resources/java/interfaces/Structure.java b/sbe-tool/src/main/resources/java/interfaces/Structure.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 - 2016 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.agrona.sbe;
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ public class SbeTool`
`125`	`125`	`* Package in which the generated Java interfaces will be placed.`
`126`	`126`	`*/`
`127`	`127`	`public static final String JAVA_INTERFACE_PACKAGE = "org.agrona.sbe";`
	`128`	`+`
`128`	`129`	`/**`
`129`	`130`	`* Default class to use as the buffer mutable implementation in generated code.`
`130`	`131`	`*/`
`@@ -153,7 +154,7 @@ public static void main(final String[] args) throws Exception`
`153`	`154`	`{`
`154`	`155`	`if (args.length == 0)`
`155`	`156`	`{`
`156`		`- System.err.format("Usage: %s <filenames>...\n", SbeTool.class.getName());`
	`157`	`+ System.err.format("Usage: %s <filenames>...%n", SbeTool.class.getName());`
`157`	`158`	`System.exit(-1);`
`158`	`159`	`}`
`159`	`160`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@`
`33`	`33`	`import java.util.List;`
`34`	`34`	`import java.util.function.BiConsumer;`
`35`	`35`	`import java.util.function.Function;`
`36`		`-import static uk.co.real_logic.sbe.SbeTool.JAVA_INTERFACE_PACKAGE;`
`37`	`36`
	`37`	`+import static uk.co.real_logic.sbe.SbeTool.JAVA_INTERFACE_PACKAGE;`
`38`	`38`	`import static uk.co.real_logic.sbe.generation.java.JavaUtil.*;`
`39`	`39`	`import static uk.co.real_logic.sbe.ir.GenerationUtil.*;`
`40`	`40`
`@@ -137,8 +137,8 @@ private void copyInterface(String simpleInterfaceName) throws IOException`
`137`	`137`	`final Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8);`
`138`	`138`	`try (final Writer out = interfaceOutputManager.createOutput(simpleInterfaceName))`
`139`	`139`	`{`
`140`		`- int bytes = 0;`
`141`		`- final char[] buffer = new char[512];`
	`140`	`+ int bytes;`
	`141`	`+ final char[] buffer = new char[4096];`
`142`	`142`	`while (-1 != (bytes = reader.read(buffer)))`
`143`	`143`	`{`
`144`	`144`	`out.write(buffer, 0, bytes);`
`@@ -148,31 +148,30 @@ private void copyInterface(String simpleInterfaceName) throws IOException`
`148`	`148`
`149`	`149`	`public void generateInterfaces() throws IOException`
`150`	`150`	`{`
`151`		`- if (!generateInterfaces)`
	`151`	`+ if (generateInterfaces)`
`152`	`152`	`{`
`153`		`- return;`
	`153`	`+ copyInterface(GEN_COMPOSITE_DECODER_FLYWEIGHT);`
	`154`	`+ copyInterface(GEN_COMPOSITE_ENCODER_FLYWEIGHT);`
	`155`	`+ copyInterface(GEN_COMPOSITE_STRUCTURE);`
	`156`	`+ copyInterface(GEN_DECODER_FLYWEIGHT);`
	`157`	`+ copyInterface(GEN_ENCODER_FLYWEIGHT);`
	`158`	`+ copyInterface(GEN_FLYWEIGHT);`
	`159`	`+ copyInterface(GEN_MESSAGE_DECODER_FLYWEIGHT);`
	`160`	`+ copyInterface(GEN_MESSAGE_ENCODER_FLYWEIGHT);`
	`161`	`+ copyInterface(GEN_MESSAGE_FLYWEIGHT);`
	`162`	`+ copyInterface(GEN_MESSAGE_STRUCTURE);`
	`163`	`+ copyInterface(GEN_STRUCTURE);`
`154`	`164`	`}`
`155`		`- copyInterface(GEN_COMPOSITE_DECODER_FLYWEIGHT);`
`156`		`- copyInterface(GEN_COMPOSITE_ENCODER_FLYWEIGHT);`
`157`		`- copyInterface(GEN_COMPOSITE_STRUCTURE);`
`158`		`- copyInterface(GEN_DECODER_FLYWEIGHT);`
`159`		`- copyInterface(GEN_ENCODER_FLYWEIGHT);`
`160`		`- copyInterface(GEN_FLYWEIGHT);`
`161`		`- copyInterface(GEN_MESSAGE_DECODER_FLYWEIGHT);`
`162`		`- copyInterface(GEN_MESSAGE_ENCODER_FLYWEIGHT);`
`163`		`- copyInterface(GEN_MESSAGE_FLYWEIGHT);`
`164`		`- copyInterface(GEN_MESSAGE_STRUCTURE);`
`165`		`- copyInterface(GEN_STRUCTURE);`
`166`	`165`	`}`
`167`	`166`
`168`		`- private String implementsInterface(String tokenName, String interfaceName)`
	`167`	`+ private String implementsInterface(final String tokenName, final String interfaceName)`
`169`	`168`	`{`
`170`	`169`	`if (!generateInterfaces)`
`171`	`170`	`{`
`172`	`171`	`return "";`
`173`	`172`	`}`
`174`		`- final String structName = formatClassName(structureName(tokenName));`
`175`		`- return String.format(" implements %s<%s>", interfaceName, structName);`
	`173`	`+`
	`174`	`+ return String.format(" implements %s<%s>", interfaceName, formatClassName(structureName(tokenName)));`
`176`	`175`	`}`
`177`	`176`
`178`	`177`	`public void generateMessageHeaderStub() throws IOException`
`@@ -201,6 +200,7 @@ private void generateMessageStructure(final Token msgToken) throws IOException`
`201`	`200`	`{`
`202`	`201`	`return;`
`203`	`202`	`}`
	`203`	`+`
`204`	`204`	`final String structName = formatClassName(structureName(msgToken.name()));`
`205`	`205`	`try (final Writer out = outputManager.createOutput(structName))`
`206`	`206`	`{`
`@@ -1011,7 +1011,6 @@ private void generateBitSet(final List<Token> tokens) throws IOException`
`1011`	`1011`	`{`
`1012`	`1012`	`generateFixedFlyweightHeader(token, decoderName, out, readOnlyBuffer, fqReadOnlyBuffer, "");`
`1013`	`1013`	`out.append(generateChoiceDecoders(messageBody));`
`1014`		`-`
`1015`	`1014`	`out.append("}\n");`
`1016`	`1015`	`}`
`1017`	`1016`
`@@ -1025,7 +1024,11 @@ private void generateBitSet(final List<Token> tokens) throws IOException`
`1025`	`1024`	`}`
`1026`	`1025`
`1027`	`1026`	`private void generateFixedFlyweightHeader(`
`1028`		`- final Token token, final String encoderName, final Writer out, final String buffer, final String fqBuffer,`
	`1027`	`+ final Token token,`
	`1028`	`+ final String encoderName,`
	`1029`	`+ final Writer out,`
	`1030`	`+ final String buffer,`
	`1031`	`+ final String fqBuffer,`
`1029`	`1032`	`final String implementsString) throws IOException`
`1030`	`1033`	`{`
`1031`	`1034`	`out.append(generateFileHeader(encoderName, ir.applicableNamespace(), fqBuffer));`
`@@ -1295,6 +1298,7 @@ private CharSequence interfaceImportLine(final String packageName)`
`1295`	`1298`	`{`
`1296`	`1299`	`return "\n";`
`1297`	`1300`	`}`
	`1301`	`+`
`1298`	`1302`	`return String.format("import %s.*;\n\n", JAVA_INTERFACE_PACKAGE);`
`1299`	`1303`	`}`
`1300`	`1304`
`@@ -2224,8 +2228,8 @@ private CharSequence generateEnumEncoder(`
`2224`	`2228`	`formatClassName(containingClassName),`
`2225`	`2229`	`propertyName,`
`2226`	`2230`	`enumName,`
`2227`		`- generatePut(encoding.primitiveType(), "offset + " + offset, "value.value()", byteOrderString(encoding))`
`2228`		`- );`
	`2231`	`+ generatePut(encoding.primitiveType(), "offset + " + offset, "value.value()", byteOrderString(encoding)`
	`2232`	`+ ));`
`2229`	`2233`	`}`
`2230`	`2234`
`2231`	`2235`	`private CharSequence generateBitSetProperty(`