Merge pull request #557 from eclipse/fixStackTypeAdaptersProvider

Fix use of the wrong gson adapter
eclipse-che · Mar 1, 2016 · 0f712f2 · 0f712f2
2 parents 50451d1 + fa9b539
commit 0f712f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...e/src/main/java/org/eclipse/che/api/workspace/server/stack/StackTypeAdaptersProvider.java b/...e/src/main/java/org/eclipse/che/api/workspace/server/stack/StackTypeAdaptersProvider.java
@@ -34,6 +34,7 @@
 import org.eclipse.che.api.workspace.server.stack.adapters.CommandAdapter;
 import org.eclipse.che.api.workspace.server.stack.adapters.EnvironmentAdapter;
 import org.eclipse.che.api.workspace.server.stack.adapters.LimitsAdapter;
+import org.eclipse.che.api.workspace.server.stack.adapters.MachineConfigAdapter;
 import org.eclipse.che.api.workspace.server.stack.adapters.MachineSourceAdapter;
 import org.eclipse.che.api.workspace.server.stack.adapters.ProjectConfigAdapter;
 import org.eclipse.che.api.workspace.server.stack.adapters.StackComponentAdapter;
@@ -71,7 +72,7 @@ public StackTypeAdaptersProvider() {
         adapters.put(Recipe.class, new RecipeTypeAdapter());
         adapters.put(Limits.class, new LimitsAdapter());
         adapters.put(MachineSource.class, new MachineSourceAdapter());
-        adapters.put(MachineConfig.class, new MachineSourceAdapter());
+        adapters.put(MachineConfig.class, new MachineConfigAdapter());
         adapters.put(StackSource.class, new StackSourceAdapter());
         adapters.put(Permissions.class, new PermissionsAdapter());
         adapters.put(Group.class, new GroupAdapter());

diff --git a/...i-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java b/...i-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java
@@ -44,6 +44,7 @@
 import org.eclipse.che.api.workspace.server.stack.adapters.StackComponentAdapter;
 import org.eclipse.che.api.workspace.server.stack.adapters.StackSourceAdapter;
 import org.eclipse.che.api.workspace.server.stack.adapters.WorkspaceConfigAdapter;
+import org.eclipse.che.api.workspace.server.stack.adapters.MachineConfigAdapter;
 import org.eclipse.che.api.workspace.shared.dto.EnvironmentDto;
 import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto;
 import org.eclipse.che.api.workspace.shared.dto.ProjectProblemDto;
@@ -216,7 +217,7 @@ public void dtoShouldBeSerialized() {
                                      .registerTypeAdapter(Recipe.class, new RecipeTypeAdapter())
                                      .registerTypeAdapter(Limits.class, new LimitsAdapter())
                                      .registerTypeAdapter(MachineSource.class, new MachineSourceAdapter())
-                                     .registerTypeAdapter(MachineConfig.class, new MachineSourceAdapter())
+                                     .registerTypeAdapter(MachineConfig.class, new MachineConfigAdapter())
                                      .registerTypeAdapter(StackSource.class, new StackSourceAdapter())
                                      .create();