");
+ super.render(context, object, sb);
+ }
+ };
+
+ // Creates handler on button clicked
+ deletePreferenceColumn.setFieldUpdater(
+ new FieldUpdater
() {
+ @Override
+ public void update(int index, YamlPreference object, String value) {
+ delegate.onDeleteClicked(object);
+ }
+ });
+
+ YamlPreferenceCellTable.addColumn(urlColumn, local.urlColumnHeader());
+ YamlPreferenceCellTable.addColumn(globColumn, local.globColumnHeader());
+ YamlPreferenceCellTable.addColumn(deletePreferenceColumn, local.deleteColumnHeader());
+ YamlPreferenceCellTable.setWidth("100%", true);
+ YamlPreferenceCellTable.setColumnWidth(urlColumn, 45, Style.Unit.PCT);
+ YamlPreferenceCellTable.setColumnWidth(globColumn, 30, Style.Unit.PCT);
+ YamlPreferenceCellTable.setColumnWidth(deletePreferenceColumn, 25, Style.Unit.PCT);
+
+ // don't show loading indicator
+ YamlPreferenceCellTable.setLoadingIndicator(null);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void setPairs(@NotNull List pairs) {
+ this.YamlPreferenceCellTable.setRowData(pairs);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void setDelegate(ActionDelegate delegate) {
+ this.delegate = delegate;
+ }
+
+ @UiHandler("addUrl")
+ public void onAddUrlClicked(ClickEvent event) {
+ delegate.onAddUrlClicked();
+ }
+}
diff --git a/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/java/org/eclipse/che/plugin/yaml/ide/preferences/YamlExtensionManagerViewImpl.ui.xml b/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/java/org/eclipse/che/plugin/yaml/ide/preferences/YamlExtensionManagerViewImpl.ui.xml
new file mode 100644
index 0000000000..096c698fff
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/java/org/eclipse/che/plugin/yaml/ide/preferences/YamlExtensionManagerViewImpl.ui.xml
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+ .alignRight {
+ float: right;
+ }
+
+ .alignLeft {
+ float: left;
+ }
+
+ .emptyBorder {
+ margin: 6px;
+ }
+
+ .space {
+ margin-left: 5px;
+ }
+
+ .button-layout {
+ min-width: 20px;
+ height: 20px;
+ padding: 0 3px;
+ }
+
+ .button-layout svg {
+ width: 14px;
+ height: 20px;
+ text-align: center;
+ padding-left: 3px;
+ fill: buttonFontColor;
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/Yaml.gwt.xml b/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/Yaml.gwt.xml
new file mode 100644
index 0000000000..aad7573529
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/Yaml.gwt.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/ide/YamlLocalizationConstant.properties b/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/ide/YamlLocalizationConstant.properties
new file mode 100644
index 0000000000..215bc31386
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-ide/src/main/resources/org/eclipse/che/plugin/yaml/ide/YamlLocalizationConstant.properties
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2012-2017 Red Hat, Inc.
+# 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:
+# Red Hat, Inc. - initial API and implementation
+#
+
+addUrlText=Add Schema Url
+deleteUrlText=Delete Url
+headerUiMessage=Enter a schema which can be either the url, kedge, or kubernetes. If you specify kedge or kubernetes the languageserver will specify the schema url for you.
+addUrlLabel=Add Schema url
+addSchemaButtonText=Add
+deleteUrlLabel=Delete url
+urlColumnHeader=Schema Url
+globColumnHeader=Apply To
+deleteColumnHeader=Delete
diff --git a/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml b/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml
new file mode 100644
index 0000000000..663df27903
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml
@@ -0,0 +1,90 @@
+
+
+
+ 4.0.0
+
+ che-plugin-yaml-parent
+ org.eclipse.che.plugin
+ 5.19.0-SNAPSHOT
+
+ che-plugin-yaml-server
+ Che Plugin :: Yaml :: Server
+
+ false
+
+
+
+ com.google.code.gson
+ gson
+
+
+ com.google.inject
+ guice
+
+
+ com.google.inject.extensions
+ guice-multibindings
+
+
+ javax.inject
+ javax.inject
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+
+
+ org.eclipse.che.core
+ che-core-api-core
+
+
+ org.eclipse.che.core
+ che-core-api-languageserver
+
+
+ org.eclipse.che.core
+ che-core-api-languageserver-shared
+
+
+ org.eclipse.che.core
+ che-core-commons-inject
+
+
+ org.eclipse.che.plugin
+ che-plugin-yaml-shared
+
+
+ org.eclipse.lsp4j
+ org.eclipse.lsp4j
+
+
+ org.eclipse.lsp4j
+ org.eclipse.lsp4j.jsonrpc
+
+
+ org.slf4j
+ slf4j-api
+
+
+
+
+
+ src/main/java
+
+
+ src/main/resources
+
+
+
+
diff --git a/plugins/plugin-yaml/che-plugin-yaml-server/src/main/java/org/eclipse/che/plugin/yaml/server/inject/YamlModule.java b/plugins/plugin-yaml/che-plugin-yaml-server/src/main/java/org/eclipse/che/plugin/yaml/server/inject/YamlModule.java
new file mode 100644
index 0000000000..5e28adf894
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-server/src/main/java/org/eclipse/che/plugin/yaml/server/inject/YamlModule.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2012-2017 Red Hat, Inc.
+ * 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:
+ * Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.plugin.yaml.server.inject;
+
+import static java.util.Arrays.asList;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.multibindings.Multibinder;
+import org.eclipse.che.api.languageserver.launcher.LanguageServerLauncher;
+import org.eclipse.che.api.languageserver.shared.model.LanguageDescription;
+import org.eclipse.che.inject.DynaModule;
+import org.eclipse.che.plugin.yaml.server.languageserver.YamlLanguageServerLauncher;
+import org.eclipse.che.plugin.yaml.server.languageserver.YamlService;
+
+/**
+ * Yaml module for server side of Yaml Language Server
+ *
+ * @author Joshua Pinkney
+ */
+@DynaModule
+public class YamlModule extends AbstractModule {
+ public static final String LANGUAGE_ID = "yaml";
+ private static final String[] EXTENSIONS = new String[] {"yaml", "yml"};
+ private static final String MIME_TYPE = "text/yaml";
+
+ @Override
+ protected void configure() {
+ Multibinder.newSetBinder(binder(), LanguageServerLauncher.class)
+ .addBinding()
+ .to(YamlLanguageServerLauncher.class);
+ LanguageDescription description = new LanguageDescription();
+ description.setFileExtensions(asList(EXTENSIONS));
+ description.setLanguageId(LANGUAGE_ID);
+ description.setMimeType(MIME_TYPE);
+ Multibinder.newSetBinder(binder(), LanguageDescription.class)
+ .addBinding()
+ .toInstance(description);
+
+ bind(YamlService.class);
+ }
+}
diff --git a/plugins/plugin-yaml/che-plugin-yaml-server/src/main/java/org/eclipse/che/plugin/yaml/server/languageserver/YamlLanguageServerLauncher.java b/plugins/plugin-yaml/che-plugin-yaml-server/src/main/java/org/eclipse/che/plugin/yaml/server/languageserver/YamlLanguageServerLauncher.java
new file mode 100644
index 0000000000..cdbaf8499a
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-server/src/main/java/org/eclipse/che/plugin/yaml/server/languageserver/YamlLanguageServerLauncher.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2012-2017 Red Hat, Inc.
+ * 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:
+ * Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.plugin.yaml.server.languageserver;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import javax.inject.Named;
+import org.eclipse.che.api.core.ApiException;
+import org.eclipse.che.api.core.rest.HttpJsonRequestFactory;
+import org.eclipse.che.api.languageserver.exception.LanguageServerException;
+import org.eclipse.che.api.languageserver.launcher.LanguageServerLauncher;
+import org.eclipse.che.api.languageserver.launcher.LanguageServerLauncherTemplate;
+import org.eclipse.che.api.languageserver.registry.DocumentFilter;
+import org.eclipse.che.api.languageserver.registry.LanguageServerDescription;
+import org.eclipse.che.api.languageserver.registry.ServerInitializerObserver;
+import org.eclipse.che.plugin.yaml.server.inject.YamlModule;
+import org.eclipse.che.plugin.yaml.shared.PreferenceHelper;
+import org.eclipse.che.plugin.yaml.shared.YamlPreference;
+import org.eclipse.lsp4j.ServerCapabilities;
+import org.eclipse.lsp4j.jsonrpc.Endpoint;
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.eclipse.lsp4j.jsonrpc.services.ServiceEndpoints;
+import org.eclipse.lsp4j.services.LanguageClient;
+import org.eclipse.lsp4j.services.LanguageServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Launcher for Yaml Language Server
+ *
+ * @author Joshua Pinkney
+ */
+@Singleton
+public class YamlLanguageServerLauncher extends LanguageServerLauncherTemplate
+ implements ServerInitializerObserver {
+
+ private static final Logger LOG = LoggerFactory.getLogger(YamlLanguageServerLauncher.class);
+
+ private static final String REGEX = ".*\\.(yaml|yml)";
+ private static final LanguageServerDescription DESCRIPTION = createServerDescription();
+ private static LanguageServer yamlLanguageServer;
+ private final Path launchScript;
+ private HttpJsonRequestFactory requestFactory;
+ private String apiUrl;
+
+ @Inject
+ public YamlLanguageServerLauncher(
+ @Named("che.api") String apiUrl, HttpJsonRequestFactory requestFactory) {
+ this.apiUrl = apiUrl;
+ this.requestFactory = requestFactory;
+ launchScript = Paths.get(System.getenv("HOME"), "che/ls-yaml/launch.sh");
+ }
+
+ @Override
+ public boolean isAbleToLaunch() {
+ return Files.exists(launchScript);
+ }
+
+ protected LanguageServer connectToLanguageServer(
+ final Process languageServerProcess, LanguageClient client) {
+ Launcher launcher =
+ Launcher.createLauncher(
+ client,
+ LanguageServer.class,
+ languageServerProcess.getInputStream(),
+ languageServerProcess.getOutputStream());
+ launcher.startListening();
+ setYamlLanguageServer(launcher.getRemoteProxy());
+ return launcher.getRemoteProxy();
+ }
+
+ protected Process startLanguageServerProcess(String projectPath) throws LanguageServerException {
+ ProcessBuilder processBuilder = new ProcessBuilder(launchScript.toString());
+ processBuilder.redirectInput(ProcessBuilder.Redirect.PIPE);
+ processBuilder.redirectOutput(ProcessBuilder.Redirect.PIPE);
+ try {
+ return processBuilder.start();
+ } catch (IOException e) {
+ throw new LanguageServerException("Can't start YAML language server", e);
+ }
+ }
+
+ protected static LanguageServer getYamlLanguageServer() {
+ return yamlLanguageServer;
+ }
+
+ protected static void setYamlLanguageServer(LanguageServer yamlLanguageServer) {
+ YamlLanguageServerLauncher.yamlLanguageServer = yamlLanguageServer;
+ }
+
+ @Override
+ public void onServerInitialized(
+ LanguageServerLauncher launcher,
+ LanguageServer server,
+ ServerCapabilities capabilities,
+ String projectPath) {
+
+ try {
+ Map preferences =
+ requestFactory.fromUrl(apiUrl + "/preferences").useGetMethod().request().asProperties();
+
+ Endpoint endpoint = ServiceEndpoints.toEndpoint(server);
+ YamlSchemaAssociations serviceObject =
+ ServiceEndpoints.toServiceObject(endpoint, YamlSchemaAssociations.class);
+ Map associations =
+ jsonToSchemaAssociations(preferences.get("yaml.preferences"));
+ serviceObject.yamlSchemaAssociation(associations);
+
+ } catch (ApiException | IOException e) {
+ LOG.error(e.getLocalizedMessage(), e);
+ }
+ }
+
+ /**
+ * Converts json string to map of schema associations
+ *
+ * @param jsonStr The json string you would like to change to schema association
+ * @return Map of schema associations
+ */
+ private Map jsonToSchemaAssociations(String jsonStr) {
+ List preferenceList = jsonToYamlPreference(jsonStr);
+
+ if (preferenceList == null) {
+ return null;
+ }
+
+ Map> preferenceSchemaMap =
+ PreferenceHelper.yamlPreferenceToMap(preferenceList);
+ Map jsonSchemaMap = new HashMap();
+ for (Map.Entry> preferenceEntry : preferenceSchemaMap.entrySet()) {
+ jsonSchemaMap.put(
+ preferenceEntry.getKey(), preferenceEntry.getValue().toArray(new String[0]));
+ }
+ return jsonSchemaMap;
+ }
+
+ /**
+ * Converts json string to yaml preference
+ *
+ * @param jsonStr The json string you would like to change into Yaml Preferences
+ * @return List of Yaml Preferences
+ */
+ private List jsonToYamlPreference(String jsonStr) {
+
+ List preferences = new ArrayList();
+
+ Type type = new TypeToken>() {}.getType();
+ Map yamlPreferenceMap = new Gson().fromJson(jsonStr, type);
+
+ if (yamlPreferenceMap == null || jsonStr == "") {
+ return new ArrayList();
+ }
+
+ for (Map.Entry yamlPreferenceMapItem : yamlPreferenceMap.entrySet()) {
+ for (String url : yamlPreferenceMapItem.getValue()) {
+ YamlPreference newYamlPref = new YamlPreference(url, yamlPreferenceMapItem.getKey());
+ preferences.add(newYamlPref);
+ }
+ }
+
+ return preferences;
+ }
+
+ public LanguageServerDescription getDescription() {
+ return DESCRIPTION;
+ }
+
+ private static LanguageServerDescription createServerDescription() {
+ LanguageServerDescription description =
+ new LanguageServerDescription(
+ "org.eclipse.che.plugin.yaml.server.languageserver",
+ null,
+ Arrays.asList(new DocumentFilter(YamlModule.LANGUAGE_ID, REGEX, null)));
+ return description;
+ }
+}
diff --git a/plugins/plugin-yaml/che-plugin-yaml-server/src/main/java/org/eclipse/che/plugin/yaml/server/languageserver/YamlSchemaAssociations.java b/plugins/plugin-yaml/che-plugin-yaml-server/src/main/java/org/eclipse/che/plugin/yaml/server/languageserver/YamlSchemaAssociations.java
new file mode 100644
index 0000000000..a0e52e9565
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-server/src/main/java/org/eclipse/che/plugin/yaml/server/languageserver/YamlSchemaAssociations.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2012-2017 Red Hat, Inc.
+ * 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:
+ * Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.plugin.yaml.server.languageserver;
+
+import java.util.Map;
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+
+/**
+ * Interface for schema associations.
+ *
+ * @author Joshua Pinkney
+ */
+public interface YamlSchemaAssociations {
+
+ @JsonNotification(value = "json/schemaAssociations", useSegment = false)
+ void yamlSchemaAssociation(Map associations);
+}
diff --git a/plugins/plugin-yaml/che-plugin-yaml-server/src/main/java/org/eclipse/che/plugin/yaml/server/languageserver/YamlService.java b/plugins/plugin-yaml/che-plugin-yaml-server/src/main/java/org/eclipse/che/plugin/yaml/server/languageserver/YamlService.java
new file mode 100644
index 0000000000..4843626154
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-server/src/main/java/org/eclipse/che/plugin/yaml/server/languageserver/YamlService.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2012-2017 Red Hat, Inc.
+ * 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:
+ * Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.plugin.yaml.server.languageserver;
+
+import com.google.gson.Gson;
+import java.util.HashMap;
+import java.util.Map;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import org.eclipse.che.api.core.ApiException;
+import org.eclipse.che.plugin.yaml.shared.YamlDTO;
+import org.eclipse.lsp4j.jsonrpc.Endpoint;
+import org.eclipse.lsp4j.jsonrpc.services.ServiceEndpoints;
+import org.eclipse.lsp4j.services.LanguageServer;
+
+/**
+ * The yaml server side endpoint for injecting the schema into yaml language server
+ *
+ * @author Joshua Pinkney
+ */
+@Path("yaml")
+public class YamlService {
+
+ /**
+ * Route for getting getting schemas from client side and injecting them into yaml language server
+ *
+ * @param yamlDto A yamlDTO containing the list of schemas you would like to add
+ */
+ @POST
+ @Path("schemas")
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void putSchemas(YamlDTO yamlDto) throws ApiException {
+
+ LanguageServer yamlLS = YamlLanguageServerLauncher.getYamlLanguageServer();
+
+ if (yamlDto != null && yamlLS != null) {
+
+ Endpoint endpoint = ServiceEndpoints.toEndpoint(yamlLS);
+ YamlSchemaAssociations serviceObject =
+ ServiceEndpoints.toServiceObject(endpoint, YamlSchemaAssociations.class);
+
+ Map schemaAssociations = new HashMap<>();
+ Map yamlDtoSchemas = yamlDto.getSchemas();
+
+ for (Map.Entry schema : yamlDtoSchemas.entrySet()) {
+ schemaAssociations.put(
+ schema.getKey(), new Gson().fromJson(schema.getValue(), String[].class));
+ }
+
+ serviceObject.yamlSchemaAssociation(schemaAssociations);
+ }
+ }
+}
diff --git a/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml b/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml
new file mode 100644
index 0000000000..f900bf6601
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml
@@ -0,0 +1,155 @@
+
+
+
+ 4.0.0
+
+ che-plugin-yaml-parent
+ org.eclipse.che.plugin
+ 5.19.0-SNAPSHOT
+
+ che-plugin-yaml-shared
+ jar
+ Che Plugin :: Yaml :: Shared
+
+ ${project.build.directory}/generated-sources/dto/
+ false
+
+
+
+ com.google.code.gson
+ gson
+
+
+ com.google.inject
+ guice
+
+
+ org.eclipse.che.core
+ che-core-api-dto
+
+
+ org.eclipse.che.core
+ che-core-commons-gwt
+
+
+ com.google.gwt
+ gwt-user
+ provided
+
+
+
+
+
+ src/main/java
+
+
+ src/main/resources
+
+
+ ${dto-generator-out-directory}
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ add-resource
+ process-sources
+
+ add-resource
+
+
+
+
+ ${dto-generator-out-directory}/META-INF
+ META-INF
+
+
+
+
+
+ add-source
+ process-sources
+
+ add-source
+
+
+
+ ${dto-generator-out-directory}
+
+
+
+
+
+
+ maven-compiler-plugin
+
+
+ pre-compile
+ generate-sources
+
+ compile
+
+
+
+
+
+ org.eclipse.che.core
+ che-core-api-dto-maven-plugin
+ ${project.version}
+
+
+ generate-client-dto
+ process-sources
+
+ generate
+
+
+
+ org.eclipse.che.plugin.yaml.shared
+
+ ${dto-generator-out-directory}
+ org.eclipse.che.plugin.yaml.ide.dto.DtoClientImpls
+ client
+
+
+
+ generate-server-dto
+ process-sources
+
+ generate
+
+
+
+ org.eclipse.che.plugin.yaml.shared
+
+ ${dto-generator-out-directory}
+ org.eclipse.che.plugin.yaml.server.dto.DtoServerImpls
+ server
+
+
+
+
+
+ ${project.groupId}
+ ${project.artifactId}
+ ${project.version}
+
+
+
+
+
+
diff --git a/plugins/plugin-yaml/che-plugin-yaml-shared/src/main/java/org/eclipse/che/plugin/yaml/shared/PreferenceHelper.java b/plugins/plugin-yaml/che-plugin-yaml-shared/src/main/java/org/eclipse/che/plugin/yaml/shared/PreferenceHelper.java
new file mode 100644
index 0000000000..308a6f797b
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-shared/src/main/java/org/eclipse/che/plugin/yaml/shared/PreferenceHelper.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2012-2017 Red Hat, Inc.
+ * 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:
+ * Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.plugin.yaml.shared;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Shared class between yaml client and server
+ *
+ * @author Joshua Pinkney
+ */
+public class PreferenceHelper {
+
+ /**
+ * Converts List of Yaml Preferences to Map of Globs to List of urls
+ *
+ * @param pref The list of Yaml Preferences you want to convert
+ * @return Map of Globs to List of urls of the Yaml Preferences
+ */
+ public static Map> yamlPreferenceToMap(List pref) {
+ Map> preferenceMap = new HashMap>();
+
+ for (YamlPreference prefItr : pref) {
+
+ if (preferenceMap.containsKey(prefItr.getGlob())) {
+ ArrayList prefList = new ArrayList(preferenceMap.get(prefItr.getGlob()));
+ prefList.add(prefItr.getUrl());
+ preferenceMap.put(prefItr.getGlob(), prefList);
+ } else {
+ ArrayList prefList = new ArrayList();
+ prefList.add(prefItr.getUrl());
+ preferenceMap.put(prefItr.getGlob(), prefList);
+ }
+ }
+
+ return preferenceMap;
+ }
+}
diff --git a/plugins/plugin-yaml/che-plugin-yaml-shared/src/main/java/org/eclipse/che/plugin/yaml/shared/YamlDTO.java b/plugins/plugin-yaml/che-plugin-yaml-shared/src/main/java/org/eclipse/che/plugin/yaml/shared/YamlDTO.java
new file mode 100644
index 0000000000..a8a1946a86
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-shared/src/main/java/org/eclipse/che/plugin/yaml/shared/YamlDTO.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2012-2017 Red Hat, Inc.
+ * 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:
+ * Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.plugin.yaml.shared;
+
+import java.util.Map;
+import org.eclipse.che.dto.shared.DTO;
+
+/**
+ * Interface of DTO for sending schemas
+ *
+ * @author Joshua Pinkney
+ */
+@DTO
+public interface YamlDTO {
+ /**
+ * Get the schemas in the DTO
+ *
+ * @return Map of Schemas in the DTO
+ */
+ Map getSchemas();
+
+ /**
+ * Set the schemas in the DTO
+ *
+ * @param schemas The schemas to set in the DTO
+ */
+ void setSchemas(Map schemas);
+
+ YamlDTO withSchemas(Map schemas);
+}
diff --git a/plugins/plugin-yaml/che-plugin-yaml-shared/src/main/java/org/eclipse/che/plugin/yaml/shared/YamlDTOImpl.java b/plugins/plugin-yaml/che-plugin-yaml-shared/src/main/java/org/eclipse/che/plugin/yaml/shared/YamlDTOImpl.java
new file mode 100644
index 0000000000..77f29fe6e8
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-shared/src/main/java/org/eclipse/che/plugin/yaml/shared/YamlDTOImpl.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2012-2017 Red Hat, Inc.
+ * 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:
+ * Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.plugin.yaml.shared;
+
+import java.util.Map;
+
+/**
+ * Implementation of {@link YamlDTO}
+ *
+ * @author Joshua Pinkney
+ */
+public class YamlDTOImpl implements YamlDTO {
+
+ private Map schemas;
+
+ /** {@inheritDoc} */
+ @Override
+ public Map getSchemas() {
+ return this.schemas;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void setSchemas(Map schemas) {
+ this.schemas = schemas;
+ }
+
+ @Override
+ public YamlDTO withSchemas(Map schemas) {
+ this.schemas = schemas;
+ return this;
+ }
+}
diff --git a/plugins/plugin-yaml/che-plugin-yaml-shared/src/main/java/org/eclipse/che/plugin/yaml/shared/YamlPreference.java b/plugins/plugin-yaml/che-plugin-yaml-shared/src/main/java/org/eclipse/che/plugin/yaml/shared/YamlPreference.java
new file mode 100644
index 0000000000..1aa974f273
--- /dev/null
+++ b/plugins/plugin-yaml/che-plugin-yaml-shared/src/main/java/org/eclipse/che/plugin/yaml/shared/YamlPreference.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2012-2017 Red Hat, Inc.
+ * 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:
+ * Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.plugin.yaml.shared;
+
+/**
+ * Establishes the format for Yaml Preferences
+ *
+ * @author Joshua Pinkney
+ */
+public class YamlPreference {
+
+ private String url;
+ private String glob;
+
+ public YamlPreference(String url, String glob) {
+ this.url = url;
+ this.glob = glob;
+ }
+
+ public String getUrl() {
+ return this.url;
+ }
+
+ public String getGlob() {
+ return this.glob;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public void setGlob(String glob) {
+ this.glob = glob;
+ }
+}
diff --git a/plugins/plugin-yaml/pom.xml b/plugins/plugin-yaml/pom.xml
new file mode 100644
index 0000000000..43a65ebc72
--- /dev/null
+++ b/plugins/plugin-yaml/pom.xml
@@ -0,0 +1,30 @@
+
+
+
+ 4.0.0
+
+ che-plugin-parent
+ org.eclipse.che.plugin
+ 5.19.0-SNAPSHOT
+ ../pom.xml
+
+ che-plugin-yaml-parent
+ pom
+ Che Plugin :: YAML :: Parent
+
+ che-plugin-yaml-shared
+ che-plugin-yaml-ide
+ che-plugin-yaml-server
+
+
diff --git a/plugins/pom.xml b/plugins/pom.xml
index c0ed29bfb7..364e57af4e 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -60,5 +60,6 @@
plugin-testing-php
plugin-pullrequest-parent
plugin-traefik
+ plugin-yaml
diff --git a/pom.xml b/pom.xml
index baf99cb28c..1da2dc4054 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,6 +201,11 @@
ls-typescript-agent
${che.version}
+
+ org.eclipse.che
+ ls-yaml-agent
+ ${che.version}
+
org.eclipse.che
ssh-agent
@@ -1292,6 +1297,21 @@
che-plugin-web-ext-web
${che.version}
+
+ org.eclipse.che.plugin
+ che-plugin-yaml-ide
+ ${che.version}
+
+
+ org.eclipse.che.plugin
+ che-plugin-yaml-server
+ ${che.version}
+
+
+ org.eclipse.che.plugin
+ che-plugin-yaml-shared
+ ${che.version}
+
org.eclipse.che.plugin
che-plugin-zend-debugger-ide
diff --git a/wsmaster/che-core-api-account/src/main/java/org/eclipse/che/account/spi/jpa/JpaAccountDao.java b/wsmaster/che-core-api-account/src/main/java/org/eclipse/che/account/spi/jpa/JpaAccountDao.java
index 3e68d63f53..6817b29f0c 100644
--- a/wsmaster/che-core-api-account/src/main/java/org/eclipse/che/account/spi/jpa/JpaAccountDao.java
+++ b/wsmaster/che-core-api-account/src/main/java/org/eclipse/che/account/spi/jpa/JpaAccountDao.java
@@ -14,7 +14,6 @@ import static java.lang.String.format;
import static java.util.Objects.requireNonNull;
import com.google.inject.persist.Transactional;
-import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton;
@@ -111,7 +110,9 @@ public class JpaAccountDao implements AccountDao {
@Transactional
protected void doCreate(AccountImpl account) {
- managerProvider.get().persist(account);
+ final EntityManager manager = managerProvider.get();
+ manager.persist(account);
+ manager.flush();
}
@Transactional
@@ -127,10 +128,12 @@ public class JpaAccountDao implements AccountDao {
}
@Transactional
- protected Optional doRemove(String id) {
+ protected void doRemove(String id) {
final EntityManager manager = managerProvider.get();
- final Optional account = Optional.ofNullable(manager.find(AccountImpl.class, id));
- account.ifPresent(manager::remove);
- return account;
+ AccountImpl account = manager.find(AccountImpl.class, id);
+ if (account != null) {
+ manager.remove(account);
+ manager.flush();
+ }
}
}
diff --git a/wsmaster/che-core-api-account/src/test/java/org/eclipse/che/account/spi/tck/AccountDaoTest.java b/wsmaster/che-core-api-account/src/test/java/org/eclipse/che/account/spi/tck/AccountDaoTest.java
index ff7eb603c1..48a2e8ff3b 100644
--- a/wsmaster/che-core-api-account/src/test/java/org/eclipse/che/account/spi/tck/AccountDaoTest.java
+++ b/wsmaster/che-core-api-account/src/test/java/org/eclipse/che/account/spi/tck/AccountDaoTest.java
@@ -96,6 +96,14 @@ public class AccountDaoTest {
accountDao.update(account);
}
+ @Test(expectedExceptions = ConflictException.class)
+ public void shouldThrowConflictExceptionWhenCreatingAccountWithExistingName() throws Exception {
+ AccountImpl account =
+ new AccountImpl(NameGenerator.generate("account", 5), accounts[0].getName(), "test");
+
+ accountDao.create(account);
+ }
+
@Test(expectedExceptions = NotFoundException.class)
public void shouldThrowNotFoundExceptionWhenUpdatingNonExistingAccount() throws Exception {
AccountImpl account = accounts[0];