Move Docker client to Docker infrastructure packaging (#6779)

Also, remove OpenShiftConnector as it is replaced with OpenShift
infrastructure.
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
6.19.x
Oleksandr Garagatyi 2017-10-18 15:08:55 +03:00 committed by GitHub
parent 4c5566ce94
commit 90142e268c
350 changed files with 802 additions and 5621 deletions

1
.github/CODEOWNERS vendored
View File

@ -27,7 +27,6 @@ infrastructures/** @garagatyi
plugins/plugin*debugger/** @tolusha
plugins/plugin-gdb/** @tolusha
plugins/plugin-docker/** @garagatyi
plugins/plugin-docker/che-plugin-openshift-client/** @l0rd
plugins/plugin-java/** @evidolob
plugins/plugin-languageserver/** @evidolob @dkuleshov
plugins/plugin-maven/** @evidolob

View File

@ -27,10 +27,6 @@
<artifactId>assembly-wsmaster-war</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>infrastructure-openshift</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-factory</artifactId>
@ -51,6 +47,10 @@
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-db-vendor-postgresql</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.infrastructure</groupId>
<artifactId>infrastructure-openshift</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.multiuser</groupId>
<artifactId>che-multiuser-api-authorization-impl</artifactId>

View File

@ -31,6 +31,10 @@
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-ide-core</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.infrastructure.docker</groupId>
<artifactId>docker-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-activity-ide</artifactId>
@ -51,10 +55,6 @@
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-debugger-ide</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-docker-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-ext-dashboard-client</artifactId>
@ -143,10 +143,6 @@
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-nodejs-lang-shared</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-openshift-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-orion-compare</artifactId>

View File

@ -76,14 +76,6 @@
<groupId>org.eclipse.che</groupId>
<artifactId>git-credentials-agent</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>infrastructure-docker</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>infrastructure-openshift</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che</groupId>
<artifactId>ls-csharp-agent</artifactId>
@ -196,6 +188,18 @@
<groupId>org.eclipse.che.core</groupId>
<artifactId>wsmaster-local</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.infrastructure</groupId>
<artifactId>infrastructure-openshift</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.infrastructure.docker</groupId>
<artifactId>docker-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.infrastructure.docker</groupId>
<artifactId>infrastructure-docker</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.lib</groupId>
<artifactId>che-swagger-module</artifactId>
@ -204,15 +208,6 @@
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-activity-wsmaster</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-docker-client</artifactId>
</dependency>
<!--FIXME: spi-->
<!--<dependency>-->
<!--<groupId>org.eclipse.che.plugin</groupId>-->
<!--<artifactId>che-plugin-docker-compose</artifactId>-->
<!--</dependency>-->
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-github-factory-resolver</artifactId>
@ -225,23 +220,6 @@
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-github-shared</artifactId>
</dependency>
<!--FIXME: spi-->
<!--<dependency>-->
<!--<groupId>org.eclipse.che.plugin</groupId>-->
<!--<artifactId>che-plugin-machine-ext-server</artifactId>-->
<!--</dependency>-->
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-maven-wsmaster</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-openshift-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-traefik-docker</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-url-factory</artifactId>

View File

@ -14,13 +14,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>che-plugin-docker-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-infrastructures-docker-parent</artifactId>
<groupId>org.eclipse.che.infrastructure.docker</groupId>
<version>5.20.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-docker-client</artifactId>
<artifactId>docker-client</artifactId>
<packaging>jar</packaging>
<name>Che Plugin :: Docker :: Docker Client</name>
<name>Infrastructure :: Docker :: Docker Client</name>
<properties>
<findbugs.failonerror>false</findbugs.failonerror>
</properties>
@ -154,18 +155,18 @@
</goals>
<configuration>
<dtoPackages>
<package>org.eclipse.che.plugin.docker.client.dto</package>
<package>org.eclipse.che.infrastructure.docker.client.dto</package>
</dtoPackages>
<outputDirectory>${dto-generator-out-directory}</outputDirectory>
<genClassName>org.eclipse.che.plugin.docker.client.dto.DtoServerImpls</genClassName>
<genClassName>org.eclipse.che.infrastructure.docker.client.dto.DtoServerImpls</genClassName>
<impl>server</impl>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-docker-client</artifactId>
<groupId>org.eclipse.che.infrastructure.docker</groupId>
<artifactId>docker-client</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import com.sun.jna.Library;
import com.sun.jna.Structure;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import com.sun.jna.Native;
import org.eclipse.che.api.core.util.SystemInfo;

View File

@ -8,9 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
import static org.eclipse.che.plugin.docker.client.CLibraryFactory.getCLibrary;
package org.eclipse.che.infrastructure.docker.client;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.sun.jna.ptr.LongByReference;
@ -186,7 +184,7 @@ public class CgroupOOMDetector implements DockerOOMDetector {
this.container = container;
this.containerLogProcessor = containerLogProcessor;
this.memory = memory;
cLib = getCLibrary();
cLib = CLibraryFactory.getCLibrary();
if (systemd) {
containerCgroup = cgroupMount + "/memory/system.slice/docker-" + container + ".scope/";

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import static java.lang.String.format;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import java.io.File;
import java.io.IOException;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
@ -51,67 +51,67 @@ import org.eclipse.che.commons.annotation.Nullable;
import org.eclipse.che.commons.lang.TarUtils;
import org.eclipse.che.commons.lang.concurrent.LoggingUncaughtExceptionHandler;
import org.eclipse.che.commons.lang.ws.rs.ExtMediaType;
import org.eclipse.che.plugin.docker.client.connection.CloseConnectionInputStream;
import org.eclipse.che.plugin.docker.client.connection.DockerConnection;
import org.eclipse.che.plugin.docker.client.connection.DockerConnectionFactory;
import org.eclipse.che.plugin.docker.client.connection.DockerResponse;
import org.eclipse.che.plugin.docker.client.exception.ContainerNotFoundException;
import org.eclipse.che.plugin.docker.client.exception.DockerException;
import org.eclipse.che.plugin.docker.client.exception.ExecNotFoundException;
import org.eclipse.che.plugin.docker.client.exception.ImageNotFoundException;
import org.eclipse.che.plugin.docker.client.exception.NetworkNotFoundException;
import org.eclipse.che.plugin.docker.client.json.ContainerCommitted;
import org.eclipse.che.plugin.docker.client.json.ContainerCreated;
import org.eclipse.che.plugin.docker.client.json.ContainerExitStatus;
import org.eclipse.che.plugin.docker.client.json.ContainerInfo;
import org.eclipse.che.plugin.docker.client.json.ContainerListEntry;
import org.eclipse.che.plugin.docker.client.json.ContainerProcesses;
import org.eclipse.che.plugin.docker.client.json.Event;
import org.eclipse.che.plugin.docker.client.json.ExecConfig;
import org.eclipse.che.plugin.docker.client.json.ExecCreated;
import org.eclipse.che.plugin.docker.client.json.ExecInfo;
import org.eclipse.che.plugin.docker.client.json.ExecStart;
import org.eclipse.che.plugin.docker.client.json.Filters;
import org.eclipse.che.plugin.docker.client.json.Image;
import org.eclipse.che.plugin.docker.client.json.ImageInfo;
import org.eclipse.che.plugin.docker.client.json.NetworkCreated;
import org.eclipse.che.plugin.docker.client.json.ProgressStatus;
import org.eclipse.che.plugin.docker.client.json.SystemInfo;
import org.eclipse.che.plugin.docker.client.json.Version;
import org.eclipse.che.plugin.docker.client.json.network.ConnectContainer;
import org.eclipse.che.plugin.docker.client.json.network.DisconnectContainer;
import org.eclipse.che.plugin.docker.client.json.network.Network;
import org.eclipse.che.plugin.docker.client.params.AttachContainerParams;
import org.eclipse.che.plugin.docker.client.params.BuildImageParams;
import org.eclipse.che.plugin.docker.client.params.CommitParams;
import org.eclipse.che.plugin.docker.client.params.CreateContainerParams;
import org.eclipse.che.plugin.docker.client.params.CreateExecParams;
import org.eclipse.che.plugin.docker.client.params.GetContainerLogsParams;
import org.eclipse.che.plugin.docker.client.params.GetEventsParams;
import org.eclipse.che.plugin.docker.client.params.GetExecInfoParams;
import org.eclipse.che.plugin.docker.client.params.GetResourceParams;
import org.eclipse.che.plugin.docker.client.params.InspectContainerParams;
import org.eclipse.che.plugin.docker.client.params.InspectImageParams;
import org.eclipse.che.plugin.docker.client.params.KillContainerParams;
import org.eclipse.che.plugin.docker.client.params.ListContainersParams;
import org.eclipse.che.plugin.docker.client.params.ListImagesParams;
import org.eclipse.che.plugin.docker.client.params.PullParams;
import org.eclipse.che.plugin.docker.client.params.PushParams;
import org.eclipse.che.plugin.docker.client.params.PutResourceParams;
import org.eclipse.che.plugin.docker.client.params.RemoveContainerParams;
import org.eclipse.che.plugin.docker.client.params.RemoveImageParams;
import org.eclipse.che.plugin.docker.client.params.StartContainerParams;
import org.eclipse.che.plugin.docker.client.params.StartExecParams;
import org.eclipse.che.plugin.docker.client.params.StopContainerParams;
import org.eclipse.che.plugin.docker.client.params.TagParams;
import org.eclipse.che.plugin.docker.client.params.TopParams;
import org.eclipse.che.plugin.docker.client.params.WaitContainerParams;
import org.eclipse.che.plugin.docker.client.params.network.ConnectContainerToNetworkParams;
import org.eclipse.che.plugin.docker.client.params.network.CreateNetworkParams;
import org.eclipse.che.plugin.docker.client.params.network.DisconnectContainerFromNetworkParams;
import org.eclipse.che.plugin.docker.client.params.network.GetNetworksParams;
import org.eclipse.che.plugin.docker.client.params.network.InspectNetworkParams;
import org.eclipse.che.plugin.docker.client.params.network.RemoveNetworkParams;
import org.eclipse.che.infrastructure.docker.client.connection.CloseConnectionInputStream;
import org.eclipse.che.infrastructure.docker.client.connection.DockerConnection;
import org.eclipse.che.infrastructure.docker.client.connection.DockerConnectionFactory;
import org.eclipse.che.infrastructure.docker.client.connection.DockerResponse;
import org.eclipse.che.infrastructure.docker.client.exception.ContainerNotFoundException;
import org.eclipse.che.infrastructure.docker.client.exception.DockerException;
import org.eclipse.che.infrastructure.docker.client.exception.ExecNotFoundException;
import org.eclipse.che.infrastructure.docker.client.exception.ImageNotFoundException;
import org.eclipse.che.infrastructure.docker.client.exception.NetworkNotFoundException;
import org.eclipse.che.infrastructure.docker.client.json.ContainerCommitted;
import org.eclipse.che.infrastructure.docker.client.json.ContainerCreated;
import org.eclipse.che.infrastructure.docker.client.json.ContainerExitStatus;
import org.eclipse.che.infrastructure.docker.client.json.ContainerInfo;
import org.eclipse.che.infrastructure.docker.client.json.ContainerListEntry;
import org.eclipse.che.infrastructure.docker.client.json.ContainerProcesses;
import org.eclipse.che.infrastructure.docker.client.json.Event;
import org.eclipse.che.infrastructure.docker.client.json.ExecConfig;
import org.eclipse.che.infrastructure.docker.client.json.ExecCreated;
import org.eclipse.che.infrastructure.docker.client.json.ExecInfo;
import org.eclipse.che.infrastructure.docker.client.json.ExecStart;
import org.eclipse.che.infrastructure.docker.client.json.Filters;
import org.eclipse.che.infrastructure.docker.client.json.Image;
import org.eclipse.che.infrastructure.docker.client.json.ImageInfo;
import org.eclipse.che.infrastructure.docker.client.json.NetworkCreated;
import org.eclipse.che.infrastructure.docker.client.json.ProgressStatus;
import org.eclipse.che.infrastructure.docker.client.json.SystemInfo;
import org.eclipse.che.infrastructure.docker.client.json.Version;
import org.eclipse.che.infrastructure.docker.client.json.network.ConnectContainer;
import org.eclipse.che.infrastructure.docker.client.json.network.DisconnectContainer;
import org.eclipse.che.infrastructure.docker.client.json.network.Network;
import org.eclipse.che.infrastructure.docker.client.params.AttachContainerParams;
import org.eclipse.che.infrastructure.docker.client.params.BuildImageParams;
import org.eclipse.che.infrastructure.docker.client.params.CommitParams;
import org.eclipse.che.infrastructure.docker.client.params.CreateContainerParams;
import org.eclipse.che.infrastructure.docker.client.params.CreateExecParams;
import org.eclipse.che.infrastructure.docker.client.params.GetContainerLogsParams;
import org.eclipse.che.infrastructure.docker.client.params.GetEventsParams;
import org.eclipse.che.infrastructure.docker.client.params.GetExecInfoParams;
import org.eclipse.che.infrastructure.docker.client.params.GetResourceParams;
import org.eclipse.che.infrastructure.docker.client.params.InspectContainerParams;
import org.eclipse.che.infrastructure.docker.client.params.InspectImageParams;
import org.eclipse.che.infrastructure.docker.client.params.KillContainerParams;
import org.eclipse.che.infrastructure.docker.client.params.ListContainersParams;
import org.eclipse.che.infrastructure.docker.client.params.ListImagesParams;
import org.eclipse.che.infrastructure.docker.client.params.PullParams;
import org.eclipse.che.infrastructure.docker.client.params.PushParams;
import org.eclipse.che.infrastructure.docker.client.params.PutResourceParams;
import org.eclipse.che.infrastructure.docker.client.params.RemoveContainerParams;
import org.eclipse.che.infrastructure.docker.client.params.RemoveImageParams;
import org.eclipse.che.infrastructure.docker.client.params.StartContainerParams;
import org.eclipse.che.infrastructure.docker.client.params.StartExecParams;
import org.eclipse.che.infrastructure.docker.client.params.StopContainerParams;
import org.eclipse.che.infrastructure.docker.client.params.TagParams;
import org.eclipse.che.infrastructure.docker.client.params.TopParams;
import org.eclipse.che.infrastructure.docker.client.params.WaitContainerParams;
import org.eclipse.che.infrastructure.docker.client.params.network.ConnectContainerToNetworkParams;
import org.eclipse.che.infrastructure.docker.client.params.network.CreateNetworkParams;
import org.eclipse.che.infrastructure.docker.client.params.network.DisconnectContainerFromNetworkParams;
import org.eclipse.che.infrastructure.docker.client.params.network.GetNetworksParams;
import org.eclipse.che.infrastructure.docker.client.params.network.InspectNetworkParams;
import org.eclipse.che.infrastructure.docker.client.params.network.RemoveNetworkParams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import static java.io.File.separatorChar;
@ -25,7 +25,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.validation.constraints.NotNull;
import org.eclipse.che.api.core.util.SystemInfo;
import org.eclipse.che.plugin.docker.client.helper.NetworkFinder;
import org.eclipse.che.infrastructure.docker.client.helper.NetworkFinder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import com.google.inject.Inject;
import com.google.inject.Provider;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import org.eclipse.che.api.core.ApiException;
import org.eclipse.che.api.core.rest.shared.dto.ServiceError;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import java.util.LinkedHashMap;
import java.util.LinkedList;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import com.google.inject.ImplementedBy;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import static com.google.common.collect.Sets.newHashSet;
@ -20,8 +20,8 @@ import java.util.Map;
import java.util.Set;
import org.eclipse.che.commons.annotation.Nullable;
import org.eclipse.che.commons.json.JsonHelper;
import org.eclipse.che.plugin.docker.client.dto.AuthConfig;
import org.eclipse.che.plugin.docker.client.dto.AuthConfigs;
import org.eclipse.che.infrastructure.docker.client.dto.AuthConfig;
import org.eclipse.che.infrastructure.docker.client.dto.AuthConfigs;
/**
* Class for preparing auth header value for docker registry.

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import static com.google.common.base.Strings.isNullOrEmpty;

View File

@ -8,11 +8,11 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import java.util.Map;
import org.eclipse.che.commons.annotation.Nullable;
import org.eclipse.che.plugin.docker.client.dto.AuthConfig;
import org.eclipse.che.infrastructure.docker.client.dto.AuthConfig;
/**
* Resolves dynamic auth config for docker registries.

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import java.io.FileWriter;
import java.io.IOException;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import com.google.common.io.CharSource;
import com.google.common.io.CharStreams;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import java.util.Arrays;
import java.util.Objects;

View File

@ -8,13 +8,12 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import static com.google.common.base.Strings.isNullOrEmpty;
import static com.google.common.collect.Maps.newHashMapWithExpectedSize;
import static java.lang.String.format;
import static org.eclipse.che.dto.server.DtoFactory.newDto;
import static org.eclipse.che.plugin.docker.client.DockerRegistryAuthResolver.DEFAULT_REGISTRY_SYNONYMS;
import com.google.common.annotations.VisibleForTesting;
import java.util.Map;
@ -22,9 +21,9 @@ import java.util.Set;
import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.eclipse.che.infrastructure.docker.client.dto.AuthConfig;
import org.eclipse.che.infrastructure.docker.client.dto.AuthConfigs;
import org.eclipse.che.inject.ConfigurationProperties;
import org.eclipse.che.plugin.docker.client.dto.AuthConfig;
import org.eclipse.che.plugin.docker.client.dto.AuthConfigs;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -136,7 +135,7 @@ public class InitialAuthConfig {
private void ensureDockerHubConfiguredNoMoreThanOnce(Map<String, AuthConfig> configMap) {
boolean isDockerHubConfigured = false;
for (String defaultRegistryAlias : DEFAULT_REGISTRY_SYNONYMS) {
for (String defaultRegistryAlias : DockerRegistryAuthResolver.DEFAULT_REGISTRY_SYNONYMS) {
if (configMap.containsKey(defaultRegistryAlias)) {
if (isDockerHubConfigured) {
throw new IllegalArgumentException(

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import com.google.gson.Gson;
import com.google.gson.JsonIOException;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
/** @author andrew00x */
public class LogMessage {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
/**
* Format/beautify string representation of log messages returned by docker.

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import com.google.common.io.ByteStreams;
import java.io.IOException;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
/**
* Format/beautify string representation of docker messages

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
/** @author Alexander Garagatyi */
public interface MessageProcessor<T> {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import java.io.IOException;

View File

@ -8,12 +8,12 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import java.util.Collections;
import java.util.Map;
import org.eclipse.che.commons.annotation.Nullable;
import org.eclipse.che.plugin.docker.client.dto.AuthConfig;
import org.eclipse.che.infrastructure.docker.client.dto.AuthConfig;
/** @author Mykola Morhun */
public class NoOpDockerRegistryDynamicAuthResolverImpl

View File

@ -8,9 +8,9 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import org.eclipse.che.plugin.docker.client.json.ProgressStatus;
import org.eclipse.che.infrastructure.docker.client.json.ProgressStatus;
/**
* Beatify {@link ProgressStatus} messages.

View File

@ -8,9 +8,9 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import org.eclipse.che.plugin.docker.client.json.ProgressStatus;
import org.eclipse.che.infrastructure.docker.client.json.ProgressStatus;
/**
* Receives updated progress statuses to be able to show user beatified progress info.

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client;
package org.eclipse.che.infrastructure.docker.client;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@ -17,8 +17,8 @@ import org.eclipse.che.api.user.server.PreferenceManager;
import org.eclipse.che.commons.annotation.Nullable;
import org.eclipse.che.commons.env.EnvironmentContext;
import org.eclipse.che.dto.server.DtoFactory;
import org.eclipse.che.plugin.docker.client.dto.AuthConfig;
import org.eclipse.che.plugin.docker.client.dto.AuthConfigs;
import org.eclipse.che.infrastructure.docker.client.dto.AuthConfig;
import org.eclipse.che.infrastructure.docker.client.dto.AuthConfigs;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.connection;
package org.eclipse.che.infrastructure.docker.client.connection;
import java.io.IOException;
import java.io.InputStream;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.connection;
package org.eclipse.che.infrastructure.docker.client.connection;
import java.io.IOException;
import java.io.InputStream;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.connection;
package org.eclipse.che.infrastructure.docker.client.connection;
import com.google.common.io.ByteStreams;
import java.io.Closeable;

View File

@ -8,13 +8,13 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.connection;
package org.eclipse.che.infrastructure.docker.client.connection;
import com.google.inject.Inject;
import java.net.URI;
import javax.inject.Named;
import org.eclipse.che.plugin.docker.client.DockerCertificates;
import org.eclipse.che.plugin.docker.client.DockerConnectorConfiguration;
import org.eclipse.che.infrastructure.docker.client.DockerCertificates;
import org.eclipse.che.infrastructure.docker.client.DockerConnectorConfiguration;
/**
* Factory for connections to docker API.

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.connection;
package org.eclipse.che.infrastructure.docker.client.connection;
import java.io.IOException;
import java.io.InputStream;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.connection;
package org.eclipse.che.infrastructure.docker.client.connection;
import java.io.IOException;
import java.io.InputStream;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.connection;
package org.eclipse.che.infrastructure.docker.client.connection;
import com.google.common.base.Strings;
import java.io.IOException;
@ -19,7 +19,7 @@ import java.net.URL;
import java.util.List;
import javax.net.ssl.HttpsURLConnection;
import org.eclipse.che.commons.lang.Pair;
import org.eclipse.che.plugin.docker.client.DockerCertificates;
import org.eclipse.che.infrastructure.docker.client.DockerCertificates;
/**
* @author andrew00x

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.connection;
package org.eclipse.che.infrastructure.docker.client.connection;
import java.io.IOException;
import java.io.InputStream;

View File

@ -8,12 +8,12 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.connection;
package org.eclipse.che.infrastructure.docker.client.connection;
import static org.eclipse.che.plugin.docker.client.CLibrary.AF_UNIX;
import static org.eclipse.che.plugin.docker.client.CLibrary.SOCK_STREAM;
import static org.eclipse.che.plugin.docker.client.CLibrary.SockAddrUn;
import static org.eclipse.che.plugin.docker.client.CLibraryFactory.getCLibrary;
import static org.eclipse.che.infrastructure.docker.client.CLibrary.AF_UNIX;
import static org.eclipse.che.infrastructure.docker.client.CLibrary.SOCK_STREAM;
import static org.eclipse.che.infrastructure.docker.client.CLibrary.SockAddrUn;
import static org.eclipse.che.infrastructure.docker.client.CLibraryFactory.getCLibrary;
import com.google.common.base.Strings;
import java.io.BufferedInputStream;
@ -26,7 +26,7 @@ import java.io.Writer;
import java.net.ConnectException;
import java.util.List;
import org.eclipse.che.commons.lang.Pair;
import org.eclipse.che.plugin.docker.client.CLibrary;
import org.eclipse.che.infrastructure.docker.client.CLibrary;
/**
* @author andrew00x

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.connection;
package org.eclipse.che.infrastructure.docker.client.connection;
import java.io.IOException;
import java.io.InputStream;

View File

@ -8,14 +8,14 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.connection;
package org.eclipse.che.infrastructure.docker.client.connection;
import static org.eclipse.che.plugin.docker.client.CLibraryFactory.getCLibrary;
import static org.eclipse.che.infrastructure.docker.client.CLibraryFactory.getCLibrary;
import com.sun.jna.LastErrorException;
import java.io.IOException;
import java.io.InputStream;
import org.eclipse.che.plugin.docker.client.CLibrary;
import org.eclipse.che.infrastructure.docker.client.CLibrary;
/** @author andrew00x */
public class UnixSocketInputStream extends InputStream {

View File

@ -8,14 +8,14 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.connection;
package org.eclipse.che.infrastructure.docker.client.connection;
import static org.eclipse.che.plugin.docker.client.CLibraryFactory.getCLibrary;
import static org.eclipse.che.infrastructure.docker.client.CLibraryFactory.getCLibrary;
import com.sun.jna.LastErrorException;
import java.io.IOException;
import java.io.OutputStream;
import org.eclipse.che.plugin.docker.client.CLibrary;
import org.eclipse.che.infrastructure.docker.client.CLibrary;
/** @author andrew00x */
public class UnixSocketOutputStream extends OutputStream {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.dto;
package org.eclipse.che.infrastructure.docker.client.dto;
import org.eclipse.che.dto.shared.DTO;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.dto;
package org.eclipse.che.infrastructure.docker.client.dto;
import java.util.Map;
import org.eclipse.che.dto.shared.DTO;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.exception;
package org.eclipse.che.infrastructure.docker.client.exception;
/**
* Occurs when docker container is not found.

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.exception;
package org.eclipse.che.infrastructure.docker.client.exception;
import java.io.IOException;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.exception;
package org.eclipse.che.infrastructure.docker.client.exception;
/**
* Occurs when docker exec is not found.

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.exception;
package org.eclipse.che.infrastructure.docker.client.exception;
/**
* Occurs when docker image is not found.

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.exception;
package org.eclipse.che.infrastructure.docker.client.exception;
/**
* Is thrown when docker network is not found.

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.helper;
package org.eclipse.che.infrastructure.docker.client.helper;
import java.net.Inet4Address;
import java.net.InetAddress;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.helper;
package org.eclipse.che.infrastructure.docker.client.helper;
import com.google.inject.ImplementedBy;
import java.net.InetAddress;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import com.google.gson.annotations.SerializedName;
import java.util.Map;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
public class ContainerCommitted {

View File

@ -8,13 +8,13 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import org.eclipse.che.plugin.docker.client.json.container.NetworkingConfig;
import org.eclipse.che.infrastructure.docker.client.json.container.NetworkingConfig;
/** @author andrew00x */
public class ContainerConfig {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Arrays;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
public class ContainerExitStatus {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Arrays;
import java.util.HashMap;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Arrays;
import java.util.Map;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/**
* Defines information about container port which was published to the host

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
public class ContainerProcesses {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
public class ContainerResource {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Objects;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import com.google.gson.annotations.SerializedName;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Arrays;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
public class ExecCreated {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author Eugene Voevodin */
public class ExecInfo {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
public class ExecStart {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
/*

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import com.google.common.collect.Maps;
import java.util.Arrays;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Arrays;
import java.util.HashMap;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Arrays;
import java.util.Map;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Arrays;
import java.util.HashMap;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
public class ImageInfo {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.HashMap;
import java.util.Map;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
public class LxcConfParam {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Objects;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import com.google.gson.annotations.SerializedName;
import java.util.Arrays;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.HashMap;
import java.util.Map;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
public class PortBinding {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Arrays;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
public class ProgressDetail {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
public class ProgressStatus {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author Alexander Garagatyi */
public class RestartPolicy {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Arrays;
import java.util.Objects;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author Alexander Garagatyi */
public class Ulimit {

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
import java.util.Objects;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json;
package org.eclipse.che.infrastructure.docker.client.json;
/** @author andrew00x */
/*

View File

@ -8,14 +8,14 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json.container;
package org.eclipse.che.infrastructure.docker.client.json.container;
import java.util.Map;
import org.eclipse.che.plugin.docker.client.json.network.EndpointConfig;
import org.eclipse.che.infrastructure.docker.client.json.network.EndpointConfig;
/**
* Represents description of network inside {@link
* org.eclipse.che.plugin.docker.client.json.ContainerConfig}
* org.eclipse.che.infrastructure.docker.client.json.ContainerConfig}
*
* @author Alexander Garagatyi
*/

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json.network;
package org.eclipse.che.infrastructure.docker.client.json.network;
import java.util.Objects;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json.network;
package org.eclipse.che.infrastructure.docker.client.json.network;
import java.util.Objects;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json.network;
package org.eclipse.che.infrastructure.docker.client.json.network;
import java.util.Objects;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json.network;
package org.eclipse.che.infrastructure.docker.client.json.network;
import java.util.Arrays;
import java.util.Objects;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json.network;
package org.eclipse.che.infrastructure.docker.client.json.network;
import java.util.List;
import java.util.Map;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json.network;
package org.eclipse.che.infrastructure.docker.client.json.network;
import java.util.Objects;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json.network;
package org.eclipse.che.infrastructure.docker.client.json.network;
import java.util.Map;
import java.util.Objects;

View File

@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.plugin.docker.client.json.network;
package org.eclipse.che.infrastructure.docker.client.json.network;
import java.util.Objects;

Some files were not shown because too many files have changed in this diff Show More