Merge api-devfile and api-workspace together

.github/CODEOWNERS

@@ -48,7 +48,7 @@ wsmaster/** @skabashnyuk
 wsmaster/che-core-api-factory/** @mshaposhnik
 wsmaster/che-core-api-factory-shared/**   @mshaposhnik
 wsmaster/che-core-api-workspace-activity/**   @mshaposhnik
-wsmaster/che-core-api-devfile/**  @sleshchenko @mshaposhnik @metlos
+wsmaster/che-core-api-workspace/**  @sleshchenko @mshaposhnik @metlos
 
 # wsagent
 wsagent/activity/** @skabashnyuk

assembly/assembly-wsmaster-war/pom.xml

@@ -157,10 +157,6 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-api-devfile</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-factory</artifactId>

assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java

@@ -31,7 +31,6 @@
 import org.eclipse.che.api.core.rest.MessageBodyAdapter;
 import org.eclipse.che.api.core.rest.MessageBodyAdapterInterceptor;
 import org.eclipse.che.api.deploy.jsonrpc.CheJsonRpcWebSocketConfigurationModule;
-import org.eclipse.che.api.devfile.server.DevfileModule;
 import org.eclipse.che.api.factory.server.FactoryAcceptValidator;
 import org.eclipse.che.api.factory.server.FactoryCreateValidator;
 import org.eclipse.che.api.factory.server.FactoryEditValidator;
@@ -50,6 +49,7 @@
 import org.eclipse.che.api.user.server.spi.UserDao;
 import org.eclipse.che.api.workspace.server.WorkspaceLockService;
 import org.eclipse.che.api.workspace.server.WorkspaceStatusCache;
+import org.eclipse.che.api.workspace.server.devfile.DevfileModule;
 import org.eclipse.che.api.workspace.server.hc.ServersCheckerFactory;
 import org.eclipse.che.api.workspace.server.spi.provision.InstallerConfigProvisioner;
 import org.eclipse.che.api.workspace.server.spi.provision.InternalEnvironmentProvisioner;

core/che-core-dynamodule-maven-plugin/src/main/java/org/eclipse/che/plugin/dynamodule/scanner/FindDynaModuleVisitor.java

@@ -31,7 +31,7 @@ public final class FindDynaModuleVisitor extends ClassVisitor {
 
   /** Default constructor. */
   public FindDynaModuleVisitor() {
-    super(Opcodes.ASM5);
+    super(Opcodes.ASM7);
   }
 
   /**

infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInfraModule.java

@@ -11,6 +11,9 @@
  */
 package org.eclipse.che.workspace.infrastructure.kubernetes;
 
+import static com.google.inject.name.Names.named;
+import static org.eclipse.che.api.workspace.server.devfile.Constants.DOCKERIMAGE_COMPONENT_TYPE;
+import static org.eclipse.che.api.workspace.server.devfile.Constants.KUBERNETES_COMPONENT_TYPE;
 import static org.eclipse.che.workspace.infrastructure.kubernetes.namespace.pvc.CommonPVCStrategy.COMMON_STRATEGY;
 import static org.eclipse.che.workspace.infrastructure.kubernetes.namespace.pvc.PerWorkspacePVCStrategy.PER_WORKSPACE_STRATEGY;
 import static org.eclipse.che.workspace.infrastructure.kubernetes.namespace.pvc.UniqueWorkspacePVCStrategy.UNIQUE_STRATEGY;
@@ -26,6 +29,8 @@
 import java.util.Map;
 import org.eclipse.che.api.system.server.ServiceTermination;
 import org.eclipse.che.api.workspace.server.NoEnvironmentFactory;
+import org.eclipse.che.api.workspace.server.devfile.DevfileBindings;
+import org.eclipse.che.api.workspace.server.devfile.validator.ComponentIntegrityValidator.NoopComponentIntegrityValidator;
 import org.eclipse.che.api.workspace.server.spi.RuntimeInfrastructure;
 import org.eclipse.che.api.workspace.server.spi.environment.InternalEnvironmentFactory;
 import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiExternalEnvVarProvider;
@@ -37,6 +42,12 @@
 import org.eclipse.che.workspace.infrastructure.docker.environment.dockerimage.DockerImageEnvironmentFactory;
 import org.eclipse.che.workspace.infrastructure.kubernetes.bootstrapper.KubernetesBootstrapperFactory;
 import org.eclipse.che.workspace.infrastructure.kubernetes.cache.jpa.JpaKubernetesRuntimeCacheModule;
