fixup! Update java code generator for Apple Java checkstyle

This commit is contained in:
Xiaoge Su 2023-07-06 13:00:07 -07:00
parent 30ca9a6f16
commit e6cdb774b5
2 changed files with 38 additions and 16 deletions

View File

@ -1,4 +1,5 @@
// Automatically generated by script, do NOT modify by hand
package com.apple.cie.foundationdb.hubble;
import java.nio.ByteBuffer;
@ -7,13 +8,22 @@ import java.util.Arrays;
import java.util.List;
class ProtocolVersion implements Comparable<ProtocolVersion> {
public static final ProtocolVersion protocolVersionSixThree = new ProtocolVersion(0x0FDB00B063010001L);
public static final ProtocolVersion protocolVersionSixOne = new ProtocolVersion(0x0FDB00B061060001L);
public static final ProtocolVersion protocolVersionSixTwo = new ProtocolVersion(0x0FDB00B062010001L);
public static final ProtocolVersion protocolVersionSixZero = new ProtocolVersion(0x0FDB00A570010001L);
public static final ProtocolVersion protocolVersionSevenZero = new ProtocolVersion(0x0FDB00B070010000L);
public static final ProtocolVersion protocolVersionSevenOne = new ProtocolVersion(0x0FDB00B071010000L);
public static final ProtocolVersion protocolVersionSevenThree = new ProtocolVersion(0x0FDB00B073000000L);
public static final ProtocolVersion protocolVersionSixThree =
new ProtocolVersion(0x0FDB00B063010001L);
public static final ProtocolVersion protocolVersionSixOne =
new ProtocolVersion(0x0FDB00B061060001L);
public static final ProtocolVersion protocolVersionSixTwo =
new ProtocolVersion(0x0FDB00B062010001L);
public static final ProtocolVersion protocolVersionSixZero =
new ProtocolVersion(0x0FDB00A570010001L);
public static final ProtocolVersion protocolVersionSevenZero =
new ProtocolVersion(0x0FDB00B070010000L);
public static final ProtocolVersion protocolVersionSevenOne =
new ProtocolVersion(0x0FDB00B071010000L);
public static final ProtocolVersion protocolVersionSevenThree =
new ProtocolVersion(0x0FDB00B073000000L);
public static final List<ProtocolVersion> supportedVersions = Arrays.asList(
protocolVersionSixThree,
protocolVersionSixTwo,
@ -54,7 +64,8 @@ class ProtocolVersion implements Comparable<ProtocolVersion> {
}
public ProtocolVersion normalizedVersion() {
return new ProtocolVersion(this.protocolVersion & ProtocolVersion.compatibleProtocolVersionMask);
return new ProtocolVersion(
this.protocolVersion & ProtocolVersion.compatibleProtocolVersionMask);
}
public boolean isCompatible(ProtocolVersion other) {
@ -98,3 +109,4 @@ class ProtocolVersion implements Comparable<ProtocolVersion> {
{% endfor %}
}

View File

@ -184,6 +184,20 @@ class NameTransformer(abc.ABC):
class CamelCaseNameTransformer(NameTransformer):
def _all_caps_to_camel(self, text: str) -> str:
"""Translate ABC_DEF to AbcDef"""
return "".join(item.capitalize() for item in text.split("_"))
class JavaCamelCaseNameTransformer(CamelCaseNameTransformer):
def transform_feature_text(self, feature: str) -> str:
# Java stylechecker expects a tighter form of CamelCase, e.g. IPV6 -> Ipv6
return self._all_caps_to_camel(feature)
class CxxCamelCaseNameTransformer(CamelCaseNameTransformer):
XXX_FIELD_MAPPING = {
"IPV6": "IPv6",
"INEXPENSIVE_MULTIVERSION_CLIENT": "InexpensiveMultiVersionClient",
@ -200,13 +214,9 @@ class CamelCaseNameTransformer(NameTransformer):
"PROCESS_ID_FILE": "ProcessIDFile",
}
def _all_caps_to_camel(self, text: str) -> str:
"""Translate ABC_DEF to AbcDef"""
return "".join(item.capitalize() for item in text.split("_"))
def transform_feature_text(self, feature: str) -> str:
if feature in CamelCaseNameTransformer.XXX_FIELD_MAPPING:
return CamelCaseNameTransformer.XXX_FIELD_MAPPING[feature]
if feature in CxxCamelCaseNameTransformer.XXX_FIELD_MAPPING:
return CxxCamelCaseNameTransformer.XXX_FIELD_MAPPING[feature]
return self._all_caps_to_camel(feature)
@ -256,7 +266,7 @@ class JavaCodeGen(CodeGenBase):
return "{}L".format(_version_to_hex_string(version))
def _render(self):
env = self._get_environment(self._encode_version, CamelCaseNameTransformer())
env = self._get_environment(self._encode_version, JavaCamelCaseNameTransformer())
with open(JavaCodeGen.JAVA_TEMPLATE_FILE) as template_stream:
template = env.from_string(template_stream.read())
@ -270,7 +280,7 @@ class CxxHeaderFileCodeGen(CodeGenBase):
return "{}LL".format(_version_to_hex_string(version))
def _render(self):
env = self._get_environment(self._encode_version, CamelCaseNameTransformer())
env = self._get_environment(self._encode_version, CxxCamelCaseNameTransformer())
with open(CxxHeaderFileCodeGen.CXX_TEMPLATE_FILE) as template_stream:
template = env.from_string(template_stream.read())