Skip to content

Commit 18ad695

Browse files
bsideupbsideup
authored
Remove apache lang from api (docker-java#1267)
* WIP * Remove `commons-lang` and `commons-codec` from the API module * fix checkstyle errors * Use Lombok for equals/hashCode/toString in api * remove unused dependency
1 parent 92994bd commit 18ad695

122 files changed

Lines changed: 511 additions & 2195 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docker-java-api/pom.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@
2121
<artifactId>jackson-databind</artifactId>
2222
<version>${jackson.version}</version>
2323
</dependency>
24-
<dependency>
25-
<groupId>commons-lang</groupId>
26-
<artifactId>commons-lang</artifactId>
27-
<version>${commons-lang.version}</version>
28-
</dependency>
2924

3025
<dependency>
3126
<groupId>org.slf4j</groupId>
@@ -39,6 +34,13 @@
3934
<version>3.0.1u2</version>
4035
<scope>provided</scope>
4136
</dependency>
37+
38+
<dependency>
39+
<groupId>org.projectlombok</groupId>
40+
<artifactId>lombok</artifactId>
41+
<version>1.18.10</version>
42+
<scope>provided</scope>
43+
</dependency>
4244
</dependencies>
4345

4446
<build>

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package com.github.dockerjava.api.command;
22

3-
import org.apache.commons.lang.builder.ToStringBuilder;
4-
53
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
64
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.ToString;
77

88
/**
99
*
1010
* @author Konstantin Pelykh (kpelykh@gmail.com)
1111
*
1212
*/
1313
@JsonIgnoreProperties(ignoreUnknown = true)
14+
@EqualsAndHashCode
15+
@ToString
1416
public class CreateContainerResponse {
1517

1618
@JsonProperty("Id")
@@ -34,9 +36,4 @@ public void setId(String id) {
3436
public void setWarnings(String[] warnings) {
3537
this.warnings = warnings;
3638
}
37-
38-
@Override
39-
public String toString() {
40-
return ToStringBuilder.reflectionToString(this);
41-
}
4239
}

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.github.dockerjava.api.command;
22

3-
import org.apache.commons.lang.builder.ToStringBuilder;
4-
53
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
64
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.ToString;
77

88
/**
99
* Parse reponses from /images/create
@@ -12,6 +12,8 @@
1212
*
1313
*/
1414
@JsonIgnoreProperties(ignoreUnknown = true)
15+
@EqualsAndHashCode
16+
@ToString
1517
public class CreateImageResponse {
1618

1719
@JsonProperty("status")
@@ -20,9 +22,4 @@ public class CreateImageResponse {
2022
public String getId() {
2123
return id;
2224
}
23-
24-
@Override
25-
public String toString() {
26-
return ToStringBuilder.reflectionToString(this);
27-
}
2825
}

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import com.fasterxml.jackson.annotation.JsonProperty;
5-
import org.apache.commons.lang.builder.ToStringBuilder;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.ToString;
67

78
@JsonIgnoreProperties(ignoreUnknown = true)
9+
@EqualsAndHashCode
10+
@ToString
811
public class CreateNetworkResponse {
912

1013
@JsonProperty("Id")
@@ -28,9 +31,4 @@ public void setId(String id) {
2831
public void setWarnings(String[] warnings) {
2932
this.warnings = warnings;
3033
}
31-
32-
@Override
33-
public String toString() {
34-
return ToStringBuilder.reflectionToString(this);
35-
}
3634
}

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,20 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import com.fasterxml.jackson.annotation.JsonProperty;
5-
import org.apache.commons.lang.builder.ReflectionToStringBuilder;
6-
import org.apache.commons.lang.builder.ToStringStyle;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.ToString;
77

88
/**
99
* The response of a {@link CreateSecretCmd}
1010
*/
1111
@JsonIgnoreProperties(ignoreUnknown = true)
12+
@EqualsAndHashCode
13+
@ToString
1214
public class CreateSecretResponse {
1315
@JsonProperty("ID")
1416
private String id;
1517

1618
public String getId() {
1719
return id;
1820
}
19-
20-
@Override
21-
public String toString() {
22-
return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
23-
}
2421
}

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,20 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import com.fasterxml.jackson.annotation.JsonProperty;
5-
import org.apache.commons.lang.builder.ReflectionToStringBuilder;
6-
import org.apache.commons.lang.builder.ToStringStyle;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.ToString;
77

88
/**
99
* The response of a {@link CreateServiceCmd}
1010
*/
1111
@JsonIgnoreProperties(ignoreUnknown = true)
12+
@EqualsAndHashCode
13+
@ToString
1214
public class CreateServiceResponse {
1315
@JsonProperty("ID")
1416
private String id;
1517

1618
public String getId() {
1719
return id;
1820
}
19-
20-
@Override
21-
public String toString() {
22-
return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
23-
}
2421
}

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package com.github.dockerjava.api.command;
22

3-
import org.apache.commons.lang.builder.ToStringBuilder;
4-
53
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
64
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.ToString;
77

88
/**
99
*
1010
* @author Marcus Linke
1111
*/
1212
@JsonIgnoreProperties(ignoreUnknown = true)
13+
@EqualsAndHashCode
14+
@ToString
1315
public class CreateVolumeResponse {
1416

1517
@JsonProperty("Name")
@@ -32,9 +34,4 @@ public String getDriver() {
3234
public String getMountpoint() {
3335
return mountpoint;
3436
}
35-
36-
@Override
37-
public String toString() {
38-
return ToStringBuilder.reflectionToString(this);
39-
}
4037
}

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.github.dockerjava.api.command;
22

3-
import org.apache.commons.lang.builder.ReflectionToStringBuilder;
4-
import org.apache.commons.lang.builder.ToStringStyle;
5-
63
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
74
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.ToString;
87

98
@JsonIgnoreProperties(ignoreUnknown = true)
9+
@EqualsAndHashCode
10+
@ToString
1011
public class ExecCreateCmdResponse {
1112

1213
@JsonProperty("Id")
@@ -15,9 +16,4 @@ public class ExecCreateCmdResponse {
1516
public String getId() {
1617
return id;
1718
}
18-
19-
@Override
20-
public String toString() {
21-
return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
22-
}
2319
}

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import com.fasterxml.jackson.annotation.JsonProperty;
5-
6-
import org.apache.commons.lang.builder.EqualsBuilder;
7-
import org.apache.commons.lang.builder.HashCodeBuilder;
8-
import org.apache.commons.lang.builder.ToStringBuilder;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.ToString;
97

108
import javax.annotation.CheckForNull;
119

@@ -14,6 +12,8 @@
1412
* @author Kanstantsin Shautsou
1513
*/
1614
@JsonIgnoreProperties(ignoreUnknown = true)
15+
@EqualsAndHashCode
16+
@ToString
1717
public class GraphData {
1818

1919
@JsonProperty("RootDir")
@@ -110,19 +110,4 @@ public GraphData withDir(String dir) {
110110
this.dir = dir;
111111
return this;
112112
}
113-
114-
@Override
115-
public String toString() {
116-
return ToStringBuilder.reflectionToString(this);
117-
}
118-
119-
@Override
120-
public boolean equals(Object o) {
121-
return EqualsBuilder.reflectionEquals(this, o);
122-
}
123-
124-
@Override
125-
public int hashCode() {
126-
return HashCodeBuilder.reflectionHashCode(this);
127-
}
128113
}

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import com.fasterxml.jackson.annotation.JsonProperty;
5-
6-
import org.apache.commons.lang.builder.EqualsBuilder;
7-
import org.apache.commons.lang.builder.HashCodeBuilder;
8-
import org.apache.commons.lang.builder.ToStringBuilder;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.ToString;
97

108
import javax.annotation.CheckForNull;
119

@@ -16,6 +14,8 @@
1614
* @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
1715
*/
1816
@JsonIgnoreProperties(ignoreUnknown = true)
17+
@EqualsAndHashCode
18+
@ToString
1919
public class GraphDriver {
2020
/**
2121
* @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
@@ -61,19 +61,4 @@ public GraphDriver withName(String name) {
6161
this.name = name;
6262
return this;
6363
}
64-
65-
@Override
66-
public String toString() {
67-
return ToStringBuilder.reflectionToString(this);
68-
}
69-
70-
@Override
71-
public boolean equals(Object o) {
72-
return EqualsBuilder.reflectionEquals(this, o);
73-
}
74-
75-
@Override
76-
public int hashCode() {
77-
return HashCodeBuilder.reflectionHashCode(this);
78-
}
7964
}

0 commit comments

Comments
 (0)