Skip to content

Commit 9cc41c6

Browse files
Hendrik-HHendrik-H
committed
renamed values to match java convention
1 parent 26b839a commit 9cc41c6

3 files changed

Lines changed: 31 additions & 30 deletions

File tree

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public Bind(String path, Volume volume, AccessMode accessMode, SELContext secMod
5050
}
5151

5252
public Bind(String path, Volume volume, AccessMode accessMode, SELContext secMode, Boolean noCopy) {
53-
this(path, volume, accessMode, secMode, noCopy, PropagationMode.DEFAULT);
53+
this(path, volume, accessMode, secMode, noCopy, PropagationMode.DEFAULT_MODE);
5454
}
5555

5656
public Bind(String path, Volume volume, AccessMode accessMode, SELContext secMode, Boolean noCopy, PropagationMode propagationMode) {
@@ -107,18 +107,18 @@ public static Bind parse(String serialized) {
107107
AccessMode accessMode = AccessMode.DEFAULT;
108108
SELContext seMode = SELContext.DEFAULT;
109109
Boolean nocopy = null;
110-
PropagationMode propagationMode = PropagationMode.DEFAULT;
110+
PropagationMode propagationMode = PropagationMode.DEFAULT_MODE;
111111
for (String p : flags) {
112112
if (p.length() == 2) {
113113
accessMode = AccessMode.valueOf(p.toLowerCase());
114114
} else if ("nocopy".equals(p)) {
115115
nocopy = true;
116-
} else if (PropagationMode.mount_shared.toString().equals(p)) {
117-
propagationMode = PropagationMode.mount_shared;
118-
} else if (PropagationMode.mount_slave.toString().equals(p)) {
119-
propagationMode = PropagationMode.mount_slave;
120-
} else if (PropagationMode.mount_private.toString().equals(p)) {
121-
propagationMode = PropagationMode.mount_private;
116+
} else if (PropagationMode.SHARED.toString().equals(p)) {
117+
propagationMode = PropagationMode.SHARED;
118+
} else if (PropagationMode.SLAVE.toString().equals(p)) {
119+
propagationMode = PropagationMode.SLAVE;
120+
} else if (PropagationMode.PRIVATE.toString().equals(p)) {
121+
propagationMode = PropagationMode.PRIVATE;
122122
} else {
123123
seMode = SELContext.fromString(p);
124124
}
@@ -179,6 +179,6 @@ public String toString() {
179179
accessMode.toString(),
180180
secMode != SELContext.none ? "," + secMode.toString() : "",
181181
noCopy != null ? ",nocopy" : "",
182-
propagationMode != PropagationMode.mount_default ? "," + propagationMode.toString() : "");
182+
propagationMode != PropagationMode.DEFAULT_MODE ? "," + propagationMode.toString() : "");
183183
}
184184
}

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
*/
99
public enum PropagationMode {
1010
/** default */
11-
mount_default(""),
11+
DEFAULT(""),
1212

1313
/** shared */
14-
mount_shared("shared"),
14+
SHARED("shared"),
1515

1616
/** slave */
17-
mount_slave("slave"),
17+
SLAVE("slave"),
1818

1919
/** private */
20-
mount_private("private");
20+
PRIVATE("private");
2121

2222
/**
23-
* The default {@link PropagationMode}: {@link #mount_default}
23+
* The default {@link PropagationMode}: {@link #DEFAULT}
2424
*/
25-
public static final PropagationMode DEFAULT = mount_default;
25+
public static final PropagationMode DEFAULT_MODE = DEFAULT;
2626

2727
private String value;
2828

@@ -38,12 +38,13 @@ public String toString() {
3838
public static PropagationMode fromString(String v) {
3939
switch (v) {
4040
case "shared":
41-
return mount_shared;
41+
return SHARED;
4242
case "slave":
43-
return mount_slave;
43+
return SLAVE;
4444
case "private":
45-
return mount_private;
45+
return PRIVATE;
46+
default:
47+
return DEFAULT;
4648
}
47-
return mount_default;
4849
}
4950
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void parseUsingDefaultAccessMode() {
1818
assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT));
1919
assertThat(bind.getSecMode(), is(SELContext.none));
2020
assertThat(bind.getNoCopy(), nullValue());
21-
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT));
21+
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
2222
}
2323

