Rename Docker registry properties

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java

@@ -22,7 +22,6 @@
 
 import com.spotify.docker.client.DockerClient.ListContainersParam;
 import com.spotify.docker.client.DockerClient.RemoveContainerParam;
-import com.spotify.docker.client.ProgressHandler;
 import com.spotify.docker.client.exceptions.DockerException;
 import com.spotify.docker.client.exceptions.NotFoundException;
 import com.spotify.docker.client.messages.Container.PortMapping;
@@ -32,7 +31,6 @@
 import com.spotify.docker.client.messages.HostConfig;
 import com.spotify.docker.client.messages.HostConfig.Builder;
 import com.spotify.docker.client.messages.PortBinding;
-import com.spotify.docker.client.messages.ProgressMessage;
 import com.spotify.docker.client.messages.RegistryAuth;
 import eu.openanalytics.containerproxy.model.runtime.Container;
 import eu.openanalytics.containerproxy.model.runtime.ExistingContainerInfo;
@@ -238,14 +236,14 @@ private boolean isImagePresent(ContainerSpec spec) throws DockerException, Inter
 	}
 
 	private void pullImage(ContainerSpec spec) throws DockerException, InterruptedException {
-		if (spec.getDockerSwarmRegistryDomain() != null
-				&& spec.getDockerSwarmRegistryUsername() != null
-				&& spec.getDockerSwarmRegistryPassword() != null) {
+		if (spec.getDockerRegistryDomain() != null
+				&& spec.getDockerRegistryUsername() != null
+				&& spec.getDockerRegistryPassword() != null) {
 
 			RegistryAuth registryAuth = RegistryAuth.builder()
-					.serverAddress(spec.getDockerSwarmRegistryDomain())
-					.username(spec.getDockerSwarmRegistryUsername())
-					.password(spec.getDockerSwarmRegistryPassword())
+					.serverAddress(spec.getDockerRegistryDomain())
+					.username(spec.getDockerRegistryUsername())
+					.password(spec.getDockerRegistryPassword())
 					.build();
 			dockerClient.pull(spec.getImage(), registryAuth, message -> {});
 		} else {

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java

@@ -137,14 +137,14 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
 		}
 
 		String serviceId;
-		if (spec.getDockerSwarmRegistryDomain() != null
-				&& spec.getDockerSwarmRegistryUsername() != null
-				&& spec.getDockerSwarmRegistryPassword() != null) {
+		if (spec.getDockerRegistryDomain() != null
+				&& spec.getDockerRegistryUsername() != null
+				&& spec.getDockerRegistryPassword() != null) {
 
 			RegistryAuth registryAuth = RegistryAuth.builder()
-					.serverAddress(spec.getDockerSwarmRegistryDomain())
-					.username(spec.getDockerSwarmRegistryUsername())
-					.password(spec.getDockerSwarmRegistryPassword())
+					.serverAddress(spec.getDockerRegistryDomain())
+					.username(spec.getDockerRegistryUsername())
+					.password(spec.getDockerRegistryPassword())
 					.build();
 			serviceId = dockerClient.createService(serviceSpecBuilder.build(), registryAuth).id();
 		} else {

src/main/java/eu/openanalytics/containerproxy/model/spec/ContainerSpec.java

@@ -46,9 +46,9 @@ public class ContainerSpec {
 	private Map<String, String> labels = new HashMap<>();
 	private Map<String, String> settings = new HashMap<>();
 	private List<DockerSwarmSecret> dockerSwarmSecrets = new ArrayList();
-	private String dockerSwarmRegistryDomain;
-	private String dockerSwarmRegistryUsername;
-	private String dockerSwarmRegistryPassword;
+	private String dockerRegistryDomain;
+	private String dockerRegistryUsername;
+	private String dockerRegistryPassword;
 
 	public String getImage() {
 		return image;
@@ -167,28 +167,28 @@ public void setDockerSwarmSecrets(List<DockerSwarmSecret> dockerSwarmSecrets) {
 		this.dockerSwarmSecrets = dockerSwarmSecrets;
 	}
 
-	public String getDockerSwarmRegistryDomain() {
-		return dockerSwarmRegistryDomain;
+	public String getDockerRegistryDomain() {
+		return dockerRegistryDomain;
 	}
 
-	public void setDockerSwarmRegistryDomain(String dockerSwarmRegistryDomain) {
-		this.dockerSwarmRegistryDomain = dockerSwarmRegistryDomain;
+	public void setDockerRegistryDomain(String dockerRegistryDomain) {
+		this.dockerRegistryDomain = dockerRegistryDomain;
 	}
 
-	public String getDockerSwarmRegistryUsername() {
-		return dockerSwarmRegistryUsername;
+	public String getDockerRegistryUsername() {
+		return dockerRegistryUsername;
 	}
 
-	public void setDockerSwarmRegistryUsername(String dockerSwarmRegistryUsername) {
-		this.dockerSwarmRegistryUsername = dockerSwarmRegistryUsername;
+	public void setDockerRegistryUsername(String dockerRegistryUsername) {
+		this.dockerRegistryUsername = dockerRegistryUsername;
 	}
 
-	public String getDockerSwarmRegistryPassword() {
-		return dockerSwarmRegistryPassword;
+	public String getDockerRegistryPassword() {
+		return dockerRegistryPassword;
 	}
 
-	public void setDockerSwarmRegistryPassword(String dockerSwarmRegistryPassword) {
-		this.dockerSwarmRegistryPassword = dockerSwarmRegistryPassword;
+	public void setDockerRegistryPassword(String dockerRegistryPassword) {
+		this.dockerRegistryPassword = dockerRegistryPassword;
 	}
 
 	public void copy(ContainerSpec target) {
@@ -224,9 +224,9 @@ public void copy(ContainerSpec target) {
 			if (target.getDockerSwarmSecrets() == null) target.setDockerSwarmSecrets(new ArrayList<>());
 			target.getDockerSwarmSecrets().addAll(dockerSwarmSecrets);
 		}
-		target.setDockerSwarmRegistryDomain(dockerSwarmRegistryDomain);
-		target.setDockerSwarmRegistryUsername(dockerSwarmRegistryUsername);
-		target.setDockerSwarmRegistryPassword(dockerSwarmRegistryPassword);
+		target.setDockerRegistryDomain(dockerRegistryDomain);
+		target.setDockerRegistryUsername(dockerRegistryUsername);
+		target.setDockerRegistryPassword(dockerRegistryPassword);
 		target.setTargetPath(targetPath);
 	}
 }

src/main/java/eu/openanalytics/containerproxy/spec/expression/ExpressionAwareContainerSpec.java

@@ -129,18 +129,18 @@ public List<DockerSwarmSecret> getDockerSwarmSecrets() {
 	}
 
 	@Override
-	public String getDockerSwarmRegistryDomain() {
-		return source.getDockerSwarmRegistryDomain();
+	public String getDockerRegistryDomain() {
+		return source.getDockerRegistryDomain();
 	}
 
 	@Override
-	public String getDockerSwarmRegistryUsername() {
-		return source.getDockerSwarmRegistryUsername();
+	public String getDockerRegistryUsername() {
+		return source.getDockerRegistryUsername();
 	}
 
 	@Override
-	public String getDockerSwarmRegistryPassword() {
-		return source.getDockerSwarmRegistryPassword();
+	public String getDockerRegistryPassword() {
+		return source.getDockerRegistryPassword();
 	}
 
 	@Override