Skip to content

Commit

Permalink
Merge with master
Browse files Browse the repository at this point in the history
  • Loading branch information
@skabashnyuk
skabashnyuk committed Oct 15, 2017
2 parents 03cb20a + 9581a9b commit e321ab0
Show file tree
Hide file tree
Showing 362 changed files with 848 additions and 826 deletions.
2 changes: 1 addition & 1 deletion agents/bootstrapper/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>bootstrapper</artifactId>
<name>Agents :: Bootstrapper</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/exec/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>exec-agent</artifactId>
<name>Agent :: Exec</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/git-credentials/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>git-credentials-agent</artifactId>
<name>Git Credentials Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/go-agents/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>go-agents</artifactId>
<name>Agent :: Golang agents</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/ls-csharp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>ls-csharp-agent</artifactId>
<name>Language Server C# Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/ls-json/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>ls-json-agent</artifactId>
<name>Language Server Json Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/ls-php/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>ls-php-agent</artifactId>
<name>Language Server PHP Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/ls-python/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>ls-python-agent</artifactId>
<name>Language Server python Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/ls-typescript/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>ls-typescript-agent</artifactId>
<name>Language Server typescript Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/ls-yaml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>ls-yaml-agent</artifactId>
<name>Language Server Yaml Agent</name>
Expand Down
4 changes: 2 additions & 2 deletions agents/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-agents-parent</artifactId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Agents Parent</name>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion agents/ssh/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>ssh-agent</artifactId>
<name>SSH Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/terminal/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>terminal-agent</artifactId>
<name>Agent :: Terminal</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/test-ls/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>test-ls-agent</artifactId>
<name>Test Language Server Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion agents/unison/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>unison-agent</artifactId>
<name>Unison Agent</name>
Expand Down
2 changes: 1 addition & 1 deletion assembly-multiuser/assembly-ide-war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-ide-war</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly-multiuser/assembly-main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-main</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly-multiuser/assembly-wsagent-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-server</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly-multiuser/assembly-wsagent-war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-war</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly-multiuser/assembly-wsmaster-war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsmaster-war</artifactId>
<packaging>war</packaging>
Expand Down
4 changes: 2 additions & 2 deletions assembly-multiuser/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<artifactId>che-assembly-parent</artifactId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che IDE Assembly Multiuser :: Parent</name>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-ide-war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-ide-war</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-main</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-wsagent-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-server</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assembly/assembly-wsagent-war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-war</artifactId>
<packaging>war</packaging>
Expand Down
4 changes: 2 additions & 2 deletions assembly/assembly-wsmaster-war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsmaster-war</artifactId>
<packaging>war</packaging>
Expand Down Expand Up @@ -304,7 +304,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che</groupId>
<artifactId>che-assembly-parent</artifactId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che IDE :: Parent</name>
<modules>
Expand Down
7 changes: 1 addition & 6 deletions core/che-core-api-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-core</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -152,11 +152,6 @@
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down
3 changes: 3 additions & 0 deletions ...re/src/test/java/org/eclipse/che/api/core/jsonrpc/commons/JsonRpcMessageReceiverTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.testng.MockitoTestNGListener;
import org.testng.annotations.Listeners;
import org.testng.annotations.Test;
Expand Down Expand Up @@ -75,6 +76,8 @@ public void shouldDispatchResponseIfResponseReceived() throws Exception {
when(jsonRpcQualifier.isJsonRpcResponse(MESSAGE)).thenReturn(true);
when(jsonRpcQualifier.isJsonRpcRequest(MESSAGE)).thenReturn(false);
when(jsonRpcUnmarshaller.unmarshalArray(any())).thenReturn(singletonList(MESSAGE));
JsonRpcResponse jsonRpcResponse = Mockito.mock(JsonRpcResponse.class);
when(jsonRpcUnmarshaller.unmarshalResponse(any())).thenReturn(jsonRpcResponse);

jsonRpcMessageReceiver.receive(ENDPOINT_ID, MESSAGE);

Expand Down
20 changes: 15 additions & 5 deletions ...core-api-core/src/test/java/org/eclipse/che/api/core/rest/DefaultHttpJsonRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static org.eclipse.che.api.core.util.LinksHelper.createLink;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
Expand Down Expand Up @@ -98,8 +97,13 @@ public void shouldUseUrlAndMethodFromTheLinks() throws Exception {
final DefaultHttpJsonRequest request = spy(new DefaultHttpJsonRequest(link));
doReturn(new DefaultHttpJsonResponse("", 200))
.when(request)
.doRequest(anyInt(), anyString(), anyString(), anyObject(), any(), anyString());

.doRequest(
anyInt(),
anyString(),
anyString(),
nullable(Object.class),
nullable(List.class),
nullable(String.class));
request.request();

verify(request).doRequest(0, DEFAULT_URL, "POST", null, null, null);
Expand Down Expand Up @@ -365,6 +369,12 @@ private String getUrl(ITestContext ctx) {
private void prepareResponse(String response) throws Exception {
doReturn(new DefaultHttpJsonResponse(response, 200))
.when(request)
.doRequest(anyInt(), anyString(), anyString(), anyObject(), any(), anyString());
.doRequest(
anyInt(),
anyString(),
anyString(),
nullable(Object.class),
nullable(List.class),
nullable(String.class));
}
}
18 changes: 15 additions & 3 deletions .../java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentCompositeLineConsumerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import org.mockito.Mock;
import org.mockito.exceptions.base.MockitoException;
import org.mockito.internal.invocation.InvocationMatcher;
import org.mockito.internal.verification.VerificationModeFactory;
import org.mockito.internal.verification.api.VerificationData;
import org.mockito.invocation.Invocation;
import org.mockito.testng.MockitoTestNGListener;
import org.mockito.verification.VerificationMode;
Expand Down Expand Up @@ -260,8 +262,10 @@ private LineConsumer[] appendTo(LineConsumer[] base, LineConsumer... toAppend) {
* verify(someMock, last()).someMethod();
* </code></pre>
*/
private static VerificationMode last() {
return (verificationData) -> {
public static class Last implements VerificationMode {
public Last() {}

public void verify(VerificationData verificationData) {
List<Invocation> invocations = verificationData.getAllInvocations();
InvocationMatcher invocationMatcher = verificationData.getWanted();

Expand All @@ -276,6 +280,14 @@ private static VerificationMode last() {
if (!invocationMatcher.matches(invocation)) {
throw new MockitoException("\nWanted but not invoked:\n" + invocationMatcher);
}
};
}

public VerificationMode description(String description) {
return VerificationModeFactory.description(this, description);
}
}

public static VerificationMode last() {
return new Last();
}
}
2 changes: 1 addition & 1 deletion core/che-core-api-dto-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.19.0-SNAPSHOT</version>
<version>5.20.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
Expand Down
Loading

0 comments on commit e321ab0

Please sign in to comment.