Skip to content

Commit d474c4f

Browse files
gesellixgesellix
committed
Adopt changed api
1 parent eb40ed4 commit d474c4f

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

‎api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ImageApi.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import de.gesellix.docker.remote.api.ContainerConfig
2121
import de.gesellix.docker.remote.api.CreateImageInfo
2222
import de.gesellix.docker.remote.api.HistoryResponseItem
2323
import de.gesellix.docker.remote.api.IdResponse
24-
import de.gesellix.docker.remote.api.Image
2524
import de.gesellix.docker.remote.api.ImageDeleteResponseItem
25+
import de.gesellix.docker.remote.api.ImageInspect
2626
import de.gesellix.docker.remote.api.ImagePruneResponse
2727
import de.gesellix.docker.remote.api.ImageSearchResponseItem
2828
import de.gesellix.docker.remote.api.ImageSummary
@@ -880,15 +880,15 @@ class ImageApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, pro
880880
*/
881881
@Suppress("UNCHECKED_CAST")
882882
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
883-
fun imageInspect(name: String): Image {
883+
fun imageInspect(name: String): ImageInspect {
884884
val localVariableConfig = imageInspectRequestConfig(name = name)
885885

886-
val localVarResponse = request<Image>(
886+
val localVarResponse = request<ImageInspect>(
887887
localVariableConfig
888888
)
889889

890890
return when (localVarResponse.responseType) {
891-
ResponseType.Success -> (localVarResponse as Success<*>).data as Image
891+
ResponseType.Success -> (localVarResponse as Success<*>).data as ImageInspect
892892
ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
893893
ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
894894
ResponseType.ClientError -> {

‎api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/VolumeApi.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import de.gesellix.docker.engine.RequestMethod.DELETE
1616
import de.gesellix.docker.engine.RequestMethod.GET
1717
import de.gesellix.docker.engine.RequestMethod.POST
1818
import de.gesellix.docker.remote.api.Volume
19-
import de.gesellix.docker.remote.api.VolumeConfig
19+
import de.gesellix.docker.remote.api.VolumeCreateOptions
2020
import de.gesellix.docker.remote.api.VolumeListResponse
2121
import de.gesellix.docker.remote.api.VolumePruneResponse
2222
import de.gesellix.docker.remote.api.core.ApiClient
@@ -52,7 +52,7 @@ class VolumeApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, pr
5252
*/
5353
@Suppress("UNCHECKED_CAST")
5454
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
55-
fun volumeCreate(volumeConfig: VolumeConfig): Volume {
55+
fun volumeCreate(volumeConfig: VolumeCreateOptions): Volume {
5656
val localVariableConfig = volumeCreateRequestConfig(volumeConfig = volumeConfig)
5757

5858
val localVarResponse = request<Volume>(
@@ -80,7 +80,7 @@ class VolumeApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, pr
8080
* @param volumeConfig
8181
* @return RequestConfig
8282
*/
83-
fun volumeCreateRequestConfig(volumeConfig: VolumeConfig): RequestConfig {
83+
fun volumeCreateRequestConfig(volumeConfig: VolumeCreateOptions): RequestConfig {
8484
val localVariableBody: Any? = volumeConfig
8585
val localVariableQuery: MultiValueMap = mutableMapOf()
8686
val localVariableHeaders: MutableMap<String, String> = mutableMapOf()

‎api-client/src/test/java/de/gesellix/docker/remote/api/client/ImageApiIntegrationTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import de.gesellix.docker.remote.api.EngineApiClient;
1111
import de.gesellix.docker.remote.api.HistoryResponseItem;
1212
import de.gesellix.docker.remote.api.IdResponse;
13-
import de.gesellix.docker.remote.api.Image;
1413
import de.gesellix.docker.remote.api.ImageDeleteResponseItem;
1514
import de.gesellix.docker.remote.api.ImageID;
15+
import de.gesellix.docker.remote.api.ImageInspect;
1616
import de.gesellix.docker.remote.api.ImageSearchResponseItem;
1717
import de.gesellix.docker.remote.api.ImageSummary;
1818
import de.gesellix.docker.remote.api.core.StreamCallback;
@@ -281,7 +281,7 @@ public void imageHistory() {
281281
public void imageInspect() {
282282
imageApi.imageTag(testImage.getImageWithTag(), "test", "inspect");
283283

284-
Image image = imageApi.imageInspect("test:inspect");
284+
ImageInspect image = imageApi.imageInspect("test:inspect");
285285
assertTrue(image.getId().startsWith("sha256:"));
286286

287287
imageApi.imageDelete("test:inspect", null, null);
@@ -297,8 +297,8 @@ public void imageSearch() {
297297
@Test
298298
public void imageTag() {
299299
imageApi.imageTag(testImage.getImageWithTag(), "test/image", "test-tag");
300-
Image image1 = imageApi.imageInspect(testImage.getImageWithTag());
301-
Image image2 = imageApi.imageInspect("test/image:test-tag");
300+
ImageInspect image1 = imageApi.imageInspect(testImage.getImageWithTag());
301+
ImageInspect image2 = imageApi.imageInspect("test/image:test-tag");
302302
assertFalse(image1.getId().isEmpty());
303303
assertEquals(image1.getId(), image2.getId());
304304

‎api-client/src/test/java/de/gesellix/docker/remote/api/client/VolumeApiIntegrationTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.squareup.moshi.Moshi;
44
import de.gesellix.docker.remote.api.EngineApiClient;
55
import de.gesellix.docker.remote.api.Volume;
6-
import de.gesellix.docker.remote.api.VolumeConfig;
6+
import de.gesellix.docker.remote.api.VolumeCreateOptions;
77
import de.gesellix.docker.remote.api.VolumePruneResponse;
88
import de.gesellix.docker.remote.api.testutil.DockerEngineAvailable;
99
import de.gesellix.docker.remote.api.testutil.InjectDockerClient;
@@ -42,30 +42,30 @@ public void setup() {
4242

4343
@Test
4444
public void volumeCreate() {
45-
Volume volume = volumeApi.volumeCreate(new VolumeConfig("my-volume", null, Collections.emptyMap(), Collections.emptyMap()));
45+
Volume volume = volumeApi.volumeCreate(new VolumeCreateOptions("my-volume", null, Collections.emptyMap(), Collections.emptyMap()));
4646
assertTrue(volume.getMountpoint().endsWith(fileSeparator + "my-volume" + fileSeparator + "_data"));
4747
volumeApi.volumeDelete(volume.getName(), false);
4848
}
4949

5050
@Test
5151
public void volumeDelete() {
52-
Volume volume = volumeApi.volumeCreate(new VolumeConfig("my-volume", null, Collections.emptyMap(), Collections.emptyMap()));
52+
Volume volume = volumeApi.volumeCreate(new VolumeCreateOptions("my-volume", null, Collections.emptyMap(), Collections.emptyMap()));
5353
assertDoesNotThrow(() -> volumeApi.volumeDelete(volume.getName(), false));
5454
}
5555

5656
@Test
5757
public void volumeInspect() {
58-
volumeApi.volumeCreate(new VolumeConfig("my-volume", null, Collections.emptyMap(), Collections.emptyMap()));
58+
volumeApi.volumeCreate(new VolumeCreateOptions("my-volume", null, Collections.emptyMap(), Collections.emptyMap()));
5959
Volume volume = volumeApi.volumeInspect("my-volume");
6060
assertTrue(volume.getMountpoint().endsWith(fileSeparator + "my-volume" + fileSeparator + "_data"));
6161
volumeApi.volumeDelete(volume.getName(), false);
6262
}
6363

6464
@Test
6565
public void volumeList() {
66-
Volume volume = volumeApi.volumeCreate(new VolumeConfig("my-volume", null, Collections.emptyMap(), Collections.emptyMap()));
66+
Volume volume = volumeApi.volumeCreate(new VolumeCreateOptions("my-volume", null, Collections.emptyMap(), Collections.emptyMap()));
6767
Optional<Volume> myVolume = volumeApi.volumeList(null).getVolumes().stream().filter((v) -> v.getName().equals(volume.getName())).findFirst();
68-
assertEquals(volume.getMountpoint(), myVolume.orElse(new Volume("none", "none", "none", Collections.emptyMap(), Volume.Scope.Local, Collections.emptyMap(), "none", Collections.emptyMap(), null)).getMountpoint());
68+
assertEquals(volume.getMountpoint(), myVolume.orElse(new Volume("none", "none", "none", Collections.emptyMap(), "none", Collections.emptyMap(), Collections.emptyMap(), Volume.Scope.Local, null)).getMountpoint());
6969
volumeApi.volumeDelete(volume.getName(), false);
7070
}
7171

@@ -75,7 +75,7 @@ public void volumePrune() {
7575
filter.put("label", Collections.singletonList(LABEL_KEY));
7676
String filterJson = new Moshi.Builder().build().adapter(Map.class).toJson(filter);
7777

78-
Volume volume = volumeApi.volumeCreate(new VolumeConfig("my-volume", null, Collections.emptyMap(), Collections.singletonMap(LABEL_KEY, LABEL_VALUE)));
78+
Volume volume = volumeApi.volumeCreate(new VolumeCreateOptions("my-volume", null, Collections.emptyMap(), Collections.singletonMap(LABEL_KEY, LABEL_VALUE)));
7979
VolumePruneResponse pruneResponse = volumeApi.volumePrune(filterJson);
8080
assertTrue(Objects.requireNonNull(pruneResponse.getVolumesDeleted()).stream().allMatch((v) -> v.equals(volume.getName())));
8181
}

0 commit comments

Comments
 (0)