Skip to content

Commit 3dcb143

Browse files
KostyaShaKostyaSha
committed
Checkstyle: fix naming convention.
1 parent 2d110ad commit 3dcb143

File tree

15 files changed

+106
-78
lines changed

15 files changed

+106
-78
lines changed

‎src/main/java/com/github/dockerjava/api/model/Info.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class Info {
2525
private Boolean debug;
2626

2727
@JsonProperty("DockerRootDir")
28-
private String DockerRootDir;
28+
private String dockerRootDir;
2929

3030
@JsonProperty("Driver")
3131
private String driver;
@@ -37,16 +37,16 @@ public class Info {
3737
private String executionDriver;
3838

3939
@JsonProperty("ID")
40-
private String ID;
40+
private String id;
4141

4242
@JsonProperty("IPv4Forwarding")
43-
private Boolean IPv4Forwarding;
43+
private Boolean ipv4Forwarding;
4444

4545
@JsonProperty("Images")
4646
private Integer images;
4747

4848
@JsonProperty("IndexServerAddress")
49-
private String IndexServerAddress;
49+
private String indexServerAddress;
5050

5151
@JsonProperty("InitPath")
5252
private String initPath;
@@ -58,7 +58,7 @@ public class Info {
5858
private String kernelVersion;
5959

6060
@JsonProperty("Labels")
61-
private String[] Labels;
61+
private String[] labels;
6262

6363
@JsonProperty("MemoryLimit")
6464
private Boolean memoryLimit;
@@ -70,19 +70,19 @@ public class Info {
7070
private String name;
7171

7272
@JsonProperty("NCPU")
73-
private Integer NCPU;
73+
private Integer ncpu;
7474

7575
@JsonProperty("NEventsListener")
7676
private Long nEventListener;
7777

7878
@JsonProperty("NFd")
79-
private Integer NFd;
79+
private Integer nfd;
8080

8181
@JsonProperty("NGoroutines")
82-
private Integer NGoroutines;
82+
private Integer nGoroutines;
8383

8484
@JsonProperty("OperatingSystem")
85-
private String OperatingSystem;
85+
private String operatingSystem;
8686

8787
@JsonProperty("Sockets")
8888
private String[] sockets;
@@ -99,7 +99,7 @@ public Integer getContainers() {
9999
}
100100

101101
public String getDockerRootDir() {
102-
return DockerRootDir;
102+
return dockerRootDir;
103103
}
104104

105105
public String getDriver() {
@@ -115,15 +115,15 @@ public Integer getImages() {
115115
}
116116

117117
public String getID() {
118-
return ID;
118+
return id;
119119
}
120120

121121
public Boolean getIPv4Forwarding() {
122-
return IPv4Forwarding;
122+
return ipv4Forwarding;
123123
}
124124

125125
public String getIndexServerAddress() {
126-
return IndexServerAddress;
126+
return indexServerAddress;
127127
}
128128

129129
public String getInitPath() {
@@ -139,7 +139,7 @@ public String getKernelVersion() {
139139
}
140140

141141
public String[] getLabels() {
142-
return Labels;
142+
return labels;
143143
}
144144

145145
public String[] getSockets() {
@@ -163,19 +163,19 @@ public String getName() {
163163
}
164164

165165
public Integer getNCPU() {
166-
return NCPU;
166+
return ncpu;
167167
}
168168

169169
public Integer getNFd() {
170-
return NFd;
170+
return nfd;
171171
}
172172

173173
public Integer getNGoroutines() {
174-
return NGoroutines;
174+
return nGoroutines;
175175
}
176176

177177
public String getOperatingSystem() {
178-
return OperatingSystem;
178+
return operatingSystem;
179179
}
180180

181181
public Boolean getSwapLimit() {

‎src/main/java/com/github/dockerjava/api/model/Ports.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@ public Map<ExposedPort, Binding[]> getBindings() {
112112
/**
113113
* Creates a {@link Binding} for the given IP address and port number.
114114
*/
115-
public static Binding Binding(String hostIp, Integer hostPort) {
115+
public static Binding binding(String hostIp, Integer hostPort) {
116116
return new Binding(hostIp, hostPort);
117117
}
118118

119119
/**
120120
* Creates a {@link Binding} for the given port number, leaving the IP address undefined.
121121
*/
122-
public static Binding Binding(Integer hostPort) {
122+
public static Binding binding(Integer hostPort) {
123123
return new Binding(hostPort);
124124
}
125125

‎src/main/java/com/github/dockerjava/core/DockerClientConfig.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@ public AuthConfig effectiveAuthConfig(String imageName) {
270270
authConfig = authConfigFile.resolveAuthConfig(hostnameReposName.hostname);
271271
}
272272

273-
AuthConfig _authConfig = getAuthConfig();
273+
AuthConfig otherAuthConfig = getAuthConfig();
274274

275-
if (_authConfig != null)
276-
authConfig = _authConfig;
275+
if (otherAuthConfig != null)
276+
authConfig = otherAuthConfig;
277277

278278
return authConfig;
279279
}

‎src/main/java/com/github/dockerjava/core/NameParser.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
import com.github.dockerjava.core.exception.InvalidRepositoryNameException;
1414

1515
public class NameParser {
16-
16+
//CHECKSTYLE:OFF
1717
private static final int RepositoryNameTotalLengthMax = 255;
1818

1919
private static final Pattern RepositoryNameComponentRegexp = Pattern.compile("[a-z0-9]+(?:[._-][a-z0-9]+)*");
2020

2121
private static final Pattern RepositoryNameComponentAnchoredRegexp = Pattern.compile("^"
2222
+ RepositoryNameComponentRegexp.pattern() + "$");
23+
//CHECKSTYLE:ON
2324

2425
// private static final Pattern RepositoryNameRegexp = Pattern.compile("(?:" +
2526
// RepositoryNameComponentRegexp.pattern()

‎src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
public class FiltersEncoder {
1919

20-
private static ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
20+
private static final ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
2121
MediaType.APPLICATION_JSON_TYPE);
2222

2323
public static String jsonEncode(Map<String, List<String>> filters) {

‎src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,13 @@ class ApacheConnector implements Connector {
184184

185185
private final static Logger LOGGER = Logger.getLogger(ApacheConnector.class.getName());
186186

187-
private static final VersionInfo vi;
187+
private static final VersionInfo VERSION_INFO;
188188

189-
private static final String release;
189+
private static final String RELEASE;
190190

191191
static {
192-
vi = VersionInfo.loadVersionInfo("org.apache.http.client", HttpClientBuilder.class.getClassLoader());
193-
release = (vi != null) ? vi.getRelease() : VersionInfo.UNAVAILABLE;
192+
VERSION_INFO = VersionInfo.loadVersionInfo("org.apache.http.client", HttpClientBuilder.class.getClassLoader());
193+
RELEASE = (VERSION_INFO != null) ? VERSION_INFO.getRelease() : VersionInfo.UNAVAILABLE;
194194
}
195195

196196
private final CloseableHttpClient client;
@@ -507,7 +507,7 @@ public void run() {
507507

508508
@Override
509509
public String getName() {
510-
return "Apache HttpClient " + release;
510+
return "Apache HttpClient " + RELEASE;
511511
}
512512

513513
@Override

‎src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<Str
109109
@SuppressWarnings("NonConstantLogger")
110110
private final Logger logger;
111111

112-
private final AtomicLong _id = new AtomicLong(0);
112+
private final AtomicLong id = new AtomicLong(0);
113113

114114
private final Boolean printEntity;
115115

@@ -227,7 +227,7 @@ private InputStream logInboundEntity(final StringBuilder b, InputStream stream)
227227

228228
@Override
229229
public void filter(final ClientRequestContext context) throws IOException {
230-
final long id = this._id.incrementAndGet();
230+
final long id = this.id.incrementAndGet();
231231
final StringBuilder b = new StringBuilder();
232232

233233
printRequestLine(b, "Sending client request", id, context.getMethod(), context.getUri());
@@ -246,7 +246,7 @@ public void filter(final ClientRequestContext context) throws IOException {
246246
@Override
247247
public void filter(final ClientRequestContext requestContext, final ClientResponseContext responseContext)
248248
throws IOException {
249-
final long id = this._id.incrementAndGet();
249+
final long id = this.id.incrementAndGet();
250250
final StringBuilder b = new StringBuilder();
251251

252252
printResponseLine(b, "Client response received", id, responseContext.getStatus());
@@ -261,7 +261,7 @@ public void filter(final ClientRequestContext requestContext, final ClientRespon
261261

262262
@Override
263263
public void filter(final ContainerRequestContext context) throws IOException {
264-
final long id = this._id.incrementAndGet();
264+
final long id = this.id.incrementAndGet();
265265
final StringBuilder b = new StringBuilder();
266266

267267
printRequestLine(b, "Server has received a request", id, context.getMethod(), context.getUriInfo()
@@ -278,7 +278,7 @@ public void filter(final ContainerRequestContext context) throws IOException {
278278
@Override
279279
public void filter(final ContainerRequestContext requestContext, final ContainerResponseContext responseContext)
280280
throws IOException {
281-
final long id = this._id.incrementAndGet();
281+
final long id = this.id.incrementAndGet();
282282
final StringBuilder b = new StringBuilder();
283283

284284
printResponseLine(b, "Server responded with a response", id, responseContext.getStatus());

‎src/main/java/com/github/dockerjava/netty/WebTarget.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class WebTarget {
2222

2323
private Map<String, String> queryParams = new HashMap<String, String>();
2424

25-
private static String PATH_SEPARATOR = "/";
25+
private static final String PATH_SEPARATOR = "/";
2626

2727
public WebTarget(ChannelProvider channelProvider) {
2828
this.channelProvider = channelProvider;

‎src/test/java/com/github/dockerjava/api/model/BindingTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ public class BindingTest {
1010

1111
@Test
1212
public void parseIpAndPort() {
13-
assertEquals(Binding.parse("127.0.0.1:80"), Ports.Binding("127.0.0.1", 80));
13+
assertEquals(Binding.parse("127.0.0.1:80"), Ports.binding("127.0.0.1", 80));
1414
}
1515

1616
@Test
1717
public void parsePortOnly() {
18-
assertEquals(Binding.parse("80"), Ports.Binding(null, 80));
18+
assertEquals(Binding.parse("80"), Ports.binding(null, 80));
1919
}
2020

2121
@Test
2222
public void parseIPOnly() {
23-
assertEquals(Binding.parse("127.0.0.1"), Ports.Binding("127.0.0.1", null));
23+
assertEquals(Binding.parse("127.0.0.1"), Ports.binding("127.0.0.1", null));
2424
}
2525

2626
@Test
2727
public void parseEmptyString() {
28-
assertEquals(Binding.parse(""), Ports.Binding(null, null));
28+
assertEquals(Binding.parse(""), Ports.binding(null, null));
2929
}
3030

3131
@Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Binding 'nonsense'")

‎src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public class Ports_addBindingsTest {
1919

2020
private static final ExposedPort TCP_90 = ExposedPort.tcp(90);
2121

22-
private static final Binding BINDING_8080 = Ports.Binding(8080);
22+
private static final Binding BINDING_8080 = Ports.binding(8080);
2323

24-
private static final Binding BINDING_9090 = Ports.Binding(9090);
24+
private static final Binding BINDING_9090 = Ports.binding(9090);
2525

2626
private Ports ports;
2727

0 commit comments

Comments
 (0)