+import org.eclipse.che.workspace.infrastructure.kubernetes.devfile.DockerimageComponentProvisioner;
+import org.eclipse.che.workspace.infrastructure.kubernetes.devfile.DockerimageComponentToWorkspaceApplier;
+import org.eclipse.che.workspace.infrastructure.kubernetes.devfile.KubernetesComponentProvisioner;
+import org.eclipse.che.workspace.infrastructure.kubernetes.devfile.KubernetesComponentToWorkspaceApplier;
+import org.eclipse.che.workspace.infrastructure.kubernetes.devfile.KubernetesComponentValidator;
+import org.eclipse.che.workspace.infrastructure.kubernetes.devfile.KubernetesDevfileBindings;
 import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironment;
 import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironmentFactory;
 import org.eclipse.che.workspace.infrastructure.kubernetes.namespace.RemoveNamespaceOnWorkspaceRemove;
@@ -133,7 +144,7 @@ protected void configure() {
     envVarProviders.addBinding().to(LogsRootEnvVariableProvider.class);
 
     bind(new TypeLiteral<Map<String, String>>() {})
-        .annotatedWith(com.google.inject.name.Names.named("infra.kubernetes.ingress.annotations"))
+        .annotatedWith(named("infra.kubernetes.ingress.annotations"))
         .toProvider(IngressAnnotationsProvider.class);
 
     install(new JpaKubernetesRuntimeCacheModule());
@@ -168,5 +179,31 @@ protected void configure() {
 
     bind(SidecarToolingProvisioner.class)
         .to(new TypeLiteral<SidecarToolingProvisioner<KubernetesEnvironment>>() {});
+
+    DevfileBindings.onComponentIntegrityValidatorBinder(
+        binder(),
+        binder -> {
+          binder.addBinding(KUBERNETES_COMPONENT_TYPE).to(KubernetesComponentValidator.class);
+          binder.addBinding(DOCKERIMAGE_COMPONENT_TYPE).to(NoopComponentIntegrityValidator.class);
+        });
+
+    DevfileBindings.onWorkspaceApplierBinder(
+        binder(),
+        binder -> {
+          binder
+              .addBinding(KUBERNETES_COMPONENT_TYPE)
+              .to(KubernetesComponentToWorkspaceApplier.class);
+          binder
+              .addBinding(DOCKERIMAGE_COMPONENT_TYPE)
+              .to(DockerimageComponentToWorkspaceApplier.class);
+        });
+
+    DevfileBindings.addComponentProvisioners(
+        binder(), KubernetesComponentProvisioner.class, DockerimageComponentProvisioner.class);
+
+    KubernetesDevfileBindings.addKubernetesBasedEnvironmentTypeBindings(
+        binder(), KubernetesEnvironment.TYPE);
+    KubernetesDevfileBindings.addKubernetesBasedComponentTypeBindings(
+        binder(), KUBERNETES_COMPONENT_TYPE);
   }
 }

wsmaster/che-core-api-devfile/src/main/java/org/eclipse/che/api/devfile/server/convert/component/kubernetes/ContainerSearch.java → infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearch.java

@@ -9,7 +9,7 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.api.devfile.server.convert.component.kubernetes;
+package org.eclipse.che.workspace.infrastructure.kubernetes.devfile;
 
 import static java.util.stream.Collectors.toList;
 

wsmaster/che-core-api-devfile/src/main/java/org/eclipse/che/api/devfile/server/convert/component/dockerimage/DockerimageComponentProvisioner.java → infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/DockerimageComponentProvisioner.java

@@ -9,12 +9,12 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.api.devfile.server.convert.component.dockerimage;
+package org.eclipse.che.workspace.infrastructure.kubernetes.devfile;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.eclipse.che.api.core.model.workspace.config.MachineConfig.MEMORY_LIMIT_ATTRIBUTE;
-import static org.eclipse.che.api.devfile.server.Constants.DOCKERIMAGE_COMPONENT_TYPE;
-import static org.eclipse.che.api.devfile.server.Constants.PUBLIC_ENDPOINT_ATTRIBUTE;
+import static org.eclipse.che.api.workspace.server.devfile.Constants.DOCKERIMAGE_COMPONENT_TYPE;
+import static org.eclipse.che.api.workspace.server.devfile.Constants.PUBLIC_ENDPOINT_ATTRIBUTE;
 import static org.eclipse.che.api.workspace.shared.Constants.PROJECTS_VOLUME_NAME;
 
 import java.util.HashMap;
