From fa9b539eba0269ed8ccbfc177ba086e1c0cdb56d Mon Sep 17 00:00:00 2001 From: Aleksandr Andrienko Date: Tue, 1 Mar 2016 19:00:00 +0200 Subject: [PATCH] Fix use of the wrong gson adapter Signed-off-by: Aleksandr Andrienko --- .../api/workspace/server/stack/StackTypeAdaptersProvider.java | 3 ++- .../che/api/workspace/server/stack/StackLoaderTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/platform-api/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackTypeAdaptersProvider.java b/core/platform-api/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackTypeAdaptersProvider.java index 83bf41d7504..0e410426a8b 100644 --- a/core/platform-api/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackTypeAdaptersProvider.java +++ b/core/platform-api/che-core-api-workspace/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/core/platform-api/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java b/core/platform-api/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java index 5aed15c63ff..d98f524c3e5 100644 --- a/core/platform-api/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java +++ b/core/platform-api/che-core-api-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();