Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CHE-3616 Remove Machine API (server part) #4331

Merged
merged 14 commits into from
Mar 7, 2017
Merged

CHE-3616 Remove Machine API (server part) #4331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a0cd37c
CHE-3620:Remove MachineServiceClient and related classes
Jan 16, 2017
5a682af
Remove Machine API
mshaposhnik Mar 2, 2017
0ff4542
Merge with master
mshaposhnik Mar 2, 2017
85eebba
Merge branch 'master' into 3616
mshaposhnik Mar 3, 2017
00b8235
Merge branch 'master' into che#3620
mshaposhnik Mar 3, 2017
52cf7bc
Merge branch 'che#3620' into 3616
mshaposhnik Mar 3, 2017
274c899
Prevent NULL setting
mshaposhnik Mar 6, 2017
a41f88d
Merge branch 'che#3620' into 3616
mshaposhnik Mar 6, 2017
301a0e2
Revert machne links injector
mshaposhnik Mar 6, 2017
df8bf88
Revert "Merge branch 'che#3620' into 3616"
mshaposhnik Mar 6, 2017
36bbe86
Revert "Merge branch 'che#3620' into 3616"
mshaposhnik Mar 6, 2017
8b8d21c
Fix indent
mshaposhnik Mar 6, 2017
58a2179
fix formatting
mshaposhnik Mar 7, 2017
5154ba2
fix formatting
mshaposhnik Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ...-machine/src/main/java/org/eclipse/che/plugin/docker/machine/local/LocalDockerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import com.google.inject.multibindings.Multibinder;
import com.google.inject.name.Names;

import org.eclipse.che.api.environment.server.MachineService;
import org.eclipse.che.api.machine.server.spi.Instance;
import org.eclipse.che.api.machine.server.spi.InstanceProcess;
import org.eclipse.che.plugin.docker.client.DockerConnector;
Expand All @@ -42,8 +41,6 @@ public class LocalDockerModule extends AbstractModule {

@Override
protected void configure() {
bind(MachineService.class);

install(new FactoryModuleBuilder()
.implement(Instance.class, DockerInstance.class)
.implement(InstanceProcess.class, DockerProcess.class)
Expand Down
92 changes: 5 additions & 87 deletions ...t/server/MachineServiceLinksInjector.java → ...ironment/server/MachineLinksInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,20 @@
*******************************************************************************/
package org.eclipse.che.api.environment.server;

import com.google.common.collect.Lists;

import org.eclipse.che.api.core.rest.ServiceContext;
import org.eclipse.che.api.core.rest.shared.dto.Link;
import org.eclipse.che.api.core.rest.shared.dto.LinkParameter;
import org.eclipse.che.api.machine.shared.Constants;
import org.eclipse.che.api.machine.shared.dto.MachineDto;
import org.eclipse.che.api.machine.shared.dto.MachineProcessDto;
import org.eclipse.che.api.machine.shared.dto.ServerDto;

import javax.inject.Singleton;
import javax.ws.rs.HttpMethod;
import javax.ws.rs.core.UriBuilder;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

import static java.lang.String.format;
import static java.util.Collections.singletonList;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
import static org.eclipse.che.api.core.util.LinksHelper.createLink;
import static org.eclipse.che.api.machine.shared.Constants.ENVIRONMENT_OUTPUT_CHANNEL_TEMPLATE;
import static org.eclipse.che.api.machine.shared.Constants.ENVIRONMENT_STATUS_CHANNEL_TEMPLATE;
Expand All @@ -42,64 +34,26 @@
import static org.eclipse.che.dto.server.DtoFactory.newDto;

/**
* Helps to inject {@link MachineService} related links.
* Helps to inject Machine related links.
*
* @author Anton Korneta
*/
@Singleton
public class MachineServiceLinksInjector {
public class MachineLinksInjector {

public MachineDto injectLinks(MachineDto machine, ServiceContext serviceContext) {
final UriBuilder uriBuilder = serviceContext.getServiceUriBuilder();
final List<Link> links = new ArrayList<>();

links.add(createLink(HttpMethod.GET,
uriBuilder.clone()
.path(MachineService.class, "getMachineById")
.build(machine.getWorkspaceId(), machine.getId())
.toString(),
APPLICATION_JSON,
"self link"));
links.add(createLink(HttpMethod.GET,
uriBuilder.clone()
.path(MachineService.class, "getMachines")
.build(machine.getWorkspaceId())
.toString(),
null,
APPLICATION_JSON,
Constants.LINK_REL_GET_MACHINES));
links.add(createLink(HttpMethod.DELETE,
uriBuilder.clone()
.path(MachineService.class, "stopMachine")
.build(machine.getWorkspaceId(), machine.getId())
.toString(),
Constants.LINK_REL_DESTROY_MACHINE));
links.add(createLink(HttpMethod.POST,
uriBuilder.clone()
.path(MachineService.class, "executeCommandInMachine")
.build(machine.getWorkspaceId(), machine.getId())
.toString(),
APPLICATION_JSON,
APPLICATION_JSON,
Constants.LINK_REL_EXECUTE_COMMAND,
newDto(LinkParameter.class).withName("outputChannel")
.withRequired(false)));
URI getProcessesUri = uriBuilder.clone()
.path(MachineService.class, "getProcesses")
.build(machine.getWorkspaceId(), machine.getId());
links.add(createLink(HttpMethod.GET,
getProcessesUri.toString(),
APPLICATION_JSON,
Constants.LINK_REL_GET_PROCESSES));

injectTerminalLink(machine, serviceContext, links);
injectExecAgentLink(machine, serviceContext, links);

// add workspace channel links
final Link workspaceChannelLink = createLink("GET",
serviceContext.getBaseUriBuilder()
.path("ws")
.scheme("https".equals(getProcessesUri.getScheme()) ? "wss" : "ws")
.scheme("https".equals(
serviceContext.getBaseUriBuilder().build().getScheme()) ? "wss"
: "ws")
.build()
.toString(),
null);
Expand Down Expand Up @@ -154,40 +108,4 @@ protected void injectExecAgentLink(MachineDto machine, ServiceContext serviceCon
EXEC_AGENT_REFERENCE)));
}
}

public MachineProcessDto injectLinks(MachineProcessDto process,
String workspaceId,
String machineId,
ServiceContext serviceContext) {
final UriBuilder uriBuilder = serviceContext.getServiceUriBuilder();
final List<Link> links = Lists.newArrayListWithExpectedSize(3);

links.add(createLink(HttpMethod.DELETE,
uriBuilder.clone()
.path(MachineService.class, "stopProcess")
.build(workspaceId,
machineId,
process.getPid())
.toString(),
Constants.LINK_REL_STOP_PROCESS));
links.add(createLink(HttpMethod.GET,
uriBuilder.clone()
.path(MachineService.class, "getProcessLogs")
.build(workspaceId,
machineId,
process.getPid())
.toString(),
TEXT_PLAIN,
Constants.LINK_REL_GET_PROCESS_LOGS));
links.add(createLink(HttpMethod.GET,
uriBuilder.clone()
.path(MachineService.class, "getProcesses")
.build(workspaceId,
machineId)
.toString(),
APPLICATION_JSON,
Constants.LINK_REL_GET_PROCESSES));

return process.withLinks(links);
}
}
Loading