This is an automated email from the ASF dual-hosted git repository. zhangzc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/carbondata.git
View the commit online: https://github.com/apache/carbondata/commit/1f46a7b6f6dcd72f9170bbcdf161e18a1de9175d The following commit(s) were added to refs/heads/master by this push: new 1f46a7b [HOTFIX][checkstyle] update AnnotationLocation rule #3464 1f46a7b is described below commit 1f46a7b6f6dcd72f9170bbcdf161e18a1de9175d Author: lamber-ken <[email protected]> AuthorDate: Sun Nov 17 23:36:16 2019 +0800 [HOTFIX][checkstyle] update AnnotationLocation rule #3464 This closes #3464 --- dev/javastyle-config.xml | 18 +++------- .../presto/CarbondataColumnConstraint.java | 12 ++++--- .../presto/impl/CarbonLocalInputSplit.java | 39 ++++++++++++++-------- .../presto/impl/CarbonLocalMultiBlockSplit.java | 15 ++++++--- 4 files changed, 48 insertions(+), 36 deletions(-) diff --git a/dev/javastyle-config.xml b/dev/javastyle-config.xml index 20abe46..cfb1622 100644 --- a/dev/javastyle-config.xml +++ b/dev/javastyle-config.xml @@ -150,11 +150,11 @@ <module name="MethodParamPad"/> <module name="AnnotationLocation"> - <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/> - </module> - <module name="AnnotationLocation"> - <property name="tokens" value="VARIABLE_DEF"/> - <property name="allowSamelineMultipleAnnotations" value="true"/> + <property name="allowSamelineMultipleAnnotations" value="false"/> + <property name="allowSamelineSingleParameterlessAnnotation" + value="false"/> + <property name="allowSamelineParameterizedAnnotation" value="true"/> + <property name="tokens" value="METHOD_DEF"/> </module> <module name="MethodName"> <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/> @@ -170,14 +170,6 @@ <module name="ParenPad"/> <module name="WhitespaceAround"/> - <!-- Checks for @Overrider in one line --> - <module name="RegexpSinglelineJava"> - <property name="severity" value="error"/> - <property name="format" value="^\s*@Override\s+.+$"/> - <property name="ignoreComments" value="true"/> - <property name="message" value="@Override should at one line"/> - </module> - <!-- Checks for redundant imports. --> <module name="RedundantImport"> <property name="severity" value="error"/> diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnConstraint.java b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnConstraint.java index ba514c8..67473f9 100755 --- a/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnConstraint.java +++ b/integration/presto/src/main/java/org/apache/carbondata/presto/CarbondataColumnConstraint.java @@ -46,19 +46,23 @@ public class CarbondataColumnConstraint { this.domain = requireNonNull(domain, "domain is null"); } - @JsonProperty public boolean isInvertedindexed() { + @JsonProperty + public boolean isInvertedindexed() { return invertedindexed; } - @JsonProperty public String getName() { + @JsonProperty + public String getName() { return name; } - @JsonProperty public Optional<Domain> getDomain() { + @JsonProperty + public Optional<Domain> getDomain() { return domain; } - @JsonSetter public void setDomain(Optional<Domain> domain) { + @JsonSetter + public void setDomain(Optional<Domain> domain) { this.domain = domain; } diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java b/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java index f68234c..2d64ba7 100755 --- a/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java +++ b/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java @@ -52,47 +52,58 @@ public class CarbonLocalInputSplit { */ private int numberOfBlocklets = 0; - @JsonProperty public short getVersion() { + @JsonProperty + public short getVersion() { return version; } - @JsonProperty public List<String> getLocations() { + @JsonProperty + public List<String> getLocations() { return locations; } - @JsonProperty public long getLength() { + @JsonProperty + public long getLength() { return length; } - @JsonProperty public long getStart() { + @JsonProperty + public long getStart() { return start; } - @JsonProperty public String getPath() { + @JsonProperty + public String getPath() { return path; } - @JsonProperty public String getSegmentId() { + @JsonProperty + public String getSegmentId() { return segmentId; } - @JsonProperty public int getNumberOfBlocklets() { + @JsonProperty + public int getNumberOfBlocklets() { return numberOfBlocklets; } - @JsonProperty public String[] getDeleteDeltaFiles() { + @JsonProperty + public String[] getDeleteDeltaFiles() { return deleteDeltaFiles; } - @JsonProperty public String getDetailInfo() { + @JsonProperty + public String getDetailInfo() { return detailInfo; } - @JsonProperty public String getBlockletId() { + @JsonProperty + public String getBlockletId() { return blockletId; } - @JsonProperty public int getFileFormatOrdinal() { + @JsonProperty + public int getFileFormatOrdinal() { return fileFormatOrdinal; } @@ -106,7 +117,8 @@ public class CarbonLocalInputSplit { } - @JsonCreator public CarbonLocalInputSplit(@JsonProperty("segmentId") String segmentId, + @JsonCreator + public CarbonLocalInputSplit(@JsonProperty("segmentId") String segmentId, @JsonProperty("path") String path, @JsonProperty("start") long start, @JsonProperty("length") long length, @JsonProperty("locations") List<String> locations, @JsonProperty("numberOfBlocklets") int numberOfBlocklets/*, @@ -115,8 +127,7 @@ public class CarbonLocalInputSplit { @JsonProperty("deleteDeltaFiles") String[] deleteDeltaFiles, @JsonProperty("blockletId") String blockletId, @JsonProperty("detailInfo") String detailInfo, - @JsonProperty("fileFormatOrdinal") int fileFormatOrdinal - ) { + @JsonProperty("fileFormatOrdinal") int fileFormatOrdinal) { this.path = path; this.start = start; this.length = length; diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalMultiBlockSplit.java b/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalMultiBlockSplit.java index 6702c5f..6a5e005 100755 --- a/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalMultiBlockSplit.java +++ b/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalMultiBlockSplit.java @@ -49,23 +49,28 @@ public class CarbonLocalMultiBlockSplit { private long length; - @JsonProperty public long getLength() { + @JsonProperty + public long getLength() { return length; } - @JsonProperty public String[] getLocations() { + @JsonProperty + public String[] getLocations() { return locations; } - @JsonProperty public List<CarbonLocalInputSplit> getSplitList() { + @JsonProperty + public List<CarbonLocalInputSplit> getSplitList() { return splitList; } - @JsonProperty public FileFormat getFileFormat() { + @JsonProperty + public FileFormat getFileFormat() { return fileFormat; } - @JsonCreator public CarbonLocalMultiBlockSplit( + @JsonCreator + public CarbonLocalMultiBlockSplit( @JsonProperty("splitList") List<CarbonLocalInputSplit> splitList, @JsonProperty("locations") String[] locations) { this.splitList = splitList;
