Skip to content

HDDS-4306. Ozone checkstyle rule can't be imported to IntelliJ. #1472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 2 commits into from
Oct 20, 2020
Merged

HDDS-4306. Ozone checkstyle rule can't be imported to IntelliJ. #1472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
098cc8a
HDDS-4306. Ozone checkstyle rule can't be imported to IntelliJ.
xiaoyuyao Oct 4, 2020
02a7860
match with the hadoop checkstyle version and fix some checkstyle issues
xiaoyuyao Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/CommitWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ private long releaseBuffers(List<Long> indexes) {

public void updateCommitInfoMap(long index, List<ChunkBuffer> buffers) {
commitIndex2flushedDataMap.computeIfAbsent(index, k -> new LinkedList<>())
.addAll(buffers);
.addAll(buffers);
}

int getCommitInfoMapSize() {
Expand Down
4 changes: 3 additions & 1 deletion hadoop-hdds/dev-support/checkstyle/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
<!--<module name="FileLength">-->
<module name="FileTabCharacter"/>

<module name="LineLength">
<property name="fileExtensions" value="java"/>
</module>
<module name="TreeWalker">

<module name="SuppressWarningsHolder"/>
Expand Down Expand Up @@ -129,7 +132,6 @@

<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="LineLength"/>
<module name="MethodLength"/>
<module name="ParameterNumber">
<property name="ignoreOverriddenMethods" value="true"/>
Expand Down
4 changes: 2 additions & 2 deletions ...ava/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ public void setQuota(String volume, long quotaInCounts,
SetVolumePropertyRequest.Builder req =
SetVolumePropertyRequest.newBuilder();
req.setVolumeName(volume)
.setQuotaInBytes(quotaInBytes)
.setQuotaInCounts(quotaInCounts);
.setQuotaInBytes(quotaInBytes)
.setQuotaInCounts(quotaInCounts);

OMRequest omRequest = createOMRequest(Type.SetVolumeProperty)
.setSetVolumePropertyRequest(req)
Expand Down
2 changes: 1 addition & 1 deletion ...ager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetOwnerRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
omResponse.setStatus(OzoneManagerProtocolProtos.Status.OK)
.setMessage(
"Volume '" + volume + "' owner is already '" + newOwner + "'.")
.setSuccess(false);
.setSuccess(false);
omResponse.setSetVolumePropertyResponse(
SetVolumePropertyResponse.newBuilder().setResponse(false).build());
omClientResponse = new OMVolumeSetOwnerResponse(omResponse.build());
Expand Down
2 changes: 1 addition & 1 deletion ...e/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ private OzoneManagerServiceProviderImpl getMockOzoneManagerServiceProvider()
when(tableMock.getName()).thenReturn("keyTable");
when(omMetadataManagerMock.getKeyTable()).thenReturn(tableMock);
when(omServiceProviderMock.getOMMetadataManagerInstance())
.thenReturn(omMetadataManagerMock);
.thenReturn(omMetadataManagerMock);
return omServiceProviderMock;
}
}
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<exec-maven-plugin.version>1.3.1</exec-maven-plugin.version>
<make-maven-plugin.version>1.0-beta-1</make-maven-plugin.version>
<native-maven-plugin.version>1.0-alpha-8</native-maven-plugin.version>
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<checkstyle.version>8.19</checkstyle.version>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
<checkstyle.version>8.29</checkstyle.version>
<surefire.fork.timeout>1200</surefire.fork.timeout>
<aws-java-sdk.version>1.11.615</aws-java-sdk.version>
<hsqldb.version>2.3.4</hsqldb.version>
Expand Down