seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #557 from eclipse/fixStackTypeAdaptersProvider 

Fix use of the wrong gson adapter
6.19.x
Aleksandr Andrienko 2016-03-01 19:02:19 +02:00
parent 50451d166a fa9b539eba
commit 0f712f232f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/platform-api/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/stack/StackTypeAdaptersProvider.java
View File

@ -34,6 +34,7 @@ import org.eclipse.che.api.workspace.server.model.stack.StackSource;
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 class 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());

3
core/platform-api/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java
View File

@ -44,6 +44,7 @@ import org.eclipse.che.api.workspace.server.stack.adapters.ProjectConfigAdapter;
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 class StackLoaderTest {
.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();