@@ -25,8 +25,8 @@
 import javax.inject.Inject;
 import org.eclipse.che.api.core.model.workspace.config.MachineConfig;
 import org.eclipse.che.api.core.model.workspace.config.ServerConfig;
-import org.eclipse.che.api.devfile.server.convert.component.ComponentProvisioner;
-import org.eclipse.che.api.devfile.server.exception.WorkspaceExportException;
+import org.eclipse.che.api.workspace.server.devfile.convert.component.ComponentProvisioner;
+import org.eclipse.che.api.workspace.server.devfile.exception.WorkspaceExportException;
 import org.eclipse.che.api.workspace.server.model.impl.EnvironmentImpl;
 import org.eclipse.che.api.workspace.server.model.impl.MachineConfigImpl;
 import org.eclipse.che.api.workspace.server.model.impl.RecipeImpl;
@@ -46,6 +46,8 @@
  * Provision dockerimage component in {@link DevfileImpl} according to the value of environment with
  * dockerimage recipe if the specified {@link WorkspaceConfigImpl} has such.
  *
+ * <p>The {@code dockerimage} devfile components are handled as Kubernetes deployments internally.
+ *
  * @author Sergii Leshchenko
  */
 public class DockerimageComponentProvisioner implements ComponentProvisioner {

wsmaster/che-core-api-devfile/src/main/java/org/eclipse/che/api/devfile/server/convert/component/dockerimage/DockerimageComponentToWorkspaceApplier.java → infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/DockerimageComponentToWorkspaceApplier.java

@@ -9,16 +9,16 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.api.devfile.server.convert.component.dockerimage;
+package org.eclipse.che.workspace.infrastructure.kubernetes.devfile;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static java.lang.String.format;
 import static java.util.Collections.singletonList;
 import static org.eclipse.che.api.core.model.workspace.config.Command.MACHINE_NAME_ATTRIBUTE;
-import static org.eclipse.che.api.devfile.server.Constants.DISCOVERABLE_ENDPOINT_ATTRIBUTE;
-import static org.eclipse.che.api.devfile.server.Constants.DOCKERIMAGE_COMPONENT_TYPE;
-import static org.eclipse.che.api.devfile.server.Constants.PUBLIC_ENDPOINT_ATTRIBUTE;
+import static org.eclipse.che.api.workspace.server.devfile.Constants.DISCOVERABLE_ENDPOINT_ATTRIBUTE;
+import static org.eclipse.che.api.workspace.server.devfile.Constants.DOCKERIMAGE_COMPONENT_TYPE;
+import static org.eclipse.che.api.workspace.server.devfile.Constants.PUBLIC_ENDPOINT_ATTRIBUTE;
 import static org.eclipse.che.api.workspace.shared.Constants.PROJECTS_VOLUME_NAME;
 import static org.eclipse.che.workspace.infrastructure.kubernetes.Constants.MACHINE_NAME_ANNOTATION_FMT;
 
@@ -43,11 +43,10 @@
 import org.eclipse.che.api.core.model.workspace.config.ServerConfig;
 import org.eclipse.che.api.core.model.workspace.devfile.Component;
 import org.eclipse.che.api.core.model.workspace.devfile.Endpoint;
-import org.eclipse.che.api.devfile.server.Constants;
-import org.eclipse.che.api.devfile.server.FileContentProvider;
-import org.eclipse.che.api.devfile.server.convert.component.ComponentToWorkspaceApplier;
-import org.eclipse.che.api.devfile.server.convert.component.kubernetes.KubernetesEnvironmentProvisioner;
-import org.eclipse.che.api.devfile.server.exception.DevfileException;
+import org.eclipse.che.api.workspace.server.devfile.Constants;
+import org.eclipse.che.api.workspace.server.devfile.FileContentProvider;
+import org.eclipse.che.api.workspace.server.devfile.convert.component.ComponentToWorkspaceApplier;
+import org.eclipse.che.api.workspace.server.devfile.exception.DevfileException;
 import org.eclipse.che.api.workspace.server.model.impl.MachineConfigImpl;
 import org.eclipse.che.api.workspace.server.model.impl.ServerConfigImpl;
 import org.eclipse.che.api.workspace.server.model.impl.VolumeImpl;
@@ -58,6 +57,8 @@
 /**
  * Applies changes on workspace config according to the specified dockerimage component.
  *
+ * <p>The {@code dockerimage} devfile components are handled as Kubernetes deployments internally.
+ *
  * @author Sergii Leshchenko
  */
 public class DockerimageComponentToWorkspaceApplier implements ComponentToWorkspaceApplier {
@@ -201,7 +202,7 @@ private Deployment buildDeployment(
         .withNewMetadata()
         .withName(name)
         .addToLabels(CHE_COMPONENT_NAME_LABEL, name)
-        .addToAnnotations(String.format(MACHINE_NAME_ANNOTATION_FMT, name), name)
+        .addToAnnotations(format(MACHINE_NAME_ANNOTATION_FMT, name), name)
         .endMetadata()
         .withNewSpec()
         .withContainers(container)

wsmaster/che-core-api-devfile/src/main/java/org/eclipse/che/api/devfile/server/convert/component/kubernetes/KubernetesComponentProvisioner.java → infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentProvisioner.java

@@ -9,20 +9,22 @@
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation
  */
-package org.eclipse.che.api.devfile.server.convert.component.kubernetes;
+package org.eclipse.che.workspace.infrastructure.kubernetes.devfile;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static java.lang.String.format;
 
+import com.google.inject.name.Named;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.stream.Collectors;
-import org.eclipse.che.api.devfile.server.convert.component.ComponentProvisioner;
-import org.eclipse.che.api.devfile.server.exception.WorkspaceExportException;
+import javax.inject.Inject;
+import org.eclipse.che.api.workspace.server.devfile.convert.component.ComponentProvisioner;
+import org.eclipse.che.api.workspace.server.devfile.exception.WorkspaceExportException;
 import org.eclipse.che.api.workspace.server.model.impl.EnvironmentImpl;
 import org.eclipse.che.api.workspace.server.model.impl.WorkspaceConfigImpl;
 import org.eclipse.che.api.workspace.server.model.impl.devfile.DevfileImpl;
-import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironment;
-import org.eclipse.che.workspace.infrastructure.openshift.environment.OpenShiftEnvironment;
 
 /**
  * Provision kubernetes/openshift component in {@link DevfileImpl} according to the value of
@@ -33,6 +35,15 @@
  */
 public class KubernetesComponentProvisioner implements ComponentProvisioner {
 
+  private final Set<String> handledEnvironmentTypes;
+
+  @Inject
+  public KubernetesComponentProvisioner(
+      @Named(KubernetesDevfileBindings.KUBERNETES_BASED_ENVIRONMENTS_KEY_NAME)
+          Set<String> handledEnvironmentTypes) {
+    this.handledEnvironmentTypes = handledEnvironmentTypes;
+  }
+
   /**
    * Provision kubernetes/openshift component in {@link DevfileImpl} according to the value of
    * environment with kubernetes/openshift recipe if the specified {@link WorkspaceConfigImpl} has
@@ -58,24 +69,24 @@ public void provision(DevfileImpl devfile, WorkspaceConfigImpl workspaceConfig)
             .getEnvironments()
             .entrySet()
             .stream()
-            .filter(
-                e ->
-                    KubernetesEnvironment.TYPE.equals(e.getValue().getRecipe().getType())
-                        || OpenShiftEnvironment.TYPE.equals(e.getValue().getRecipe().getType()))
+            .filter(e -> handledEnvironmentTypes.contains(e.getValue().getRecipe().getType()))
             .collect(Collectors.toList());
 
     if (k8sEnvironments.isEmpty()) {
       return;
     }
 
     if (k8sEnvironments.size() > 1) {
+      String allEnvs = String.join("/", handledEnvironmentTypes);
+
       throw new WorkspaceExportException(
-          "Workspace with multiple `kubernetes`/`openshift` environments can not be converted to devfile");
+          format(
+              "Workspace with multiple %s environments can not be converted to devfile", allEnvs));
     }
 
     EnvironmentImpl env = k8sEnvironments.get(0).getValue();
     throw new WorkspaceExportException(
-        String.format(
+        format(
             "Exporting of workspace with `%s` is not supported yet.", env.getRecipe().getType()));
   }
 }