Skip to content

Commit 763572b

Browse files
committed
HDDS-1473. Checkstyle fixes.
1 parent 8a4facb commit 763572b

File tree

2 files changed

+15
-25
lines changed

2 files changed

+15
-25
lines changed

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,33 @@
1818

1919
package org.apache.hadoop.ozone.container.common.helpers;
2020

21-
import com.google.common.base.Preconditions;
21+
import static org.apache.commons.io.FilenameUtils.removeExtension;
22+
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.CONTAINER_CHECKSUM_ERROR;
23+
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.NO_SUCH_ALGORITHM;
24+
import static org.apache.hadoop.ozone.container.common.impl.ContainerData.CHARSET_ENCODING;
25+
26+
import java.io.File;
27+
import java.io.IOException;
28+
import java.nio.file.Paths;
2229
import java.security.MessageDigest;
2330
import java.security.NoSuchAlgorithmException;
31+
2432
import org.apache.commons.codec.digest.DigestUtils;
2533
import org.apache.hadoop.fs.FileAlreadyExistsException;
2634
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
27-
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
28-
.ContainerCommandRequestProto;
29-
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
30-
.ContainerCommandResponseProto;
35+
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandRequestProto;
36+
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ContainerCommandResponseProto;
3137
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result;
32-
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
33-
import org.apache.hadoop.hdds.scm.container.common.helpers
34-
.StorageContainerException;
38+
import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
3539
import org.apache.hadoop.ozone.OzoneConsts;
3640
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
3741
import org.apache.hadoop.ozone.container.common.impl.ContainerDataYaml;
3842
import org.apache.hadoop.ozone.container.common.impl.ContainerSet;
3943
import org.slf4j.Logger;
4044
import org.slf4j.LoggerFactory;
41-
42-
import java.io.File;
43-
import java.io.FileInputStream;
44-
import java.io.FileOutputStream;
45-
import java.io.IOException;
46-
import java.nio.file.Paths;
4745
import org.yaml.snakeyaml.Yaml;
4846

49-
import static org.apache.commons.io.FilenameUtils.removeExtension;
50-
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
51-
.Result.CONTAINER_CHECKSUM_ERROR;
52-
import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos
53-
.Result.NO_SUCH_ALGORITHM;
54-
import static org.apache.hadoop.ozone.container.common.impl.ContainerData
55-
.CHARSET_ENCODING;
47+
import com.google.common.base.Preconditions;
5648

5749
/**
5850
* A set of helper functions to create proper responses.

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/DatanodeIdYaml.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@
3232
import org.yaml.snakeyaml.DumperOptions;
3333
import org.yaml.snakeyaml.Yaml;
3434

35-
import com.google.common.base.Preconditions;
36-
3735
/**
3836
* Class for creating datanode.id file in yaml format.
3937
*/
40-
public class DatanodeIdYaml {
38+
public final class DatanodeIdYaml {
4139

4240
private DatanodeIdYaml() {
43-
41+
// static helper methods only, no state.
4442
}
4543

4644
/**

0 commit comments

Comments
 (0)