2424
@Test
@@ -29,7 +29,7 @@ public void parseReadWrite() {
2929
assertThat(bind.getAccessMode(), is(rw));
3030
assertThat(bind.getSecMode(), is(SELContext.none));
3131
assertThat(bind.getNoCopy(), nullValue());
32-
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT));
32+
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
3333
}
3434

3535
@Test
@@ -40,7 +40,7 @@ public void parseReadWriteNoCopy() {
4040
assertThat(bind.getAccessMode(), is(rw));
4141
assertThat(bind.getSecMode(), is(SELContext.none));
4242
assertThat(bind.getNoCopy(), is(true));
43-
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT));
43+
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
4444
}
4545

4646
@Test
@@ -51,7 +51,7 @@ public void parseReadWriteShared() {
5151
assertThat(bind.getAccessMode(), is(rw));
5252
assertThat(bind.getSecMode(), is(SELContext.none));
5353
assertThat(bind.getNoCopy(), nullValue());
54-
assertThat(bind.getPropagationMode(), is(PropagationMode.mount_shared));
54+
assertThat(bind.getPropagationMode(), is(PropagationMode.SHARED));
5555
}
5656

5757
@Test
@@ -62,7 +62,7 @@ public void parseReadWriteSlave() {
6262
assertThat(bind.getAccessMode(), is(rw));
6363
assertThat(bind.getSecMode(), is(SELContext.none));
6464
assertThat(bind.getNoCopy(), nullValue());
65-
assertThat(bind.getPropagationMode(), is(PropagationMode.mount_slave));
65+
assertThat(bind.getPropagationMode(), is(PropagationMode.SLAVE));
6666
}
6767

6868
@Test
@@ -73,7 +73,7 @@ public void parseReadWritePrivate() {
7373
assertThat(bind.getAccessMode(), is(rw));
7474
assertThat(bind.getSecMode(), is(SELContext.none));
7575
assertThat(bind.getNoCopy(), nullValue());
76-
assertThat(bind.getPropagationMode(), is(PropagationMode.mount_private));
76+
assertThat(bind.getPropagationMode(), is(PropagationMode.PRIVATE));
7777
}
7878

7979
@Test
@@ -84,7 +84,7 @@ public void parseReadOnly() {
8484
assertThat(bind.getAccessMode(), is(ro));
8585
assertThat(bind.getSecMode(), is(SELContext.none));
8686
assertThat(bind.getNoCopy(), nullValue());
87-
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT));
87+
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
8888
}
8989

9090
@Test
@@ -95,15 +95,15 @@ public void parseSELOnly() {
9595
assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT));
9696
assertThat(bind.getSecMode(), is(SELContext.single));
9797
assertThat(bind.getNoCopy(), nullValue());
98-
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT));
98+
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
9999

100100
bind = Bind.parse("/host:/container:z");
101101
assertThat(bind.getPath(), is("/host"));
102102
assertThat(bind.getVolume().getPath(), is("/container"));
103103
assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT));
104104
assertThat(bind.getSecMode(), is(SELContext.shared));
105105
assertThat(bind.getNoCopy(), nullValue());
106-
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT));
106+
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
107107
}
108108

109109
@Test
@@ -114,7 +114,7 @@ public void parseReadWriteSEL() {
114114
assertThat(bind.getAccessMode(), is(rw));
115115
assertThat(bind.getSecMode(), is(SELContext.single));
116116
assertThat(bind.getNoCopy(), nullValue());
117-
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT));
117+
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
118118
}
119119

120120
@Test
@@ -125,7 +125,7 @@ public void parseReadOnlySEL() {
125125
assertThat(bind.getAccessMode(), is(ro));
126126
assertThat(bind.getSecMode(), is(SELContext.shared));
127127
assertThat(bind.getNoCopy(), nullValue());
128-
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT));
128+
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
129129
}
130130

131131
@Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind.*")

0 commit comments

Comments
 (0)