compose plugin id

infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/events/BrokerService.java

@@ -19,6 +19,7 @@
 import com.google.common.annotations.Beta;
 import java.io.IOException;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.eclipse.che.api.core.jsonrpc.commons.RequestHandlerConfigurator;
@@ -104,11 +105,24 @@ private void handle(BrokerStatusChangedEvent event) {
   private List<ChePlugin> parseTooling(String toolingString) {
     if (!isNullOrEmpty(toolingString)) {
       try {
-        return objectMapper.readValue(toolingString, new TypeReference<List<ChePlugin>>() {});
+        List<ChePlugin> plugins =
+            objectMapper.readValue(toolingString, new TypeReference<List<ChePlugin>>() {});
+        // when id of plugin is not set, we can compose it from publisher, name and version
+        return plugins.stream().map(this::composePluginIdWhenNull).collect(Collectors.toList());
       } catch (IOException e) {
         LOG.error("Parsing Che plugin broker event failed. Error: " + e.getMessage(), e);
       }
     }
     return null;
   }
+
+  private ChePlugin composePluginIdWhenNull(ChePlugin plugin) {
+    if (isNullOrEmpty(plugin.getId())
+        && !isNullOrEmpty(plugin.getPublisher())
+        && !isNullOrEmpty(plugin.getName())
+        && !isNullOrEmpty(plugin.getVersion())) {
+      plugin.setId(plugin.getPublisher() + "/" + plugin.getName() + "/" + plugin.getVersion());
+    }
+    return plugin;
+  }
 }

wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/wsplugins/model/ExtendedPluginFQN.java

@@ -34,8 +34,9 @@ public ExtendedPluginFQN(URI registry, String id, String publisher, String name,
     this.version = version;
   }
 
+  /** In this constructor, id is composed from given params */
   public ExtendedPluginFQN(String reference, String publisher, String name, String version) {
-    super(reference);
+    super(reference, publisher + "/" + name + "/" + version);
     this.publisher = publisher;
     this.name = name;
     this.version = version;

wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/wsplugins/model/PluginFQN.java

@@ -18,7 +18,8 @@
 
 /**
  * Represents full information about plugin, including registry address and id, or direct reference
- * to plugin descriptor. Should NOT contain both reference and id simultaneously.
+ * to plugin descriptor. When {@link PluginFQN#reference} and {@link PluginFQN#id} are set
+ * simultaneously, {@link PluginFQN#reference} should take precedence.
  *
  * @author Max Shaposhnyk
  */
@@ -34,6 +35,11 @@ public PluginFQN(URI registry, String id) {
     this.id = id;
   }
 
+  protected PluginFQN(String reference, String id) {
+    this.reference = reference;
+    this.id = id;
+  }
+
   public PluginFQN(String reference) {
     this.reference = reference;
   }

wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/wsplugins/PluginFQNParserTest.java

@@ -61,6 +61,13 @@ public void shouldReturnEmptyListWhenNoPluginsOrEditors() throws Exception {
         "PluginFQNParser should return empty list when attributes does not contain plugins or editors");
   }
 
+  @Test
+  public void shouldComposeIdWhenAllPartsGivenToTheConstructor() {
+    ExtendedPluginFQN pluginFQN =
+        new ExtendedPluginFQN("reference", "publisher", "name", "version");
+    assertEquals(pluginFQN.getId(), "publisher/name/version");
+  }
+
   @Test(dataProvider = "validAttributesProvider")
   public void shouldParseAllPluginsAndEditor(AttributeParsingTestCase testCase) throws Exception {
     Collection<PluginFQN> actual = parser.parsePlugins(testCase.attributes);