Skip to content

Commit c8757d4

Browse files
KostyaShaKostyaSha
committed
Missing methods.
1 parent dcb2029 commit c8757d4

File tree

4 files changed

+136
-4
lines changed

4 files changed

+136
-4
lines changed

‎src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,43 @@ public interface DockerCmdExecFactory extends Closeable {
128128

129129
UpdateSwarmCmd.Exec createUpdateSwarmCmdExec();
130130

131+
/**
132+
* Command to list all services in a docker swarm. Only applicable if docker runs in swarm mode.
133+
*
134+
* @since {@link RemoteApiVersion#VERSION_1_24}
135+
*/
136+
ListServicesCmd.Exec createListServicesCmdExec();
137+
138+
/**
139+
* Command to create a new service in a docker swarm. Only applicable if docker runs in swarm mode.
140+
*
141+
* @since {@link RemoteApiVersion#VERSION_1_24}
142+
*/
143+
CreateServiceCmd.Exec createCreateServiceCmdExec();
144+
145+
/**
146+
* Command to inspect a service in a docker swarm. Only applicable if docker runs in swarm mode.
147+
*
148+
* @since {@link RemoteApiVersion#VERSION_1_24}
149+
*/
150+
InspectServiceCmd.Exec createInspectServiceCmdExec();
151+
152+
/**
153+
* Command to update a service specification in a docker swarm. Only applicable if docker runs in swarm mode.
154+
*
155+
* @since {@link RemoteApiVersion#VERSION_1_24}
156+
*/
157+
UpdateServiceCmd.Exec createUpdateServiceCmdExec();
158+
159+
/**
160+
* Command to remove a service in a docker swarm. Only applicable if docker runs in swarm mode.
161+
*
162+
* @since {@link RemoteApiVersion#VERSION_1_24}
163+
*/
164+
RemoveServiceCmd.Exec createRemoveServiceCmdExec();
165+
131166
// nodes
167+
132168
/**
133169
* List all nodes. Node operations require the engine to be part of a swarm
134170
*
@@ -158,8 +194,6 @@ public interface DockerCmdExecFactory extends Closeable {
158194
UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec();
159195

160196

161-
162-
163197
@Override
164198
void close() throws IOException;
165199

‎src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.github.dockerjava.api.command.CreateContainerCmd;
1616
import com.github.dockerjava.api.command.CreateImageCmd;
1717
import com.github.dockerjava.api.command.CreateNetworkCmd;
18+
import com.github.dockerjava.api.command.CreateServiceCmd;
1819
import com.github.dockerjava.api.command.CreateVolumeCmd;
1920
import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
2021
import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -27,6 +28,7 @@
2728
import com.github.dockerjava.api.command.InspectExecCmd;
2829
import com.github.dockerjava.api.command.InspectImageCmd;
2930
import com.github.dockerjava.api.command.InspectNetworkCmd;
31+
import com.github.dockerjava.api.command.InspectServiceCmd;
3032
import com.github.dockerjava.api.command.InspectSwarmCmd;
3133
import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
3234
import com.github.dockerjava.api.command.InspectVolumeCmd;
@@ -36,6 +38,7 @@
3638
import com.github.dockerjava.api.command.ListContainersCmd;
3739
import com.github.dockerjava.api.command.ListImagesCmd;
3840
import com.github.dockerjava.api.command.ListNetworksCmd;
41+
import com.github.dockerjava.api.command.ListServicesCmd;
3942
import com.github.dockerjava.api.command.ListSwarmNodesCmd;
4043
import com.github.dockerjava.api.command.ListVolumesCmd;
4144
import com.github.dockerjava.api.command.LoadImageCmd;
@@ -47,6 +50,7 @@
4750
import com.github.dockerjava.api.command.RemoveContainerCmd;
4851
import com.github.dockerjava.api.command.RemoveImageCmd;
4952
import com.github.dockerjava.api.command.RemoveNetworkCmd;
53+
import com.github.dockerjava.api.command.RemoveServiceCmd;
5054
import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
5155
import com.github.dockerjava.api.command.RemoveVolumeCmd;
5256
import com.github.dockerjava.api.command.RenameContainerCmd;
@@ -60,6 +64,7 @@
6064
import com.github.dockerjava.api.command.TopContainerCmd;
6165
import com.github.dockerjava.api.command.UnpauseContainerCmd;
6266
import com.github.dockerjava.api.command.UpdateContainerCmd;
67+
import com.github.dockerjava.api.command.UpdateServiceCmd;
6368
import com.github.dockerjava.api.command.UpdateSwarmCmd;
6469
import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
6570
import com.github.dockerjava.api.command.VersionCmd;
@@ -588,6 +593,33 @@ public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
588593
return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig());
589594
}
590595

596+
// service
597+
@Override
598+
public ListServicesCmd.Exec createListServicesCmdExec() {
599+
return new ListServicesCmdExec(getBaseResource(), getDockerClientConfig());
600+
}
601+
602+
@Override
603+
public CreateServiceCmd.Exec createCreateServiceCmdExec() {
604+
return new CreateServiceCmdExec(getBaseResource(), getDockerClientConfig());
605+
}
606+
607+
@Override
608+
public InspectServiceCmd.Exec createInspectServiceCmdExec() {
609+
return new InspectServiceCmdExec(getBaseResource(), getDockerClientConfig());
610+
}
611+
612+
@Override
613+
public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
614+
return new UpdateServiceCmdExec(getBaseResource(), getDockerClientConfig());
615+
}
616+
617+
@Override
618+
public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
619+
return new RemoveServiceCmdExec(getBaseResource(), getDockerClientConfig());
620+
}
621+
622+
//node
591623
@Override
592624
public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
593625
return new ListSwarmNodesCmdExec(getBaseResource(), getDockerClientConfig());

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.github.dockerjava.api.command.CreateContainerCmd;
1313
import com.github.dockerjava.api.command.CreateImageCmd;
1414
import com.github.dockerjava.api.command.CreateNetworkCmd;
15+
import com.github.dockerjava.api.command.CreateServiceCmd;
1516
import com.github.dockerjava.api.command.CreateVolumeCmd;
1617
import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
1718
import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -24,6 +25,7 @@
2425
import com.github.dockerjava.api.command.InspectExecCmd;
2526
import com.github.dockerjava.api.command.InspectImageCmd;
2627
import com.github.dockerjava.api.command.InspectNetworkCmd;
28+
import com.github.dockerjava.api.command.InspectServiceCmd;
2729
import com.github.dockerjava.api.command.InspectSwarmCmd;
2830
import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
2931
import com.github.dockerjava.api.command.InspectVolumeCmd;
@@ -33,6 +35,7 @@
3335
import com.github.dockerjava.api.command.ListContainersCmd;
3436
import com.github.dockerjava.api.command.ListImagesCmd;
3537
import com.github.dockerjava.api.command.ListNetworksCmd;
38+
import com.github.dockerjava.api.command.ListServicesCmd;
3639
import com.github.dockerjava.api.command.ListSwarmNodesCmd;
3740
import com.github.dockerjava.api.command.ListVolumesCmd;
3841
import com.github.dockerjava.api.command.LoadImageCmd;
@@ -44,6 +47,7 @@
4447
import com.github.dockerjava.api.command.RemoveContainerCmd;
4548
import com.github.dockerjava.api.command.RemoveImageCmd;
4649
import com.github.dockerjava.api.command.RemoveNetworkCmd;
50+
import com.github.dockerjava.api.command.RemoveServiceCmd;
4751
import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
4852
import com.github.dockerjava.api.command.RemoveVolumeCmd;
4953
import com.github.dockerjava.api.command.RenameContainerCmd;
@@ -57,6 +61,7 @@
5761
import com.github.dockerjava.api.command.TopContainerCmd;
5862
import com.github.dockerjava.api.command.UnpauseContainerCmd;
5963
import com.github.dockerjava.api.command.UpdateContainerCmd;
64+
import com.github.dockerjava.api.command.UpdateServiceCmd;
6065
import com.github.dockerjava.api.command.UpdateSwarmCmd;
6166
import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
6267
import com.github.dockerjava.api.command.VersionCmd;
@@ -76,6 +81,7 @@
7681
import com.github.dockerjava.netty.exec.CreateContainerCmdExec;
7782
import com.github.dockerjava.netty.exec.CreateImageCmdExec;
7883
import com.github.dockerjava.netty.exec.CreateNetworkCmdExec;
84+
import com.github.dockerjava.netty.exec.CreateServiceCmdExec;
7985
import com.github.dockerjava.netty.exec.CreateVolumeCmdExec;
8086
import com.github.dockerjava.netty.exec.DisconnectFromNetworkCmdExec;
8187
import com.github.dockerjava.netty.exec.EventsCmdExec;
@@ -87,6 +93,7 @@
8793
import com.github.dockerjava.netty.exec.InspectExecCmdExec;
8894
import com.github.dockerjava.netty.exec.InspectImageCmdExec;
8995
import com.github.dockerjava.netty.exec.InspectNetworkCmdExec;
96+
import com.github.dockerjava.netty.exec.InspectServiceCmdExec;
9097
import com.github.dockerjava.netty.exec.InspectSwarmCmdExec;
9198
import com.github.dockerjava.netty.exec.InspectSwarmNodeCmdExec;
9299
import com.github.dockerjava.netty.exec.InspectVolumeCmdExec;
@@ -96,6 +103,7 @@
96103
import com.github.dockerjava.netty.exec.ListContainersCmdExec;
97104
import com.github.dockerjava.netty.exec.ListImagesCmdExec;
98105
import com.github.dockerjava.netty.exec.ListNetworksCmdExec;
106+
import com.github.dockerjava.netty.exec.ListServicesCmdExec;
99107
import com.github.dockerjava.netty.exec.ListSwarmNodesCmdExec;
100108
import com.github.dockerjava.netty.exec.ListVolumesCmdExec;
101109
import com.github.dockerjava.netty.exec.LoadImageCmdExec;
@@ -107,6 +115,7 @@
107115
import com.github.dockerjava.netty.exec.RemoveContainerCmdExec;
108116
import com.github.dockerjava.netty.exec.RemoveImageCmdExec;
109117
import com.github.dockerjava.netty.exec.RemoveNetworkCmdExec;
118+
import com.github.dockerjava.netty.exec.RemoveServiceCmdExec;
110119
import com.github.dockerjava.netty.exec.RemoveSwarmNodeCmdExec;
111120
import com.github.dockerjava.netty.exec.RemoveVolumeCmdExec;
112121
import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
@@ -120,6 +129,7 @@
120129
import com.github.dockerjava.netty.exec.TopContainerCmdExec;
121130
import com.github.dockerjava.netty.exec.UnpauseContainerCmdExec;
122131
import com.github.dockerjava.netty.exec.UpdateContainerCmdExec;
132+
import com.github.dockerjava.netty.exec.UpdateServiceCmdExec;
123133
import com.github.dockerjava.netty.exec.UpdateSwarmCmdExec;
124134
import com.github.dockerjava.netty.exec.UpdateSwarmNodeCmdExec;
125135
import com.github.dockerjava.netty.exec.VersionCmdExec;
@@ -636,6 +646,32 @@ public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
636646
return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig());
637647
}
638648

649+
// services
650+
@Override
651+
public ListServicesCmd.Exec createListServicesCmdExec() {
652+
return new ListServicesCmdExec(getBaseResource(), getDockerClientConfig());
653+
}
654+
655+
@Override
656+
public CreateServiceCmd.Exec createCreateServiceCmdExec() {
657+
return new CreateServiceCmdExec(getBaseResource(), getDockerClientConfig());
658+
}
659+
660+
@Override
661+
public InspectServiceCmd.Exec createInspectServiceCmdExec() {
662+
return new InspectServiceCmdExec(getBaseResource(), getDockerClientConfig());
663+
}
664+
665+
@Override
666+
public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
667+
return new UpdateServiceCmdExec(getBaseResource(), getDockerClientConfig());
668+
}
669+
670+
@Override
671+
public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
672+
return new RemoveServiceCmdExec(getBaseResource(), getDockerClientConfig());
673+
}
674+
639675
// nodes
640676
@Override
641677
public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {

‎src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.github.dockerjava.api.command.CreateImageResponse;
1717
import com.github.dockerjava.api.command.CreateNetworkCmd;
1818
import com.github.dockerjava.api.command.CreateNetworkResponse;
19+
import com.github.dockerjava.api.command.CreateServiceCmd;
1920
import com.github.dockerjava.api.command.CreateVolumeCmd;
2021
import com.github.dockerjava.api.command.CreateVolumeResponse;
2122
import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
@@ -29,6 +30,7 @@
2930
import com.github.dockerjava.api.command.InspectExecCmd;
3031
import com.github.dockerjava.api.command.InspectImageCmd;
3132
import com.github.dockerjava.api.command.InspectNetworkCmd;
33+
import com.github.dockerjava.api.command.InspectServiceCmd;
3234
import com.github.dockerjava.api.command.InspectSwarmCmd;
3335
import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
3436
import com.github.dockerjava.api.command.InspectVolumeCmd;
@@ -38,6 +40,7 @@
3840
import com.github.dockerjava.api.command.ListContainersCmd;
3941
import com.github.dockerjava.api.command.ListImagesCmd;
4042
import com.github.dockerjava.api.command.ListNetworksCmd;
43+
import com.github.dockerjava.api.command.ListServicesCmd;
4144
import com.github.dockerjava.api.command.ListSwarmNodesCmd;
4245
import com.github.dockerjava.api.command.ListVolumesCmd;
4346
import com.github.dockerjava.api.command.LoadImageCmd;
@@ -49,6 +52,7 @@
4952
import com.github.dockerjava.api.command.RemoveContainerCmd;
5053
import com.github.dockerjava.api.command.RemoveImageCmd;
5154
import com.github.dockerjava.api.command.RemoveNetworkCmd;
55+
import com.github.dockerjava.api.command.RemoveServiceCmd;
5256
import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
5357
import com.github.dockerjava.api.command.RemoveVolumeCmd;
5458
import com.github.dockerjava.api.command.RenameContainerCmd;
@@ -62,6 +66,7 @@
6266
import com.github.dockerjava.api.command.TopContainerCmd;
6367
import com.github.dockerjava.api.command.UnpauseContainerCmd;
6468
import com.github.dockerjava.api.command.UpdateContainerCmd;
69+
import com.github.dockerjava.api.command.UpdateServiceCmd;
6570
import com.github.dockerjava.api.command.UpdateSwarmCmd;
6671
import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
6772
import com.github.dockerjava.api.command.VersionCmd;
@@ -313,7 +318,7 @@ public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
313318
}
314319

315320
@Override
316-
public RenameContainerCmd.Exec createRenameContainerCmdExec(){
321+
public RenameContainerCmd.Exec createRenameContainerCmdExec() {
317322
return delegate.createRenameContainerCmdExec();
318323
}
319324

@@ -462,6 +467,32 @@ public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
462467
return delegate.createUpdateSwarmCmdExec();
463468
}
464469

470+
// services
471+
@Override
472+
public ListServicesCmd.Exec createListServicesCmdExec() {
473+
return delegate.createListServicesCmdExec();
474+
}
475+
476+
@Override
477+
public CreateServiceCmd.Exec createCreateServiceCmdExec() {
478+
return delegate.createCreateServiceCmdExec();
479+
}
480+
481+
@Override
482+
public InspectServiceCmd.Exec createInspectServiceCmdExec() {
483+
return delegate.createInspectServiceCmdExec();
484+
}
485+
486+
@Override
487+
public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
488+
return delegate.createUpdateServiceCmdExec();
489+
}
490+
491+
@Override
492+
public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
493+
return delegate.createRemoveServiceCmdExec();
494+
}
495+
465496
// nodes
466497
@Override
467498
public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
@@ -483,7 +514,6 @@ public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
483514
return delegate.updateSwarmNodeCmdExec();
484515
}
485516

486-
487517
public List<String> getContainerNames() {
488518
return new ArrayList<String>(containerNames);
489519
}

0 commit comments

Comments
 (0)