From dbf39f4224c190003d13e652b3cdd5ab5ea1ca51 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 31 Mar 2016 12:27:21 +0300 Subject: [PATCH] Remove unused property Signed-off-by: Eugene Ivantsov --- .../org/eclipse/che/api/deploy/ApiModule.java | 2 - .../WEB-INF/classes/codenvy/che.properties | 1 - .../docker/client/DockerVersionVerifier.java | 61 ------------------- .../client/DockerVersionVerifierTest.java | 60 ------------------ 4 files changed, 124 deletions(-) delete mode 100644 plugins/plugin-docker/che-plugin-docker-client/src/main/java/org/eclipse/che/plugin/docker/client/DockerVersionVerifier.java delete mode 100644 plugins/plugin-docker/che-plugin-docker-client/src/test/java/org/eclipse/che/plugin/docker/client/DockerVersionVerifierTest.java diff --git a/assembly/assembly-ide-war/src/main/java/org/eclipse/che/api/deploy/ApiModule.java b/assembly/assembly-ide-war/src/main/java/org/eclipse/che/api/deploy/ApiModule.java index 9d367cbb6c..ca9f0d0451 100644 --- a/assembly/assembly-ide-war/src/main/java/org/eclipse/che/api/deploy/ApiModule.java +++ b/assembly/assembly-ide-war/src/main/java/org/eclipse/che/api/deploy/ApiModule.java @@ -65,8 +65,6 @@ public class ApiModule extends AbstractModule { bind(EverrestDownloadFileResponseFilter.class); bind(ETagResponseFilter.class); -// bind(DockerVersionVerifier.class).asEagerSingleton(); - bind(UserService.class); bind(UserProfileService.class); diff --git a/assembly/assembly-ide-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties b/assembly/assembly-ide-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties index eed4699324..ec9154338c 100644 --- a/assembly/assembly-ide-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties +++ b/assembly/assembly-ide-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties @@ -87,7 +87,6 @@ machine.logs.location=${che.logs.dir}/machine/logs # Size of the machine by default. What is used if RAM parameter not provided by user or API. machine.default_mem_size_mb=1024 -machine.supported_docker_version=1.6.0,1.6.1,1.6.2,1.7.1,1.8.1 # When the workspace master launches a new workspace, Che performs checks of the internal Web # services. When Che gets a valid response, we know that the workspace agent is ready for use. diff --git a/plugins/plugin-docker/che-plugin-docker-client/src/main/java/org/eclipse/che/plugin/docker/client/DockerVersionVerifier.java b/plugins/plugin-docker/che-plugin-docker-client/src/main/java/org/eclipse/che/plugin/docker/client/DockerVersionVerifier.java deleted file mode 100644 index 02a8c9d22d..0000000000 --- a/plugins/plugin-docker/che-plugin-docker-client/src/main/java/org/eclipse/che/plugin/docker/client/DockerVersionVerifier.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.docker.client; - -import com.google.common.collect.Sets; -import com.google.inject.Inject; -import com.google.inject.Singleton; - -import org.eclipse.che.api.core.ServerException; -import org.eclipse.che.plugin.docker.client.json.Version; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.PostConstruct; -import javax.inject.Named; -import java.io.IOException; -import java.util.Set; - -/** - * Verifies compatibility with docker api version. - * - * @author Anton Korneta - */ -@Singleton -public class DockerVersionVerifier { - - private final DockerConnector dockerConnector; - private final Set supportedVersions; - - private static final Logger LOG = LoggerFactory.getLogger(DockerVersionVerifier.class); - - @Inject - public DockerVersionVerifier(DockerConnector dockerConnector, @Named("machine.supported_docker_version") String[] supportedVersions) { - this.dockerConnector = dockerConnector; - this.supportedVersions = Sets.newHashSet(supportedVersions); - } - - /** - * Check docker version compatibility. - */ - @PostConstruct - void checkCompatibility() throws ServerException { - try { - Version versionInfo = dockerConnector.getVersion(); - if (!supportedVersions.contains(versionInfo.getVersion())) { - throw new ServerException("Unsupported docker version " + versionInfo.getVersion()); - } - } catch (IOException e) { - LOG.info(e.getMessage()); - throw new ServerException("Impossible to get docker version", e); - } - } -} diff --git a/plugins/plugin-docker/che-plugin-docker-client/src/test/java/org/eclipse/che/plugin/docker/client/DockerVersionVerifierTest.java b/plugins/plugin-docker/che-plugin-docker-client/src/test/java/org/eclipse/che/plugin/docker/client/DockerVersionVerifierTest.java deleted file mode 100644 index 183511794c..0000000000 --- a/plugins/plugin-docker/che-plugin-docker-client/src/test/java/org/eclipse/che/plugin/docker/client/DockerVersionVerifierTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2016 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.docker.client; - -import org.eclipse.che.api.core.ServerException; -import org.eclipse.che.plugin.docker.client.json.Version; -import org.mockito.Mock; -import org.mockito.testng.MockitoTestNGListener; -import org.testng.annotations.Listeners; -import org.testng.annotations.Test; - -import java.io.IOException; - -import static org.mockito.Mockito.when; - -/** - * @author Anton Korneta - */ -@Listeners(MockitoTestNGListener.class) -public class DockerVersionVerifierTest { - - @Mock - private DockerConnector dockerConnector; - - @Test(expectedExceptions = ServerException.class, expectedExceptionsMessageRegExp = "Unsupported docker version x.x.x") - public void shouldThrowServerExceptionWhenDockerVersionIsIncompatible() throws Exception { - //mock docker version - Version version = new Version(); - version.setVersion("x.x.x"); - when(dockerConnector.getVersion()).thenReturn(version); - //prepare verifies - DockerVersionVerifier verifier = new DockerVersionVerifier(dockerConnector, new String[]{"1.6.0"}); - - verifier.checkCompatibility(); - } - - @Test(expectedExceptions = ServerException.class, expectedExceptionsMessageRegExp = "Impossible to get docker version") - public void shouldThrowIOExceptionWhenVersionJsonParsing() throws Exception { - when(dockerConnector.getVersion()).thenThrow(new IOException()); - DockerVersionVerifier verifier = new DockerVersionVerifier(dockerConnector, new String[]{"1.6.0"}); - verifier.checkCompatibility(); - } - - @Test - public void supportedVersionTest() throws Exception { - Version version = new Version(); - version.setVersion("1.6.0"); - when(dockerConnector.getVersion()).thenReturn(version); - DockerVersionVerifier verifier = new DockerVersionVerifier(dockerConnector, new String[]{"1.6.0"}); - verifier.checkCompatibility(); - } -}