diff --git a/agents/bootstrapper/pom.xml b/agents/bootstrapper/pom.xml index f538ea61d8a..12417d12b06 100644 --- a/agents/bootstrapper/pom.xml +++ b/agents/bootstrapper/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT bootstrapper Agents :: Bootstrapper diff --git a/agents/exec/pom.xml b/agents/exec/pom.xml index 019a20f091f..71c71de1f6d 100644 --- a/agents/exec/pom.xml +++ b/agents/exec/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT exec-agent Agent :: Exec diff --git a/agents/git-credentials/pom.xml b/agents/git-credentials/pom.xml index 07506c3cbf1..0c45e6780de 100644 --- a/agents/git-credentials/pom.xml +++ b/agents/git-credentials/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT git-credentials-agent Git Credentials Agent diff --git a/agents/go-agents/pom.xml b/agents/go-agents/pom.xml index 3b682a7168a..43341849999 100644 --- a/agents/go-agents/pom.xml +++ b/agents/go-agents/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT go-agents Agent :: Golang agents diff --git a/agents/ls-csharp/pom.xml b/agents/ls-csharp/pom.xml index 8dc53530890..79f933c7dbb 100644 --- a/agents/ls-csharp/pom.xml +++ b/agents/ls-csharp/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ls-csharp-agent Language Server C# Agent diff --git a/agents/ls-json/pom.xml b/agents/ls-json/pom.xml index bcb110ecec7..3798a965e07 100644 --- a/agents/ls-json/pom.xml +++ b/agents/ls-json/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ls-json-agent Language Server Json Agent diff --git a/agents/ls-php/pom.xml b/agents/ls-php/pom.xml index 294ac9dd611..84f6f31ec08 100644 --- a/agents/ls-php/pom.xml +++ b/agents/ls-php/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ls-php-agent Language Server PHP Agent diff --git a/agents/ls-python/pom.xml b/agents/ls-python/pom.xml index 97e697770ee..4c4ff6c15b8 100644 --- a/agents/ls-python/pom.xml +++ b/agents/ls-python/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ls-python-agent Language Server python Agent diff --git a/agents/ls-typescript/pom.xml b/agents/ls-typescript/pom.xml index 6b47d98a42e..d804af54da3 100644 --- a/agents/ls-typescript/pom.xml +++ b/agents/ls-typescript/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ls-typescript-agent Language Server typescript Agent diff --git a/agents/ls-yaml/pom.xml b/agents/ls-yaml/pom.xml index 866e1e5ab6e..2cf4d7355d7 100644 --- a/agents/ls-yaml/pom.xml +++ b/agents/ls-yaml/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ls-yaml-agent Language Server Yaml Agent diff --git a/agents/pom.xml b/agents/pom.xml index ac1c9cd9ebf..5086d033434 100644 --- a/agents/pom.xml +++ b/agents/pom.xml @@ -16,11 +16,11 @@ che-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-agents-parent - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT pom Che Agents Parent diff --git a/agents/ssh/pom.xml b/agents/ssh/pom.xml index e5c7800bb54..02dd5c2a943 100644 --- a/agents/ssh/pom.xml +++ b/agents/ssh/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ssh-agent SSH Agent diff --git a/agents/terminal/pom.xml b/agents/terminal/pom.xml index a7ef8da65b8..67c40f8c2b8 100644 --- a/agents/terminal/pom.xml +++ b/agents/terminal/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT terminal-agent Agent :: Terminal diff --git a/agents/test-ls/pom.xml b/agents/test-ls/pom.xml index fa8bfc17871..6832bf79bfd 100644 --- a/agents/test-ls/pom.xml +++ b/agents/test-ls/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT test-ls-agent Test Language Server Agent diff --git a/agents/unison/pom.xml b/agents/unison/pom.xml index 8408b346277..73b81b7cae4 100644 --- a/agents/unison/pom.xml +++ b/agents/unison/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT unison-agent Unison Agent diff --git a/assembly-multiuser/assembly-ide-war/pom.xml b/assembly-multiuser/assembly-ide-war/pom.xml index 5144bfc1f34..61642b090a1 100644 --- a/assembly-multiuser/assembly-ide-war/pom.xml +++ b/assembly-multiuser/assembly-ide-war/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che.assembly-multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT assembly-ide-war war diff --git a/assembly-multiuser/assembly-main/pom.xml b/assembly-multiuser/assembly-main/pom.xml index 23a370a0180..525c3f94237 100644 --- a/assembly-multiuser/assembly-main/pom.xml +++ b/assembly-multiuser/assembly-main/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che.assembly-multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT assembly-main pom diff --git a/assembly-multiuser/assembly-wsagent-server/pom.xml b/assembly-multiuser/assembly-wsagent-server/pom.xml index 829de0dc0d3..f02a79ed20c 100644 --- a/assembly-multiuser/assembly-wsagent-server/pom.xml +++ b/assembly-multiuser/assembly-wsagent-server/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che.assembly-multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT assembly-wsagent-server pom diff --git a/assembly-multiuser/assembly-wsagent-war/pom.xml b/assembly-multiuser/assembly-wsagent-war/pom.xml index fae6479db80..46d261ca5b9 100644 --- a/assembly-multiuser/assembly-wsagent-war/pom.xml +++ b/assembly-multiuser/assembly-wsagent-war/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che.assembly-multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT assembly-wsagent-war war diff --git a/assembly-multiuser/assembly-wsmaster-war/pom.xml b/assembly-multiuser/assembly-wsmaster-war/pom.xml index b28560f4a2d..b66f3709063 100644 --- a/assembly-multiuser/assembly-wsmaster-war/pom.xml +++ b/assembly-multiuser/assembly-wsmaster-war/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che.assembly-multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT assembly-wsmaster-war war diff --git a/assembly-multiuser/pom.xml b/assembly-multiuser/pom.xml index b834ae96dc5..74e745be39a 100644 --- a/assembly-multiuser/pom.xml +++ b/assembly-multiuser/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml org.eclipse.che.assembly-multiuser che-assembly-parent - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT pom Che IDE Assembly Multiuser :: Parent diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml index 966009ff71a..55e5a6d9802 100644 --- a/assembly/assembly-ide-war/pom.xml +++ b/assembly/assembly-ide-war/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT assembly-ide-war war diff --git a/assembly/assembly-main/pom.xml b/assembly/assembly-main/pom.xml index ffc03fc8f4b..c6b5b16144a 100644 --- a/assembly/assembly-main/pom.xml +++ b/assembly/assembly-main/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT assembly-main pom diff --git a/assembly/assembly-wsagent-server/pom.xml b/assembly/assembly-wsagent-server/pom.xml index 4fa13ff4de3..35504d3df5d 100644 --- a/assembly/assembly-wsagent-server/pom.xml +++ b/assembly/assembly-wsagent-server/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT assembly-wsagent-server pom diff --git a/assembly/assembly-wsagent-war/pom.xml b/assembly/assembly-wsagent-war/pom.xml index 0c8383ff3ea..17ec5bb9a5f 100644 --- a/assembly/assembly-wsagent-war/pom.xml +++ b/assembly/assembly-wsagent-war/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT assembly-wsagent-war war diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml index 9842b3abe2e..76b6b1941b9 100644 --- a/assembly/assembly-wsmaster-war/pom.xml +++ b/assembly/assembly-wsmaster-war/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT assembly-wsmaster-war war @@ -304,7 +304,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/assembly/pom.xml b/assembly/pom.xml index 9ab6d1521a9..e0b2352a7b2 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml org.eclipse.che che-assembly-parent - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT pom Che IDE :: Parent diff --git a/core/che-core-api-core/pom.xml b/core/che-core-api-core/pom.xml index 58e6603d59d..c50072075b4 100644 --- a/core/che-core-api-core/pom.xml +++ b/core/che-core-api-core/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-core jar @@ -152,11 +152,6 @@ hamcrest-library test - - org.mockito - mockito-all - test - org.mockito mockito-core diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/jsonrpc/commons/JsonRpcMessageReceiverTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/jsonrpc/commons/JsonRpcMessageReceiverTest.java index 2201fda1dcd..b487b33dc78 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/jsonrpc/commons/JsonRpcMessageReceiverTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/jsonrpc/commons/JsonRpcMessageReceiverTest.java @@ -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; @@ -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); diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/DefaultHttpJsonRequestTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/DefaultHttpJsonRequestTest.java index 5cb0f28ce26..a0ad05a8bc7 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/DefaultHttpJsonRequestTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/DefaultHttpJsonRequestTest.java @@ -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; @@ -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); @@ -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)); } } diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentCompositeLineConsumerTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentCompositeLineConsumerTest.java index 2da7c346981..08933697d14 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentCompositeLineConsumerTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentCompositeLineConsumerTest.java @@ -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; @@ -260,8 +262,10 @@ private LineConsumer[] appendTo(LineConsumer[] base, LineConsumer... toAppend) { * verify(someMock, last()).someMethod(); * */ - private static VerificationMode last() { - return (verificationData) -> { + public static class Last implements VerificationMode { + public Last() {} + + public void verify(VerificationData verificationData) { List invocations = verificationData.getAllInvocations(); InvocationMatcher invocationMatcher = verificationData.getWanted(); @@ -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(); } } diff --git a/core/che-core-api-dto-maven-plugin/pom.xml b/core/che-core-api-dto-maven-plugin/pom.xml index 120c0e7c78d..2fe6be48deb 100644 --- a/core/che-core-api-dto-maven-plugin/pom.xml +++ b/core/che-core-api-dto-maven-plugin/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-dto-maven-plugin maven-plugin diff --git a/core/che-core-api-dto/pom.xml b/core/che-core-api-dto/pom.xml index 5079575ab85..578f0227917 100644 --- a/core/che-core-api-dto/pom.xml +++ b/core/che-core-api-dto/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-dto jar diff --git a/core/che-core-api-model/pom.xml b/core/che-core-api-model/pom.xml index f5a4e596002..6e2ae008ed8 100644 --- a/core/che-core-api-model/pom.xml +++ b/core/che-core-api-model/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-model jar diff --git a/core/che-core-db-vendor-h2/pom.xml b/core/che-core-db-vendor-h2/pom.xml index 89853b27e9a..2403b2d04dc 100644 --- a/core/che-core-db-vendor-h2/pom.xml +++ b/core/che-core-db-vendor-h2/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-db-vendor-h2 Che Core :: DB :: Vendor H2 diff --git a/core/che-core-db-vendor-postgresql/pom.xml b/core/che-core-db-vendor-postgresql/pom.xml index e21952cd2b1..f3b1a2f0494 100644 --- a/core/che-core-db-vendor-postgresql/pom.xml +++ b/core/che-core-db-vendor-postgresql/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-db-vendor-postgresql Che Core :: DB :: Vendor PostgreSQL diff --git a/core/che-core-db/pom.xml b/core/che-core-db/pom.xml index 8bfc3298074..1ef2bf3facd 100644 --- a/core/che-core-db/pom.xml +++ b/core/che-core-db/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-db Che Core :: DB diff --git a/core/che-core-typescript-dto-maven-plugin/pom.xml b/core/che-core-typescript-dto-maven-plugin/pom.xml index 751e6b1b5e1..c0c5151743d 100644 --- a/core/che-core-typescript-dto-maven-plugin/pom.xml +++ b/core/che-core-typescript-dto-maven-plugin/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.che.core che-core-typescript-dto-maven-plugin @@ -105,7 +105,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/core/commons/che-core-commons-annotations/pom.xml b/core/commons/che-core-commons-annotations/pom.xml index 65d337aef31..dc8ce30fed7 100644 --- a/core/commons/che-core-commons-annotations/pom.xml +++ b/core/commons/che-core-commons-annotations/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-commons-annotations jar diff --git a/core/commons/che-core-commons-auth/pom.xml b/core/commons/che-core-commons-auth/pom.xml index e437f36bcda..9e36000c3b3 100644 --- a/core/commons/che-core-commons-auth/pom.xml +++ b/core/commons/che-core-commons-auth/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-commons-auth jar diff --git a/core/commons/che-core-commons-inject/pom.xml b/core/commons/che-core-commons-inject/pom.xml index a53b24456ab..a4a0c91e935 100644 --- a/core/commons/che-core-commons-inject/pom.xml +++ b/core/commons/che-core-commons-inject/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-commons-inject jar @@ -79,16 +79,9 @@ che-core-commons-test test - - org.mockito - mockito-all - ${org.mockito.version} - test - org.mockito mockito-core - ${org.mockito.version} test diff --git a/core/commons/che-core-commons-j2ee/pom.xml b/core/commons/che-core-commons-j2ee/pom.xml index d27d13c2008..f40b40422ef 100644 --- a/core/commons/che-core-commons-j2ee/pom.xml +++ b/core/commons/che-core-commons-j2ee/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-commons-j2ee jar diff --git a/core/commons/che-core-commons-json/pom.xml b/core/commons/che-core-commons-json/pom.xml index 6356be9187d..734f05dac9c 100644 --- a/core/commons/che-core-commons-json/pom.xml +++ b/core/commons/che-core-commons-json/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-commons-json jar diff --git a/core/commons/che-core-commons-lang/pom.xml b/core/commons/che-core-commons-lang/pom.xml index 4871cc83e15..94692af9a97 100644 --- a/core/commons/che-core-commons-lang/pom.xml +++ b/core/commons/che-core-commons-lang/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-commons-lang jar @@ -42,11 +42,6 @@ slf4j-api - - org.mockito - mockito-all - test - org.mockito mockito-core diff --git a/core/commons/che-core-commons-mail/pom.xml b/core/commons/che-core-commons-mail/pom.xml index 216f88be287..61771645ef8 100644 --- a/core/commons/che-core-commons-mail/pom.xml +++ b/core/commons/che-core-commons-mail/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-commons-mail jar diff --git a/core/commons/che-core-commons-schedule/pom.xml b/core/commons/che-core-commons-schedule/pom.xml index 14e7dad981d..4313f60f428 100644 --- a/core/commons/che-core-commons-schedule/pom.xml +++ b/core/commons/che-core-commons-schedule/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-commons-schedule jar diff --git a/core/commons/che-core-commons-test/pom.xml b/core/commons/che-core-commons-test/pom.xml index 14d791a606e..2712049dbd1 100644 --- a/core/commons/che-core-commons-test/pom.xml +++ b/core/commons/che-core-commons-test/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-commons-test jar diff --git a/core/commons/che-core-commons-xml/pom.xml b/core/commons/che-core-commons-xml/pom.xml index 1bbacc4c1a8..427911d3186 100644 --- a/core/commons/che-core-commons-xml/pom.xml +++ b/core/commons/che-core-commons-xml/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-commons-xml jar diff --git a/core/commons/pom.xml b/core/commons/pom.xml index 873b2babfcc..6e3adf68cce 100644 --- a/core/commons/pom.xml +++ b/core/commons/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-core-commons-parent diff --git a/core/pom.xml b/core/pom.xml index 3cfe8c5e3af..a111497f650 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml org.eclipse.che.core che-core-parent - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT pom Che Core Parent diff --git a/dashboard/pom.xml b/dashboard/pom.xml index 721f3383a1a..57f0bda6c20 100644 --- a/dashboard/pom.xml +++ b/dashboard/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml org.eclipse.che.dashboard che-dashboard-war - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT war Che Dashboard :: Web App 2015 diff --git a/dockerfiles/cli/version/5.20.0/images b/dockerfiles/cli/version/5.20.0/images new file mode 100644 index 00000000000..785552e369d --- /dev/null +++ b/dockerfiles/cli/version/5.20.0/images @@ -0,0 +1,7 @@ +IMAGE_INIT=eclipse/che-init:5.20.0 +IMAGE_CHE=eclipse/che-server:5.20.0 +IMAGE_CHE_MULTIUSER=eclipse/che-server-multiuser:5.20.0 +IMAGE_COMPOSE=docker/compose:1.10.1 +IMAGE_TRAEFIK=traefik:v1.3.0-rc3 +IMAGE_POSTGRES=centos/postgresql-96-centos7:9.6 +IMAGE_KEYCLOACK=jboss/keycloak-openshift:3.3.0.CR2-2 diff --git a/dockerfiles/cli/version/5.20.0/images-stacks b/dockerfiles/cli/version/5.20.0/images-stacks new file mode 100644 index 00000000000..73398d4dd94 --- /dev/null +++ b/dockerfiles/cli/version/5.20.0/images-stacks @@ -0,0 +1,23 @@ +eclipse/alpine_jdk8 +eclipse/aspnet +eclipse/centos_jdk8 +eclipse/cpp_gcc +eclipse/debian_jdk8 +eclipse/debian_jdk8_node +eclipse/debian_jre +eclipse/dotnet_core +eclipse/hadoop-dev +eclipse/meteor +eclipse/node +eclipse/php +eclipse/platformio +eclipse/ruby_rails +eclipse/selenium +eclipse/ubuntu_android +eclipse/ubuntu_go +eclipse/ubuntu_gradle +eclipse/ubuntu_jdk8 +eclipse/ubuntu_jre +eclipse/ubuntu_python +eclipse/ubuntu_wildfly8 +registry.centos.org/che-stacks/vertx diff --git a/dockerfiles/cli/version/latest.ver b/dockerfiles/cli/version/latest.ver index 83a4fb9c4f1..a472b6a4801 100644 --- a/dockerfiles/cli/version/latest.ver +++ b/dockerfiles/cli/version/latest.ver @@ -1 +1 @@ -5.18.0 \ No newline at end of file +5.19.0 \ No newline at end of file diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_and_keycloak.sh b/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_and_keycloak.sh index 209e6c88846..6ff722efd19 100755 --- a/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_and_keycloak.sh +++ b/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_and_keycloak.sh @@ -6,8 +6,6 @@ # http://www.eclipse.org/legal/epl-v10.html # -set -e - COMMAND_DIR=$(dirname "$0") "$COMMAND_DIR"/deploy_postgres_only.sh diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_only.sh b/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_only.sh index 47f79c6eb3b..65287fed937 100755 --- a/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_only.sh +++ b/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_only.sh @@ -6,8 +6,6 @@ # http://www.eclipse.org/legal/epl-v10.html # -set -e - COMMAND_DIR=$(dirname "$0") oc create -f "$COMMAND_DIR"/che-init-image-stream.yaml diff --git a/dockerfiles/lib/dto-pom.xml b/dockerfiles/lib/dto-pom.xml index 083fd8c68db..adc37152d77 100644 --- a/dockerfiles/lib/dto-pom.xml +++ b/dockerfiles/lib/dto-pom.xml @@ -17,13 +17,13 @@ maven-depmgt-pom org.eclipse.che.depmgt - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT dto-typescript pom Che TypeScript DTO - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT diff --git a/ide/che-core-dyna-provider-generator-maven-plugin/pom.xml b/ide/che-core-dyna-provider-generator-maven-plugin/pom.xml index 5992cb69c49..25010b78737 100644 --- a/ide/che-core-dyna-provider-generator-maven-plugin/pom.xml +++ b/ide/che-core-dyna-provider-generator-maven-plugin/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-dyna-provider-generator-maven-plugin maven-plugin @@ -92,7 +92,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/ide/che-core-ide-api/pom.xml b/ide/che-core-ide-api/pom.xml index 4e8f9f58d4c..9893347e1af 100644 --- a/ide/che-core-ide-api/pom.xml +++ b/ide/che-core-ide-api/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.che.core che-core-ide-api diff --git a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/action/DefaultActionGroupTest.java b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/action/DefaultActionGroupTest.java index 2e32caa9e90..42ae952ab78 100644 --- a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/action/DefaultActionGroupTest.java +++ b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/action/DefaultActionGroupTest.java @@ -362,7 +362,6 @@ public void shouldResortAllActionsAfterAddingOne() { when(actionManager.getId(eq(secondAction))).thenReturn("secondAction"); defaultActionGroup.add(thirdAction, new Constraints(AFTER, "fourthAction")); - when(actionManager.getId(eq(thirdAction))).thenReturn("thirdAction"); // verify order Action[] result = defaultActionGroup.getChildren(mock(ActionEvent.class)); @@ -371,7 +370,6 @@ public void shouldResortAllActionsAfterAddingOne() { // add other actions defaultActionGroup.add(fourthAction); - when(actionManager.getId(eq(thirdAction))).thenReturn("thirdAction"); defaultActionGroup.add(fifthAction, Constraints.FIRST); when(actionManager.getId(eq(fifthAction))).thenReturn("fifthAction"); diff --git a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/changeintercept/changeintercept/CloseCStyleCommentChangeInterceptorTest.java b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/changeintercept/changeintercept/CloseCStyleCommentChangeInterceptorTest.java index 67dd326b971..4901d1465f0 100644 --- a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/changeintercept/changeintercept/CloseCStyleCommentChangeInterceptorTest.java +++ b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/changeintercept/changeintercept/CloseCStyleCommentChangeInterceptorTest.java @@ -82,9 +82,7 @@ public void testFirstLineNoLeadingSpaces() { @Test public void testStartNotEmptyLine() { - doReturn("whatever").when(document).getLineContent(0); doReturn("s/*").when(document).getLineContent(1); - doReturn(" *").when(document).getLineContent(2); final TextChange input = new TextChange.Builder() .from(new TextPosition(1, 3)) @@ -173,8 +171,6 @@ public void testJavadocStyleComment() { @Test public void testPasteWholeCommentStart() { - doReturn("/**").when(document).getLineContent(0); - doReturn(" *").when(document).getLineContent(1); final TextChange input = new TextChange.Builder() .from(new TextPosition(0, 0)) @@ -187,8 +183,6 @@ public void testPasteWholeCommentStart() { @Test public void testCloseComment() { - doReturn("/**").when(document).getLineContent(0); - doReturn(" *").when(document).getLineContent(1); final TextChange input = new TextChange.Builder() .from(new TextPosition(0, 0)) diff --git a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/wizard/AbstractWizardTest.java b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/wizard/AbstractWizardTest.java index 574b2582649..d72fc2d20a2 100644 --- a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/wizard/AbstractWizardTest.java +++ b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/wizard/AbstractWizardTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Testing {@link AbstractWizard}. @@ -128,11 +128,9 @@ public void testCanCompleteWhenAllPagesIsCompleted() throws Exception { public void testCanCompleteWhenSomePageIsNotCompleted() throws Exception { when(page1.isCompleted()).thenReturn(true); when(page2.isCompleted()).thenReturn(false); - when(page3.isCompleted()).thenReturn(true); wizard.addPage(page1); wizard.addPage(page2); - wizard.addPage(page3); assertEquals(false, wizard.canComplete()); } @@ -189,16 +187,12 @@ public void testHasPreviousUseCase1() throws Exception { /** In case the wizard has got 3 skipped pages and 1 not skipped page. */ private void prepareTestCase1() { when(page1.canSkip()).thenReturn(false); - when(page1.isCompleted()).thenReturn(true); when(page2.canSkip()).thenReturn(false); - when(page2.isCompleted()).thenReturn(true); when(page3.canSkip()).thenReturn(true); - when(page3.isCompleted()).thenReturn(true); when(page4.canSkip()).thenReturn(false); - when(page4.isCompleted()).thenReturn(true); wizard.addPage(page1); wizard.addPage(page2); @@ -250,16 +244,12 @@ public void testHasPreviousUseCase2() throws Exception { /** In case the wizard has got 2 not skipped pages and 2 skipped page. */ private void prepareTestCase2() { when(page1.canSkip()).thenReturn(false); - when(page1.isCompleted()).thenReturn(true); when(page2.canSkip()).thenReturn(false); - when(page2.isCompleted()).thenReturn(true); when(page3.canSkip()).thenReturn(true); - when(page3.isCompleted()).thenReturn(true); when(page4.canSkip()).thenReturn(true); - when(page4.isCompleted()).thenReturn(true); wizard.addPage(page1); wizard.addPage(page2); diff --git a/ide/che-core-ide-app/pom.xml b/ide/che-core-ide-app/pom.xml index 066f9fbc0b8..819c944f06c 100644 --- a/ide/che-core-ide-app/pom.xml +++ b/ide/che-core-ide-app/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-ide-app jar diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/goal/GoalPageTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/goal/GoalPageTest.java index 022508fb506..60af36dc51f 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/goal/GoalPageTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/goal/GoalPageTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.ide.command.editor.page.goal; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anySet; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -137,14 +137,14 @@ public void shouldCreateGoal() throws Exception { // given InputDialog inputDialog = mock(InputDialog.class); when(dialogFactory.createInputDialog( - anyString(), - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), + nullable(String.class), eq(0), eq(0), - anyString(), - any(InputCallback.class), - any(CancelCallback.class))) + nullable(String.class), + nullable(InputCallback.class), + nullable(CancelCallback.class))) .thenReturn(inputDialog); String newGoalId = "new goal"; @@ -155,14 +155,14 @@ public void shouldCreateGoal() throws Exception { ArgumentCaptor inputCaptor = ArgumentCaptor.forClass(InputCallback.class); verify(dialogFactory) .createInputDialog( - anyString(), - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), + nullable(String.class), eq(0), eq(0), - anyString(), + nullable(String.class), inputCaptor.capture(), - isNull(CancelCallback.class)); + isNull()); verify(inputDialog).show(); inputCaptor.getValue().accepted(newGoalId); verify(view).setGoal(eq(newGoalId)); diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/explorer/CommandsExplorerPresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/explorer/CommandsExplorerPresenterTest.java index 80c33782714..75c684c94c4 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/explorer/CommandsExplorerPresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/explorer/CommandsExplorerPresenterTest.java @@ -13,6 +13,7 @@ import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.EMERGE_MODE; import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -241,7 +242,10 @@ public void shouldRemoveCommand() throws Exception { // given ConfirmDialog confirmDialog = mock(ConfirmDialog.class); when(dialogFactory.createConfirmDialog( - anyString(), anyString(), any(ConfirmCallback.class), any(CancelCallback.class))) + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), + nullable(CancelCallback.class))) .thenReturn(confirmDialog); ArgumentCaptor confirmCallbackCaptor = ArgumentCaptor.forClass(ConfirmCallback.class); @@ -249,7 +253,7 @@ public void shouldRemoveCommand() throws Exception { CommandImpl command = mock(CommandImpl.class); String cmdName = "build"; when(command.getName()).thenReturn(cmdName); - when(commandManager.removeCommand(anyString())).thenReturn(voidPromise); + when(commandManager.removeCommand(nullable(String.class))).thenReturn(voidPromise); // when presenter.onCommandRemove(command); @@ -257,10 +261,10 @@ public void shouldRemoveCommand() throws Exception { // then verify(dialogFactory) .createConfirmDialog( - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), confirmCallbackCaptor.capture(), - isNull(CancelCallback.class)); + isNull()); confirmCallbackCaptor.getValue().accepted(); verify(confirmDialog).show(); verify(commandManager).removeCommand(cmdName); @@ -270,7 +274,10 @@ public void shouldRemoveCommand() throws Exception { public void shouldNotRemoveCommandWhenCancelled() throws Exception { ConfirmDialog confirmDialog = mock(ConfirmDialog.class); when(dialogFactory.createConfirmDialog( - anyString(), anyString(), any(ConfirmCallback.class), any(CancelCallback.class))) + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), + nullable(CancelCallback.class))) .thenReturn(confirmDialog); CommandImpl command = mock(CommandImpl.class); @@ -278,7 +285,10 @@ public void shouldNotRemoveCommandWhenCancelled() throws Exception { verify(dialogFactory) .createConfirmDialog( - anyString(), anyString(), any(ConfirmCallback.class), isNull(CancelCallback.class)); + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), + isNull()); verify(confirmDialog).show(); verify(commandManager, never()).removeCommand(anyString()); } @@ -288,12 +298,15 @@ public void shouldShowNotificationWhenFailedToRemoveCommand() throws Exception { // given ConfirmDialog confirmDialog = mock(ConfirmDialog.class); when(dialogFactory.createConfirmDialog( - anyString(), anyString(), any(ConfirmCallback.class), any(CancelCallback.class))) + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), + nullable(CancelCallback.class))) .thenReturn(confirmDialog); ArgumentCaptor confirmCallbackCaptor = ArgumentCaptor.forClass(ConfirmCallback.class); - when(commandManager.removeCommand(anyString())).thenReturn(voidPromise); + when(commandManager.removeCommand(nullable(String.class))).thenReturn(voidPromise); // when presenter.onCommandRemove(mock(CommandImpl.class)); @@ -301,10 +314,11 @@ public void shouldShowNotificationWhenFailedToRemoveCommand() throws Exception { // then verify(dialogFactory) .createConfirmDialog( - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), confirmCallbackCaptor.capture(), - isNull(CancelCallback.class)); + isNull()); + confirmCallbackCaptor.getValue().accepted(); verify(voidPromise).catchError(errorOperationCaptor.capture()); diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/editor/EditorPartStackPresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/editor/EditorPartStackPresenterTest.java index b4470b52311..a077aa72d40 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/editor/EditorPartStackPresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/editor/EditorPartStackPresenterTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; @@ -146,10 +147,9 @@ public void setUp() { when(partPresenter3.getEditorInput()).thenReturn(editorInput3); when(editorInput3.getFile()).thenReturn(file3); - when(presentationFactory.getPresentation((Action) anyObject())).thenReturn(presentation); + when(presentationFactory.getPresentation(nullable(Action.class))).thenReturn(presentation); - when(eventBus.addHandler((Event.Type) anyObject(), anyObject())) - .thenReturn(handlerRegistration); + when(eventBus.addHandler(any(), any())).thenReturn(handlerRegistration); when(actionManager.getAction(EditorActions.SPLIT_HORIZONTALLY)) .thenReturn(splitHorizontallyAction); @@ -159,15 +159,15 @@ public void setUp() { when(closeAllTabsPaneAction.getTemplatePresentation()).thenReturn(presentation); when(splitHorizontallyAction.getTemplatePresentation()).thenReturn(presentation); when(splitVerticallyAction.getTemplatePresentation()).thenReturn(presentation); - when(editorPaneMenuItemFactory.createMenuItem((Action) anyObject())) + when(editorPaneMenuItemFactory.createMenuItem((Action) any())) .thenReturn(editorPaneActionMenuItem); - when(editorPaneMenuItemFactory.createMenuItem((TabItem) anyObject())) + when(editorPaneMenuItemFactory.createMenuItem((TabItem) any())) .thenReturn(editorPaneTabMenuItem); Container container = mock(Container.class); Promise promise = mock(Promise.class); when(appContext.getWorkspaceRoot()).thenReturn(container); - when(container.getFile(any(Path.class))).thenReturn(promise); + when(container.getFile(nullable(Path.class))).thenReturn(promise); presenter = new EditorPartStackPresenter( @@ -436,6 +436,6 @@ public void onItemCloseTest() { presenter.paneMenuTabItemHandler.onCloseButtonClicked(editorPaneTabMenuItem); - verify(editorAgent).closeEditor(any(EditorPartPresenter.class)); + verify(editorAgent).closeEditor(nullable(EditorPartPresenter.class)); } } diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImportOutputJsonRpcNotifierTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImportOutputJsonRpcNotifierTest.java index 71861a7c158..3eab697c8f3 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImportOutputJsonRpcNotifierTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImportOutputJsonRpcNotifierTest.java @@ -12,6 +12,7 @@ import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL; import static org.eclipse.che.ide.api.notification.StatusNotification.Status.SUCCESS; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -101,14 +102,15 @@ public void testShouldSubscribeForDisplayingNotification() throws Exception { @Test public void testShouldUnSubscribeFromDisplayingNotification() throws Exception { //given - when(constant.importProjectMessageSuccess(anyString())).thenReturn("message"); + when(constant.importProjectMessageSuccess(nullable(String.class))).thenReturn("message"); final StatusNotification statusNotification = mock(StatusNotification.class); - when(notificationManager.notify(anyString(), any(Status.class), any(DisplayMode.class))) + when(notificationManager.notify( + nullable(String.class), nullable(Status.class), nullable(DisplayMode.class))) .thenReturn(statusNotification); final MethodNameConfigurator methodNameConfigurator = mock(MethodNameConfigurator.class); when(configurator.newConfiguration()).thenReturn(methodNameConfigurator); final ParamsConfigurator paramsConfigurator = mock(ParamsConfigurator.class); - when(methodNameConfigurator.methodName(anyString())).thenReturn(paramsConfigurator); + when(methodNameConfigurator.methodName(nullable(String.class))).thenReturn(paramsConfigurator); final ResultConfiguratorFromOne resultConfiguratorFromOne = mock(ResultConfiguratorFromOne.class); when(paramsConfigurator.paramsAsDto(any())).thenReturn(resultConfiguratorFromOne); @@ -132,12 +134,13 @@ public void testShouldUnSubscribeFromDisplayingNotificationIfExceptionOccurred() //given final StatusNotification statusNotification = mock(StatusNotification.class); - when(notificationManager.notify(anyString(), any(Status.class), any(DisplayMode.class))) + when(notificationManager.notify( + nullable(String.class), nullable(Status.class), nullable(DisplayMode.class))) .thenReturn(statusNotification); final MethodNameConfigurator methodNameConfigurator = mock(MethodNameConfigurator.class); when(configurator.newConfiguration()).thenReturn(methodNameConfigurator); final ParamsConfigurator paramsConfigurator = mock(ParamsConfigurator.class); - when(methodNameConfigurator.methodName(anyString())).thenReturn(paramsConfigurator); + when(methodNameConfigurator.methodName(nullable(String.class))).thenReturn(paramsConfigurator); final ResultConfiguratorFromOne resultConfiguratorFromOne = mock(ResultConfiguratorFromOne.class); when(paramsConfigurator.paramsAsDto(any())).thenReturn(resultConfiguratorFromOne); diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/zip/ZipImporterPagePresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/zip/ZipImporterPagePresenterTest.java index d6ad1f0a7f6..13cd4d828e2 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/zip/ZipImporterPagePresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/zip/ZipImporterPagePresenterTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.ide.projectimport.zip; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -67,10 +67,10 @@ public void testGo() { presenter.go(container); verify(container).setWidget(eq(view)); - verify(view).setProjectName(anyString()); - verify(view).setProjectDescription(anyString()); - verify(view).setProjectUrl(anyString()); - verify(view).setSkipFirstLevel(anyBoolean()); + verify(view).setProjectName(nullable(String.class)); + verify(view).setProjectDescription(nullable(String.class)); + verify(view).setProjectUrl(nullable(String.class)); + verify(view).setSkipFirstLevel(nullable(Boolean.class)); verify(view).setInputsEnableState(eq(true)); verify(view).focusInUrlInput(); } @@ -82,7 +82,7 @@ public void incorrectProjectUrlEnteredTest() { presenter.projectUrlChanged(INCORRECT_URL); - verify(view).showUrlError(anyString()); + verify(view).showUrlError(nullable(String.class)); verify(delegate).updateControls(); } diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/FullTextSearchPresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/FullTextSearchPresenterTest.java index a982f84ecc0..44cf32107c0 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/FullTextSearchPresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/FullTextSearchPresenterTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.ide.search; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -84,11 +84,11 @@ public void viewShouldBeShowed() { public void searchShouldBeSuccessfullyFinished() throws Exception { when(view.getPathToSearch()).thenReturn("/search"); when(appContext.getWorkspaceRoot()).thenReturn(workspaceRoot); - when(workspaceRoot.getContainer(any(Path.class))).thenReturn(optionalContainerPromise); - when(searchContainer.search(any(QueryExpression.class))).thenReturn(searchResultPromise); - when(searchContainer.createSearchQueryExpression(anyString(), anyString())) + when(workspaceRoot.getContainer(nullable(Path.class))).thenReturn(optionalContainerPromise); + when(searchContainer.search(nullable(QueryExpression.class))).thenReturn(searchResultPromise); + when(searchContainer.createSearchQueryExpression( + nullable(String.class), nullable(String.class))) .thenReturn(queryExpression); - fullTextSearchPresenter.search(SEARCHED_TEXT); verify(optionalContainerPromise).then(optionalContainerCaptor.capture()); @@ -108,9 +108,10 @@ public void searchWholeWordUnSelect() throws Exception { when(view.getPathToSearch()).thenReturn("/search"); when(view.isWholeWordsOnly()).thenReturn(false); when(appContext.getWorkspaceRoot()).thenReturn(workspaceRoot); - when(workspaceRoot.getContainer(any(Path.class))).thenReturn(optionalContainerPromise); - when(searchContainer.search(any(QueryExpression.class))).thenReturn(searchResultPromise); - when(searchContainer.createSearchQueryExpression(anyString(), anyString())) + when(workspaceRoot.getContainer(nullable(Path.class))).thenReturn(optionalContainerPromise); + when(searchContainer.search(nullable(QueryExpression.class))).thenReturn(searchResultPromise); + when(searchContainer.createSearchQueryExpression( + nullable(String.class), nullable(String.class))) .thenReturn(queryExpression); final String search = NameGenerator.generate("test", 10); @@ -124,7 +125,7 @@ public void searchWholeWordUnSelect() throws Exception { verify(searchContainer).search(queryExpression); verify(view).isWholeWordsOnly(); - verify(view, never()).showErrorMessage(anyString()); + verify(view, never()).showErrorMessage(nullable(String.class)); verify(view).close(); verify(findResultPresenter).handleResponse(eq(searchResult), eq(queryExpression), eq(search)); } @@ -134,9 +135,10 @@ public void searchWholeWordSelect() throws Exception { when(view.getPathToSearch()).thenReturn("/search"); when(view.isWholeWordsOnly()).thenReturn(true); when(appContext.getWorkspaceRoot()).thenReturn(workspaceRoot); - when(workspaceRoot.getContainer(any(Path.class))).thenReturn(optionalContainerPromise); - when(searchContainer.search(any(QueryExpression.class))).thenReturn(searchResultPromise); - when(searchContainer.createSearchQueryExpression(anyString(), anyString())) + when(workspaceRoot.getContainer(nullable(Path.class))).thenReturn(optionalContainerPromise); + when(searchContainer.search(nullable(QueryExpression.class))).thenReturn(searchResultPromise); + when(searchContainer.createSearchQueryExpression( + nullable(String.class), nullable(String.class))) .thenReturn(queryExpression); final String search = NameGenerator.generate("test", 10); @@ -159,7 +161,7 @@ public void searchWholeWordSelect() throws Exception { public void searchHasDoneWithSomeError() throws Exception { when(view.getPathToSearch()).thenReturn("/search"); when(appContext.getWorkspaceRoot()).thenReturn(workspaceRoot); - when(workspaceRoot.getContainer(any(Path.class))).thenReturn(optionalContainerPromise); + when(workspaceRoot.getContainer(nullable(Path.class))).thenReturn(optionalContainerPromise); fullTextSearchPresenter.search(SEARCHED_TEXT); @@ -179,9 +181,10 @@ public void onEnterClickedWhenAcceptButtonInFocus() throws Exception { when(view.getPathToSearch()).thenReturn("/search"); when(appContext.getWorkspaceRoot()).thenReturn(workspaceRoot); - when(workspaceRoot.getContainer(any(Path.class))).thenReturn(optionalContainerPromise); - when(searchContainer.search(any(QueryExpression.class))).thenReturn(searchResultPromise); - when(searchContainer.createSearchQueryExpression(anyString(), anyString())) + when(workspaceRoot.getContainer(nullable(Path.class))).thenReturn(optionalContainerPromise); + when(searchContainer.search(nullable(QueryExpression.class))).thenReturn(searchResultPromise); + when(searchContainer.createSearchQueryExpression( + nullable(String.class), nullable(String.class))) .thenReturn(queryExpression); List result = Collections.emptyList(); diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java index 2055e0c05b1..265261fca0e 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.ide.statepersistance; import static org.fest.assertions.Assertions.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -173,7 +173,7 @@ public void restoreShouldCallLoadState() throws Exception { workspace.put("component1", comp1); comp1.put("key1", "value1"); - when(promiseProvider.resolve(any(Void.class))).thenReturn(sequentialRestore); + when(promiseProvider.resolve(nullable(Void.class))).thenReturn(sequentialRestore); appStateManager.restoreWorkspaceState(); diff --git a/ide/che-core-ide-generators/pom.xml b/ide/che-core-ide-generators/pom.xml index 57924b507b6..139f8290c3b 100644 --- a/ide/che-core-ide-generators/pom.xml +++ b/ide/che-core-ide-generators/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.che.core che-core-ide-generators diff --git a/ide/che-core-ide-stacks/pom.xml b/ide/che-core-ide-stacks/pom.xml index e3c99e1e8b0..407e52737e1 100644 --- a/ide/che-core-ide-stacks/pom.xml +++ b/ide/che-core-ide-stacks/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.che.core che-core-ide-stacks diff --git a/ide/che-core-ide-templates/pom.xml b/ide/che-core-ide-templates/pom.xml index 80a5f0b7985..d89026c4cad 100644 --- a/ide/che-core-ide-templates/pom.xml +++ b/ide/che-core-ide-templates/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.che.core che-core-ide-templates diff --git a/ide/che-core-ide-ui/pom.xml b/ide/che-core-ide-ui/pom.xml index ac9877849e4..f3126a782b0 100644 --- a/ide/che-core-ide-ui/pom.xml +++ b/ide/che-core-ide-ui/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.che.core che-core-ide-ui diff --git a/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenterTest.java b/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenterTest.java index 3af9440be24..1276dd53d89 100644 --- a/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenterTest.java +++ b/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenterTest.java @@ -10,6 +10,7 @@ */ package org.eclipse.che.ide.ui.dialogs.input; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -73,7 +74,7 @@ public void shouldCallCallbackOnAccepted() throws Exception { verify(view).closeDialog(); verify(view).getValue(); - verify(inputCallback).accepted(anyString()); + verify(inputCallback).accepted(nullable(String.class)); } @Test @@ -152,7 +153,7 @@ public void onEnterClickedWhenOkButtonInFocus() throws Exception { verify(view, never()).showErrorHint(anyString()); verify(view).closeDialog(); - verify(inputCallback).accepted(anyString()); + verify(inputCallback).accepted(nullable(String.class)); } @Test diff --git a/ide/che-core-orion-editor/pom.xml b/ide/che-core-orion-editor/pom.xml index 17f5ec54218..40fdfc66bbf 100644 --- a/ide/che-core-orion-editor/pom.xml +++ b/ide/che-core-orion-editor/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-orion-editor jar diff --git a/ide/che-ide-core/pom.xml b/ide/che-ide-core/pom.xml index 1bbccd0808e..f72c9c37288 100644 --- a/ide/che-ide-core/pom.xml +++ b/ide/che-ide-core/pom.xml @@ -16,7 +16,7 @@ che-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../../pom.xml org.eclipse.che.core diff --git a/ide/commons-gwt/pom.xml b/ide/commons-gwt/pom.xml index c8c16fea8e6..f5cc6b05a9d 100644 --- a/ide/commons-gwt/pom.xml +++ b/ide/commons-gwt/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-commons-gwt Che Core :: Commons :: GWT diff --git a/ide/gwt-logger/pom.xml b/ide/gwt-logger/pom.xml index 7440e17ed94..b282592813c 100644 --- a/ide/gwt-logger/pom.xml +++ b/ide/gwt-logger/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-gwt-logger Che Core :: Commons :: GWT Logger diff --git a/ide/pom.xml b/ide/pom.xml index ee19143f184..9a8f9d5dee6 100644 --- a/ide/pom.xml +++ b/ide/pom.xml @@ -16,7 +16,7 @@ che-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml org.eclipse.che.core diff --git a/infrastructures/docker/pom.xml b/infrastructures/docker/pom.xml index 56de70a1f76..40dbbb5b177 100644 --- a/infrastructures/docker/pom.xml +++ b/infrastructures/docker/pom.xml @@ -16,7 +16,7 @@ che-infrastructures-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml infrastructure-docker diff --git a/infrastructures/openshift/pom.xml b/infrastructures/openshift/pom.xml index 70230170c69..4a8e05c9914 100644 --- a/infrastructures/openshift/pom.xml +++ b/infrastructures/openshift/pom.xml @@ -16,7 +16,7 @@ che-infrastructures-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml infrastructure-openshift diff --git a/infrastructures/pom.xml b/infrastructures/pom.xml index 39a7320067e..1c680b913ac 100644 --- a/infrastructures/pom.xml +++ b/infrastructures/pom.xml @@ -16,11 +16,10 @@ che-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-infrastructures-parent - 5.19.0-SNAPSHOT pom Che Infrastructures Parent diff --git a/multiuser/api/che-multiuser-api-authorization-impl/pom.xml b/multiuser/api/che-multiuser-api-authorization-impl/pom.xml index dce488e5983..5be415d283e 100644 --- a/multiuser/api/che-multiuser-api-authorization-impl/pom.xml +++ b/multiuser/api/che-multiuser-api-authorization-impl/pom.xml @@ -16,7 +16,7 @@ che-multiuser-api org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-api-authorization-impl jar @@ -57,7 +57,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/multiuser/api/che-multiuser-api-authorization/pom.xml b/multiuser/api/che-multiuser-api-authorization/pom.xml index fc4a5291b49..670e51b94a1 100644 --- a/multiuser/api/che-multiuser-api-authorization/pom.xml +++ b/multiuser/api/che-multiuser-api-authorization/pom.xml @@ -16,7 +16,7 @@ che-multiuser-api org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-api-authorization jar @@ -72,7 +72,7 @@ org.mockito - mockito-all + mockito-core test @@ -102,7 +102,7 @@ org.eclipse.che.core che-core-api-dto-maven-plugin - ${che.version} + ${project.version} process-sources diff --git a/multiuser/api/che-multiuser-api-organization-shared/pom.xml b/multiuser/api/che-multiuser-api-organization-shared/pom.xml index c80de33564d..5bcbd7937f7 100644 --- a/multiuser/api/che-multiuser-api-organization-shared/pom.xml +++ b/multiuser/api/che-multiuser-api-organization-shared/pom.xml @@ -16,7 +16,7 @@ che-multiuser-api org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-api-organization-shared jar diff --git a/multiuser/api/che-multiuser-api-organization/pom.xml b/multiuser/api/che-multiuser-api-organization/pom.xml index 36097e4dbae..263ed53a5ba 100644 --- a/multiuser/api/che-multiuser-api-organization/pom.xml +++ b/multiuser/api/che-multiuser-api-organization/pom.xml @@ -16,7 +16,7 @@ che-multiuser-api org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-api-organization jar @@ -223,7 +223,7 @@ org.eclipse.che.core che-core-api-dto-maven-plugin - ${che.version} + ${project.version} process-sources diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationManagerTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationManagerTest.java index 72a00e557cf..109421d18ec 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationManagerTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationManagerTest.java @@ -249,7 +249,7 @@ public void shouldRemoveMembersByOrganizationId() throws Exception { doReturn(new Page<>(singletonList(member1), 0, 1, 2)) .doReturn(new Page<>(singletonList(member2), 1, 1, 2)) .when(memberDao) - .getMembers(anyString(), anyInt(), anyInt()); + .getMembers(anyString(), anyInt(), anyLong()); manager.removeMembers("org1"); @@ -266,7 +266,7 @@ public void shouldRemoveSuborganizationsByParentOrganizationId() throws Exceptio doReturn(new Page<>(singletonList(subOrg1), 0, 1, 2)) .doReturn(new Page<>(singletonList(subOrg2), 1, 1, 2)) .when(organizationDao) - .getByParent(anyString(), anyInt(), anyInt()); + .getByParent(anyString(), anyInt(), anyLong()); manager.removeSuborganizations("org1"); @@ -326,7 +326,7 @@ public void shouldThrowNpeWhenGettingSuborganizationsByNullParent() throws Excep @Test public void shouldGetOrganizationsByParent() throws Exception { final OrganizationImpl toFetch = new OrganizationImpl("org321", "toFetchOrg", "org123"); - when(organizationDao.getByParent(eq("org123"), anyInt(), anyInt())) + when(organizationDao.getByParent(eq("org123"), anyInt(), anyLong())) .thenReturn(new Page<>(singletonList(toFetch), 0, 1, 1)); final Page organizations = manager.getByParent("org123", 30, 0); @@ -339,7 +339,7 @@ public void shouldGetOrganizationsByParent() throws Exception { @Test public void shouldGetSuborganizations() throws Exception { final OrganizationImpl toFetch = new OrganizationImpl("org321", "parent/toFetchOrg", "org123"); - when(organizationDao.getSuborganizations(eq("parent"), anyInt(), anyInt())) + when(organizationDao.getSuborganizations(eq("parent"), anyInt(), anyLong())) .thenReturn(new Page<>(singletonList(toFetch), 0, 1, 1)); final Page organizations = manager.getSuborganizations("parent", 30, 0); @@ -362,7 +362,7 @@ public void shouldThrowNpeWhenGettingOrganizationsByNullUserId() throws Exceptio @Test public void shouldGetOrganizationsByMember() throws Exception { final OrganizationImpl toFetch = new OrganizationImpl("org123", "toFetchOrg", "org321"); - when(memberDao.getOrganizations(eq("org123"), anyInt(), anyInt())) + when(memberDao.getOrganizations(eq("org123"), anyInt(), anyLong())) .thenReturn(new Page<>(singletonList(toFetch), 0, 1, 1)); final Page organizations = manager.getByMember("org123", 30, 0); diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationServiceTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationServiceTest.java index 9628c4ea80f..853bef64378 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationServiceTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationServiceTest.java @@ -16,6 +16,7 @@ import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -260,7 +261,7 @@ public void shouldGetChildOrganizations() throws Exception { doReturn(new Page<>(singletonList(toFetch), 0, 1, 1)) .when(orgManager) - .getByParent(anyString(), anyInt(), anyInt()); + .getByParent(anyString(), anyInt(), anyLong()); final Response response = given() diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/notification/OrganizationNotificationEmailSenderTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/notification/OrganizationNotificationEmailSenderTest.java index 7be1166b146..78699680536 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/notification/OrganizationNotificationEmailSenderTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/notification/OrganizationNotificationEmailSenderTest.java @@ -12,6 +12,7 @@ import static java.util.Arrays.*; import static java.util.Collections.emptyList; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -123,7 +124,7 @@ public void shouldSendNotificationAboutOrganizationRenaming() throws Exception { MemberImpl member2 = new MemberImpl("user2", "org123", ImmutableList.of()); doReturn(new Page(asList(member1, member2), 0, 2, 2)) .when(organizationManager) - .getMembers(anyString(), anyInt(), anyInt()); + .getMembers(anyString(), anyInt(), anyLong()); when(userManager.getById("user1")) .thenReturn(new UserImpl("user1", "email1", null, null, emptyList())); @@ -156,7 +157,7 @@ public void shouldSendNotificationAboutOrganizationRenaming() throws Exception { MemberImpl member2 = new MemberImpl("user2", "org123", emptyList()); doReturn(new Page(asList(member1, member2), 0, 2, 2)) .when(organizationManager) - .getMembers(anyString(), anyInt(), anyInt()); + .getMembers(anyString(), anyInt(), anyLong()); when(userManager.getById("user1")).thenThrow(new NotFoundException("")); when(userManager.getById("user2")) diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationalAccountAvailableResourcesProviderTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationalAccountAvailableResourcesProviderTest.java index 75c6e2d7eb7..99412e23308 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationalAccountAvailableResourcesProviderTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationalAccountAvailableResourcesProviderTest.java @@ -41,7 +41,6 @@ import org.eclipse.che.multiuser.resource.api.usage.ResourceUsageManager; import org.eclipse.che.multiuser.resource.model.Resource; import org.eclipse.che.multiuser.resource.spi.impl.ResourceImpl; -import org.mockito.ArgumentMatcher; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; @@ -244,12 +243,6 @@ private void prepareAvailableResource(String organizationId, ResourceImpl availa doReturn(singletonList(availableResource)) .when(availableResourcesProvider) .getAvailableOrganizationResources( - argThat( - new ArgumentMatcher() { - @Override - public boolean matches(Object argument) { - return organizationId.equals(((Organization) argument).getId()); - } - })); + argThat(argument -> organizationId.equals(((Organization) argument).getId()))); } } diff --git a/multiuser/api/che-multiuser-api-permission-shared/pom.xml b/multiuser/api/che-multiuser-api-permission-shared/pom.xml index ac51a4d7ae5..b98d46438f7 100644 --- a/multiuser/api/che-multiuser-api-permission-shared/pom.xml +++ b/multiuser/api/che-multiuser-api-permission-shared/pom.xml @@ -16,7 +16,7 @@ che-multiuser-api org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-api-permission-shared jar diff --git a/multiuser/api/che-multiuser-api-permission/pom.xml b/multiuser/api/che-multiuser-api-permission/pom.xml index 148fc2d21c3..601c548371c 100644 --- a/multiuser/api/che-multiuser-api-permission/pom.xml +++ b/multiuser/api/che-multiuser-api-permission/pom.xml @@ -16,7 +16,7 @@ che-multiuser-api org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-api-permission jar @@ -202,7 +202,7 @@ org.eclipse.che.core che-core-api-dto-maven-plugin - ${che.version} + ${project.version} process-sources diff --git a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/AdminPermissionInitializerTest.java b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/AdminPermissionInitializerTest.java index ba891e256a4..c1fd89cb1af 100644 --- a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/AdminPermissionInitializerTest.java +++ b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/AdminPermissionInitializerTest.java @@ -81,12 +81,8 @@ public void shouldAddSystemPermissionsOnPostUserPersistedEvent() throws Exceptio verify(permissionsManager) .storePermission( argThat( - new ArgumentMatcher() { - @Override - public boolean matches(Object argument) { - return ((SystemPermissionsImpl) argument).getUserId().equals(NAME); - } - })); + (ArgumentMatcher) + argument -> argument.getUserId().equals(NAME))); } @Test @@ -112,12 +108,9 @@ public void shouldAddSystemPermissionsForExistedAdmin() throws Exception { verify(permissionsManager) .storePermission( argThat( - new ArgumentMatcher() { - @Override - public boolean matches(Object argument) { - return ((SystemPermissionsImpl) argument).getUserId().equals(adminUser.getId()); - } - })); + (ArgumentMatcher) + argument -> + ((SystemPermissionsImpl) argument).getUserId().equals(adminUser.getId()))); } @Test diff --git a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/PermissionsManagerTest.java b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/PermissionsManagerTest.java index cb001e7ee10..624a8139dc1 100644 --- a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/PermissionsManagerTest.java +++ b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/PermissionsManagerTest.java @@ -13,6 +13,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.eclipse.che.multiuser.api.permission.server.AbstractPermissionsDomain.SET_PERMISSIONS; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -131,7 +132,7 @@ public void shouldNotStorePermissionsWhenItRemoveLastSetPermissions() throws Exc doReturn(new Page<>(singletonList(foreignPermissions), 0, 1, 2)) .doReturn(new Page<>(singletonList(ownPermissions), 1, 1, 2)) .when(permissionsDao) - .getByInstance(anyString(), anyInt(), anyInt()); + .getByInstance(nullable(String.class), nullable(Integer.class), nullable(Long.class)); permissionsManager.storePermission( new TestPermissionsImpl("user", "test", "test123", singletonList("delete"))); @@ -150,7 +151,7 @@ public void shouldStorePermissionsWhenItRemoveSetPermissionsButThereIsAnotherOne doReturn(new Page<>(singletonList(ownPermissions), 0, 30, 31)) .doReturn(new Page<>(singletonList(foreignPermissions), 1, 30, 31)) .when(permissionsDao) - .getByInstance(anyString(), anyInt(), anyInt()); + .getByInstance(nullable(String.class), nullable(Integer.class), nullable(Long.class)); permissionsManager.storePermission( new TestPermissionsImpl("user", "test", "test123", singletonList("delete"))); @@ -193,7 +194,7 @@ public void shouldNotRemovePermissionsWhenItContainsLastSetPermissionsAction() t doReturn(new Page<>(singletonList(firstPermissions), 0, 1, 2)) .doReturn(new Page<>(singletonList(secondPermissions), 1, 1, 2)) .when(permissionsDao) - .getByInstance(anyString(), anyInt(), anyInt()); + .getByInstance(nullable(String.class), nullable(Integer.class), nullable(Long.class)); permissionsManager.remove("user", "test", "test123"); } @@ -228,7 +229,7 @@ public void shouldBeAbleToGetPermissionsByInstance() throws Exception { doReturn(new Page<>(asList(firstPermissions, secondPermissions), 1, 2, 4)) .when(permissionsDao) - .getByInstance(anyString(), anyInt(), anyInt()); + .getByInstance(nullable(String.class), nullable(Integer.class), nullable(Long.class)); final Page permissionsPage = permissionsManager.getByInstance("test", "test123", 2, 1); diff --git a/multiuser/api/che-multiuser-api-resource-shared/pom.xml b/multiuser/api/che-multiuser-api-resource-shared/pom.xml index 797836698ed..8730776548a 100644 --- a/multiuser/api/che-multiuser-api-resource-shared/pom.xml +++ b/multiuser/api/che-multiuser-api-resource-shared/pom.xml @@ -16,7 +16,7 @@ che-multiuser-api org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-api-resource-shared jar diff --git a/multiuser/api/che-multiuser-api-resource/pom.xml b/multiuser/api/che-multiuser-api-resource/pom.xml index e64af4f10d9..39312a63730 100644 --- a/multiuser/api/che-multiuser-api-resource/pom.xml +++ b/multiuser/api/che-multiuser-api-resource/pom.xml @@ -16,7 +16,7 @@ che-multiuser-api org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-api-resource jar @@ -204,7 +204,7 @@ org.eclipse.che.core che-core-api-dto-maven-plugin - ${che.version} + ${project.version} process-sources diff --git a/multiuser/api/pom.xml b/multiuser/api/pom.xml index ab6f76a149a..a471f88249f 100644 --- a/multiuser/api/pom.xml +++ b/multiuser/api/pom.xml @@ -16,7 +16,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-multiuser-api diff --git a/multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml b/multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml index fe8afbc953d..0fefbf8678e 100644 --- a/multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml +++ b/multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml @@ -16,7 +16,7 @@ che-multiuser-integration-tests org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-cascade-removal jar diff --git a/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml b/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml index e1f4e39d736..c905c023e2c 100644 --- a/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml +++ b/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml @@ -16,7 +16,7 @@ che-multiuser-integration-tests org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-postgresql-tck jar diff --git a/multiuser/integration-tests/pom.xml b/multiuser/integration-tests/pom.xml index 8cb78b8b763..fea2927ef6d 100644 --- a/multiuser/integration-tests/pom.xml +++ b/multiuser/integration-tests/pom.xml @@ -16,7 +16,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-integration-tests pom diff --git a/multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml index 9fb17976d2c..733c6100a54 100644 --- a/multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml +++ b/multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml @@ -16,7 +16,7 @@ che-multiuser-keycloak org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-multiuser-keycloak-ide diff --git a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml index 29310c20e35..52dfa0547be 100644 --- a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml +++ b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml @@ -16,7 +16,7 @@ che-multiuser-keycloak org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-keycloak-server jar diff --git a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml index 543ab72e97a..69adc8ad1e1 100644 --- a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml +++ b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml @@ -16,7 +16,7 @@ che-multiuser-keycloak org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-keycloak-shared jar diff --git a/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml index 8703eda660a..f747376b668 100644 --- a/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml +++ b/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml @@ -16,7 +16,7 @@ che-multiuser-keycloak org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-keycloak-token-provider Che Multiuser :: Keycloak Token Provider diff --git a/multiuser/keycloak/pom.xml b/multiuser/keycloak/pom.xml index 7276404d542..1eb6485ae16 100644 --- a/multiuser/keycloak/pom.xml +++ b/multiuser/keycloak/pom.xml @@ -16,7 +16,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-multiuser-keycloak diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication-agent/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication-agent/pom.xml index a018bbd0907..065fb276725 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication-agent/pom.xml +++ b/multiuser/machine-auth/che-multiuser-machine-authentication-agent/pom.xml @@ -16,7 +16,7 @@ che-multiuser-machine-auth org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-machine-authentication-agent Che Multiuser :: Machine Authentication Agent diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml index 1c51f5a18be..d8aa82244a6 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml +++ b/multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml @@ -16,7 +16,7 @@ che-multiuser-machine-auth org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-machine-authentication-ide Che Multiuser :: Machine Authentication IDE @@ -134,7 +134,7 @@ org.eclipse.che.core che-core-api-dto-maven-plugin - ${che.version} + ${project.version} client diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml index 879cf380e3e..fdc0a700bed 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml +++ b/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml @@ -16,7 +16,7 @@ che-multiuser-machine-auth org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-machine-authentication-shared jar diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml b/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml index 6c920669bc9..b5d80ee3a3c 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml +++ b/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml @@ -16,7 +16,7 @@ che-multiuser-machine-auth org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-machine-authentication jar @@ -222,7 +222,7 @@ org.eclipse.che.core che-core-api-dto-maven-plugin - ${che.version} + ${project.version} server diff --git a/multiuser/machine-auth/pom.xml b/multiuser/machine-auth/pom.xml index dc72cfdd86f..e28dfb4cfb0 100644 --- a/multiuser/machine-auth/pom.xml +++ b/multiuser/machine-auth/pom.xml @@ -16,7 +16,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-multiuser-machine-auth diff --git a/multiuser/permission/che-multiuser-permission-factory/pom.xml b/multiuser/permission/che-multiuser-permission-factory/pom.xml index 5186b87f76e..7d8c2b317c9 100644 --- a/multiuser/permission/che-multiuser-permission-factory/pom.xml +++ b/multiuser/permission/che-multiuser-permission-factory/pom.xml @@ -16,7 +16,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-permission-factory Che Multiuser :: Factory Permissions diff --git a/multiuser/permission/che-multiuser-permission-factory/src/test/java/org/eclipse/che/multiuser/permission/factory/FactoryPermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-factory/src/test/java/org/eclipse/che/multiuser/permission/factory/FactoryPermissionsFilterTest.java index 6f88b4fa652..9a397f47aea 100644 --- a/multiuser/permission/che-multiuser-permission-factory/src/test/java/org/eclipse/che/multiuser/permission/factory/FactoryPermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-factory/src/test/java/org/eclipse/che/multiuser/permission/factory/FactoryPermissionsFilterTest.java @@ -16,6 +16,7 @@ import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doThrow; @@ -69,7 +70,7 @@ public void shouldCheckPermissionsOnGettingFactoryJson() throws Exception { .get(SECURE_PATH + "/factory/workspace/workspace123"); assertEquals(response.getStatusCode(), 204); - verify(service).getFactoryJson(eq("workspace123"), anyString()); + verify(service).getFactoryJson(eq("workspace123"), nullable(String.class)); verify(subject).checkPermission(DOMAIN_ID, "workspace123", READ); } diff --git a/multiuser/permission/che-multiuser-permission-machine/pom.xml b/multiuser/permission/che-multiuser-permission-machine/pom.xml index 27ed30202fb..319c4eb4e2e 100644 --- a/multiuser/permission/che-multiuser-permission-machine/pom.xml +++ b/multiuser/permission/che-multiuser-permission-machine/pom.xml @@ -16,7 +16,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-permission-machine Che Multiuser :: Machine Permissions diff --git a/multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/filters/RecipePermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/filters/RecipePermissionsFilterTest.java index 4dd86be5569..63d02099c6c 100644 --- a/multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/filters/RecipePermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/filters/RecipePermissionsFilterTest.java @@ -17,9 +17,9 @@ import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyListOf; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -31,6 +31,7 @@ import com.jayway.restassured.response.Response; import com.jayway.restassured.specification.RequestSpecification; import java.lang.reflect.Method; +import java.util.List; import org.eclipse.che.api.core.ForbiddenException; import org.eclipse.che.api.core.rest.ApiExceptionMapper; import org.eclipse.che.api.core.rest.shared.dto.ServiceError; @@ -188,7 +189,7 @@ public void shouldNotCheckPermissionsOnStacksSearching() throws Exception { .get(SECURE_PATH + "/recipe"); assertEquals(response.getStatusCode(), 200); - verify(service).searchRecipes(anyListOf(String.class), anyString(), anyInt(), anyInt()); + verify(service).searchRecipes(nullable(List.class), nullable(String.class), anyInt(), anyInt()); verifyZeroInteractions(subject); } diff --git a/multiuser/permission/che-multiuser-permission-resource/pom.xml b/multiuser/permission/che-multiuser-permission-resource/pom.xml index 3f4ffe1d67f..4024f529935 100644 --- a/multiuser/permission/che-multiuser-permission-resource/pom.xml +++ b/multiuser/permission/che-multiuser-permission-resource/pom.xml @@ -16,7 +16,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-permission-resource Che Multiuser :: Resource :: Permissions diff --git a/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/FreeResourcesLimitServicePermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/FreeResourcesLimitServicePermissionsFilterTest.java index 09b4b83290c..afa209818a6 100644 --- a/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/FreeResourcesLimitServicePermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/FreeResourcesLimitServicePermissionsFilterTest.java @@ -14,9 +14,9 @@ import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; @@ -74,7 +74,9 @@ public class FreeResourcesLimitServicePermissionsFilterTest { public void setUp() throws Exception { filter = new FreeResourcesLimitServicePermissionsFilter(); - when(subject.hasPermission(anyString(), anyString(), anyString())).thenReturn(true); + when(subject.hasPermission( + nullable(String.class), nullable(String.class), nullable(String.class))) + .thenReturn(true); } @Test @@ -176,7 +178,9 @@ public void shouldThrowForbiddenExceptionWhenRequestedUnknownMethod() throws Exc @Test(dataProvider = "coveredPaths") public void shouldReturn403WhenUserDoesNotHaveRequiredPermission(String path, String method) throws Exception { - when(subject.hasPermission(anyString(), anyString(), anyString())).thenReturn(false); + when(subject.hasPermission( + nullable(String.class), nullable(String.class), nullable(String.class))) + .thenReturn(false); Response response = request( diff --git a/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/ResourceUsageServicePermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/ResourceUsageServicePermissionsFilterTest.java index d80123ab9f0..dc0e4931f2f 100644 --- a/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/ResourceUsageServicePermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/ResourceUsageServicePermissionsFilterTest.java @@ -14,8 +14,8 @@ import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -115,7 +115,7 @@ public void shouldNotProceedFreeResourcesPath() throws Exception { .when() .get(SECURE_PATH + "/resource/free/account123"); - verify(freeResourcesLimitService).getFreeResourcesLimit(anyString()); + verify(freeResourcesLimitService).getFreeResourcesLimit(nullable(String.class)); } @Test @@ -163,7 +163,9 @@ public void shouldCheckPermissionsOnGettingUsedResources() throws Exception { @Test(dataProvider = "coveredPaths") public void shouldDenyRequestWhenUserDoesNotHasPermissionsToSeeResources(String path) throws Exception { - doThrow(new ForbiddenException("Forbidden")).when(checker).checkPermissions(anyString(), any()); + doThrow(new ForbiddenException("Forbidden")) + .when(checker) + .checkPermissions(nullable(String.class), any()); given() .auth() @@ -179,7 +181,9 @@ public void shouldDenyRequestWhenUserDoesNotHasPermissionsToSeeResources(String @Test(dataProvider = "coveredPaths") public void shouldNotCheckPermissionsOnAccountLevelWhenUserHasManageCodenvyPermission(String path) throws Exception { - when(subject.hasPermission(anyString(), anyString(), anyString())).thenReturn(true); + when(subject.hasPermission( + nullable(String.class), nullable(String.class), nullable(String.class))) + .thenReturn(true); given() .auth() diff --git a/multiuser/permission/che-multiuser-permission-system/pom.xml b/multiuser/permission/che-multiuser-permission-system/pom.xml index 90b315a061a..b1db4abeef9 100644 --- a/multiuser/permission/che-multiuser-permission-system/pom.xml +++ b/multiuser/permission/che-multiuser-permission-system/pom.xml @@ -16,7 +16,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-permission-system Che Multiuser :: System Permissions diff --git a/multiuser/permission/che-multiuser-permission-user/pom.xml b/multiuser/permission/che-multiuser-permission-user/pom.xml index 92464d6582b..8b67eb2ed70 100644 --- a/multiuser/permission/che-multiuser-permission-user/pom.xml +++ b/multiuser/permission/che-multiuser-permission-user/pom.xml @@ -16,7 +16,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-permission-user Che Multiuser :: User Permissions diff --git a/multiuser/permission/che-multiuser-permission-workspace/pom.xml b/multiuser/permission/che-multiuser-permission-workspace/pom.xml index 444bf2f4ed5..3e032aa1ffa 100644 --- a/multiuser/permission/che-multiuser-permission-workspace/pom.xml +++ b/multiuser/permission/che-multiuser-permission-workspace/pom.xml @@ -16,7 +16,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-permission-workspace Che Multiuser :: Workspace Permissions diff --git a/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/StackPermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/StackPermissionsFilterTest.java index e73d1971d6a..00cc0fcca7d 100644 --- a/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/StackPermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/StackPermissionsFilterTest.java @@ -19,11 +19,10 @@ import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyListOf; import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -40,6 +39,7 @@ import com.jayway.restassured.specification.RequestSpecification; import java.lang.reflect.Method; import java.util.Collections; +import java.util.List; import org.eclipse.che.api.core.ForbiddenException; import org.eclipse.che.api.core.Page; import org.eclipse.che.api.core.rest.ApiExceptionMapper; @@ -172,7 +172,7 @@ public void shouldNotCheckPermissionsOnStacksSearching() throws Exception { .get(SECURE_PATH + "/stack"); assertEquals(response.getStatusCode(), 200); - verify(service).searchStacks(anyListOf(String.class), anyInt(), anyInt()); + verify(service).searchStacks(nullable(List.class), anyInt(), anyInt()); verifyZeroInteractions(subject); } @@ -263,7 +263,9 @@ public void shouldThrowForbiddenExceptionWhenRequestedUnknownMethod() throws Exc @Test(dataProvider = "coveredPaths") public void shouldThrowForbiddenExceptionWhenUserDoesNotHavePermissionsForPerformOperation( String path, String method, String action) throws Exception { - when(subject.hasPermission(anyString(), anyString(), anyString())).thenReturn(false); + when(subject.hasPermission( + nullable(String.class), nullable(String.class), nullable(String.class))) + .thenReturn(false); Response response = request( @@ -281,10 +283,12 @@ public void shouldThrowForbiddenExceptionWhenUserDoesNotHavePermissionsForPerfor @Test(dataProvider = "coveredPaths") public void shouldAllowToAdminPerformAnyActionWithPredefinedStack( String path, String method, String action) throws Exception { - when(subject.hasPermission(eq(DOMAIN_ID), anyString(), anyString())).thenReturn(false); - when(subject.hasPermission(eq(SystemDomain.DOMAIN_ID), anyString(), anyString())) + when(subject.hasPermission(eq(DOMAIN_ID), nullable(String.class), nullable(String.class))) + .thenReturn(false); + when(subject.hasPermission( + eq(SystemDomain.DOMAIN_ID), nullable(String.class), nullable(String.class))) .thenReturn(true); - doReturn(true).when(permissionsFilter).isStackPredefined(anyString()); + doReturn(true).when(permissionsFilter).isStackPredefined(nullable(String.class)); Response response = request( @@ -301,10 +305,12 @@ public void shouldAllowToAdminPerformAnyActionWithPredefinedStack( @Test(dataProvider = "coveredPaths") public void shouldNotAllowToAdminPerformAnyActionWithNonPredefinedStack( String path, String method, String action) throws Exception { - when(subject.hasPermission(eq(DOMAIN_ID), anyString(), anyString())).thenReturn(false); - when(subject.hasPermission(eq(SystemDomain.DOMAIN_ID), anyString(), anyString())) + when(subject.hasPermission(eq(DOMAIN_ID), nullable(String.class), nullable(String.class))) + .thenReturn(false); + when(subject.hasPermission( + eq(SystemDomain.DOMAIN_ID), nullable(String.class), nullable(String.class))) .thenReturn(true); - doReturn(false).when(permissionsFilter).isStackPredefined(anyString()); + doReturn(false).when(permissionsFilter).isStackPredefined(nullable(String.class)); Response response = request( @@ -337,7 +343,8 @@ public void shouldRecognizePredefinedStack() throws Exception { final Page permissionsPage = mock(Page.class); when(permissionsPage.getItems()).thenReturn(Collections.singletonList(stackPermission)); - when(permissionsManager.getByInstance(anyString(), anyString(), anyInt(), anyInt())) + when(permissionsManager.getByInstance( + nullable(String.class), nullable(String.class), anyInt(), anyLong())) .thenReturn(permissionsPage); assertTrue(permissionsFilter.isStackPredefined("stack123")); @@ -351,7 +358,8 @@ public void shouldRecognizeNonPredefinedStack() throws Exception { final Page permissionsPage = mock(Page.class); when(permissionsPage.getItems()).thenReturn(Collections.singletonList(stackPermission)); - when(permissionsManager.getByInstance(anyString(), anyString(), anyInt(), anyInt())) + when(permissionsManager.getByInstance( + nullable(String.class), nullable(String.class), anyInt(), anyLong())) .thenReturn(permissionsPage); assertFalse(permissionsFilter.isStackPredefined("stack123")); @@ -381,7 +389,8 @@ public void shouldRecognizePredefinedStackWhenAFewPermissionsPagesIsRetrieved() .when(permissionsFilter) .getNextPermissionsPage(stackId, permissionsPage1); doReturn(null).when(permissionsFilter).getNextPermissionsPage(stackId, permissionsPage2); - when(permissionsManager.getByInstance(anyString(), anyString(), anyInt(), anyInt())) + when(permissionsManager.getByInstance( + nullable(String.class), nullable(String.class), anyInt(), anyLong())) .thenReturn(permissionsPage1); assertTrue(permissionsFilter.isStackPredefined(stackId)); diff --git a/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilterTest.java index dcf6e36fdf5..dc06b7722ad 100644 --- a/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilterTest.java @@ -14,6 +14,7 @@ import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -42,6 +43,7 @@ import org.eclipse.che.api.workspace.server.WorkspaceManager; import org.eclipse.che.api.workspace.server.WorkspaceService; import org.eclipse.che.api.workspace.server.model.impl.WorkspaceImpl; +import org.eclipse.che.api.workspace.shared.dto.EnvironmentDto; import org.eclipse.che.commons.env.EnvironmentContext; import org.eclipse.che.commons.subject.Subject; import org.eclipse.che.dto.server.DtoFactory; @@ -224,7 +226,7 @@ public void shouldNotCheckPermissionsPermissionsOnWorkspacesGetting() throws Exc .get(SECURE_PATH + "/workspace"); assertEquals(response.getStatusCode(), 200); - verify(workspaceService).getWorkspaces(any(), anyInt(), anyString()); + verify(workspaceService).getWorkspaces(any(), anyInt(), nullable(String.class)); verify(permissionsFilter, never()).checkAccountPermissions(anyString(), any()); verifyZeroInteractions(subject); } @@ -284,7 +286,8 @@ public void shouldCheckPermissionsOnWorkspaceStarting() throws Exception { .post(SECURE_PATH + "/workspace/{id}/runtime"); assertEquals(response.getStatusCode(), 204); - verify(workspaceService).startById(eq("workspace123"), anyString(), any()); + verify(workspaceService) + .startById(eq("workspace123"), nullable(String.class), nullable(Boolean.class)); verify(subject).hasPermission(eq("workspace"), eq("workspace123"), eq("run")); } @@ -471,7 +474,8 @@ public void shouldCheckPermissionsOnEnvironmentAdding() throws Exception { .post(SECURE_PATH + "/workspace/{id}/environment"); assertEquals(response.getStatusCode(), 204); - verify(workspaceService).addEnvironment(eq("workspace123"), any(), anyString()); + verify(workspaceService) + .addEnvironment(eq("workspace123"), nullable(EnvironmentDto.class), nullable(String.class)); verify(subject).hasPermission(eq("workspace"), eq("workspace123"), eq("configure")); } diff --git a/multiuser/permission/pom.xml b/multiuser/permission/pom.xml index 653ff610d57..3447b856c2d 100644 --- a/multiuser/permission/pom.xml +++ b/multiuser/permission/pom.xml @@ -16,7 +16,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-multiuser-permission diff --git a/multiuser/personal-account/pom.xml b/multiuser/personal-account/pom.xml index 3c7ed88f436..2b590b1e3ad 100644 --- a/multiuser/personal-account/pom.xml +++ b/multiuser/personal-account/pom.xml @@ -16,7 +16,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-multiuser-personal-account jar @@ -79,11 +79,6 @@ logback-classic test - - org.mockito - mockito-all - test - org.mockito mockito-core diff --git a/multiuser/pom.xml b/multiuser/pom.xml index b4d1abf416e..57db2649f90 100644 --- a/multiuser/pom.xml +++ b/multiuser/pom.xml @@ -16,7 +16,7 @@ che-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml org.eclipse.che.multiuser diff --git a/multiuser/sql-schema/pom.xml b/multiuser/sql-schema/pom.xml index 9f0367de7fd..36f3178fa6c 100644 --- a/multiuser/sql-schema/pom.xml +++ b/multiuser/sql-schema/pom.xml @@ -16,7 +16,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-multiuser-sql-schema diff --git a/plugins/plugin-activity/che-plugin-activity-ide/pom.xml b/plugins/plugin-activity/che-plugin-activity-ide/pom.xml index 949bbd3b1d4..60960144d23 100644 --- a/plugins/plugin-activity/che-plugin-activity-ide/pom.xml +++ b/plugins/plugin-activity/che-plugin-activity-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-activity-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-activity-ide diff --git a/plugins/plugin-activity/che-plugin-activity-server/pom.xml b/plugins/plugin-activity/che-plugin-activity-server/pom.xml index c327125751c..e7ca248393a 100644 --- a/plugins/plugin-activity/che-plugin-activity-server/pom.xml +++ b/plugins/plugin-activity/che-plugin-activity-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-activity-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-activity-server diff --git a/plugins/plugin-activity/che-plugin-activity-shared/pom.xml b/plugins/plugin-activity/che-plugin-activity-shared/pom.xml index b3b0486654c..e3282742430 100644 --- a/plugins/plugin-activity/che-plugin-activity-shared/pom.xml +++ b/plugins/plugin-activity/che-plugin-activity-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-activity-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-activity-shared diff --git a/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml b/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml index 4dca46c8e14..26539e5f466 100644 --- a/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml +++ b/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml @@ -16,7 +16,7 @@ che-plugin-activity-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-activity-wsmaster diff --git a/plugins/plugin-activity/pom.xml b/plugins/plugin-activity/pom.xml index af6f344cf26..1c9cc619e32 100644 --- a/plugins/plugin-activity/pom.xml +++ b/plugins/plugin-activity/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-activity-parent diff --git a/plugins/plugin-composer/che-plugin-composer-ide/pom.xml b/plugins/plugin-composer/che-plugin-composer-ide/pom.xml index f9fb8bdac6d..fef44f081d9 100644 --- a/plugins/plugin-composer/che-plugin-composer-ide/pom.xml +++ b/plugins/plugin-composer/che-plugin-composer-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-composer-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-composer-ide jar diff --git a/plugins/plugin-composer/che-plugin-composer-server/pom.xml b/plugins/plugin-composer/che-plugin-composer-server/pom.xml index fc62cbf1be5..3ff01fc6e20 100644 --- a/plugins/plugin-composer/che-plugin-composer-server/pom.xml +++ b/plugins/plugin-composer/che-plugin-composer-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-composer-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-composer-server Che Plugin :: Composer :: Server diff --git a/plugins/plugin-composer/che-plugin-composer-shared/pom.xml b/plugins/plugin-composer/che-plugin-composer-shared/pom.xml index fb2d0fd4934..71ebd681e91 100644 --- a/plugins/plugin-composer/che-plugin-composer-shared/pom.xml +++ b/plugins/plugin-composer/che-plugin-composer-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-composer-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-composer-shared Che Plugin :: Composer :: Shared diff --git a/plugins/plugin-composer/pom.xml b/plugins/plugin-composer/pom.xml index aaa24519a5f..f186335d391 100644 --- a/plugins/plugin-composer/pom.xml +++ b/plugins/plugin-composer/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-composer-parent diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml index d66eefee8ae..f90f31293a6 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-cpp-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-cpp-lang-ide jar diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml index 5c81bf2ce2e..d64cc450e9d 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-cpp-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-cpp-lang-server Che Plugin :: C/C++ :: Extension Server diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml index 574ebb6d40c..3b4b6e57b57 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-cpp-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-cpp-lang-shared Che Plugin :: C/C++ :: Shared diff --git a/plugins/plugin-cpp/pom.xml b/plugins/plugin-cpp/pom.xml index b97ef68edcd..20aed445699 100644 --- a/plugins/plugin-cpp/pom.xml +++ b/plugins/plugin-cpp/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-cpp-parent diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml index 5311bdfd392..e513a9d8f64 100644 --- a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml +++ b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-csharp-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-csharp-lang-ide jar diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml index 9cf75142efe..c701edbd32e 100644 --- a/plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml +++ b/plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-csharp-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-csharp-lang-server Che Plugin :: C# :: Extension Server diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml index 17d2b61be3f..b93c4f12928 100644 --- a/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml +++ b/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-csharp-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-csharp-lang-shared Che Plugin :: C# :: Shared diff --git a/plugins/plugin-csharp/pom.xml b/plugins/plugin-csharp/pom.xml index 3c83c4ec84f..f2692d41c3f 100644 --- a/plugins/plugin-csharp/pom.xml +++ b/plugins/plugin-csharp/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-csharp-parent diff --git a/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml b/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml index bbd2af5180f..2180310ac8b 100644 --- a/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml +++ b/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml @@ -16,7 +16,7 @@ che-plugin-dashboard-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-ext-dashboard-client jar diff --git a/plugins/plugin-dashboard/pom.xml b/plugins/plugin-dashboard/pom.xml index 8bbca045370..ca4b2b99174 100644 --- a/plugins/plugin-dashboard/pom.xml +++ b/plugins/plugin-dashboard/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-dashboard-parent diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml b/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml index 3ccf77e40fc..b0cd71e3e3b 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-debugger-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-debugger-ide jar diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/BaseTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/BaseTest.java index f3a55b2c675..c777fd81250 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/BaseTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/BaseTest.java @@ -24,14 +24,14 @@ import org.junit.Before; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Base test for java debugger extension. * * @author Artem Zatsarynnyi */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(MockitoJUnitRunner.Silent.class) public abstract class BaseTest { public static final String HOST = "some.host"; public static final int PORT = 8000; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/actions/DebugActionTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/actions/DebugActionTest.java index 7b468377205..cc73ebeea19 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/actions/DebugActionTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/actions/DebugActionTest.java @@ -18,7 +18,6 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.che.ide.api.debug.DebugConfiguration; -import org.eclipse.che.ide.api.debug.DebugConfigurationType; import org.eclipse.che.ide.api.debug.DebugConfigurationsManager; import org.eclipse.che.ide.debug.DebuggerManager; import org.eclipse.che.ide.ui.dialogs.DialogFactory; @@ -52,13 +51,9 @@ public void verifyActionConstruction() { @Test public void actionShouldBePerformed() { DebugConfiguration debugConfiguration = mock(DebugConfiguration.class); - when(debugConfiguration.getType()).thenReturn(mock(DebugConfigurationType.class)); - when(debugConfiguration.getHost()).thenReturn("localhost"); - when(debugConfiguration.getPort()).thenReturn(8000); Map connectionProperties = new HashMap<>(); connectionProperties.put("prop1", "val1"); connectionProperties.put("prop2", "val2"); - when(debugConfiguration.getConnectionProperties()).thenReturn(connectionProperties); Optional configurationOptional = mock(Optional.class); when(configurationOptional.isPresent()).thenReturn(Boolean.TRUE); when(configurationOptional.get()).thenReturn(debugConfiguration); diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationsManagerImplTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationsManagerImplTest.java index 7811e0d74c5..9c584a22cc9 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationsManagerImplTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationsManagerImplTest.java @@ -10,9 +10,9 @@ */ package org.eclipse.che.plugin.debugger.ide.configuration; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyMap; -import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -62,7 +62,8 @@ public class DebugConfigurationsManagerImplTest extends TestCase { @Test public void testShouldNotApplyConfigurationIfActiveDebuggerExists() throws Exception { when(debuggerManager.getActiveDebugger()).thenReturn(mock(Debugger.class)); - when(dialogFactory.createMessageDialog(anyString(), anyString(), (ConfirmCallback) isNull())) + when(dialogFactory.createMessageDialog( + nullable(String.class), nullable(String.class), (ConfirmCallback) isNull())) .thenReturn(mock(MessageDialog.class)); debugConfigurationsManager.apply(debugConfiguration); diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerPresenterTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerPresenterTest.java index 5f1b7216130..fb59c804af3 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerPresenterTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerPresenterTest.java @@ -12,9 +12,9 @@ import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.NOT_EMERGE_MODE; import static org.eclipse.che.ide.api.notification.StatusNotification.Status.SUCCESS; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -44,11 +44,14 @@ import org.eclipse.che.plugin.debugger.ide.DebuggerLocalizationConstant; import org.eclipse.che.plugin.debugger.ide.DebuggerResources; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.Mockito; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; /** * Testing {@link DebuggerPresenter} functionality. @@ -56,6 +59,9 @@ * @author Dmytro Nochevnov */ public class DebuggerPresenterTest extends BaseTest { + + @Rule public MockitoRule mrule = MockitoJUnit.rule().silent(); + private static final long THREAD_ID = 1; private static final int FRAME_INDEX = 0; @@ -89,7 +95,6 @@ public class DebuggerPresenterTest extends BaseTest { @Before public void setup() { when(debuggerManager.getActiveDebugger()).thenReturn(debugger); - when(debugger.isSuspended()).thenReturn(true); doReturn(true).when(debugger).isSuspended(); presenter = @@ -108,8 +113,6 @@ public void setup() { Mockito.reset(view); when(view.getSelectedThreadId()).thenReturn(THREAD_ID); when(view.getSelectedFrameIndex()).thenReturn(FRAME_INDEX); - - doNothing().when(presenter).showDebuggerPanel(); } @Test @@ -164,7 +167,7 @@ public void whenDebuggerStoppedThenPresenterShouldUpdateFramesAndVariables() thr operationThreadDumpCaptor.getValue().apply(threadDump); verify(presenter).updateStackFrameDump(THREAD_ID); verify(presenter).updateVariables(THREAD_ID, 0); - verify(view).setThreadDump(eq(threadDump), anyInt()); + verify(view).setThreadDump(eq(threadDump), anyLong()); } @Test @@ -187,9 +190,9 @@ public void showDebuggerPanelAndSetVMNameOnDebuggerAttached() throws Exception { doReturn(promiseVoid).when(promiseVoid).then((Operation) any()); doNothing().when(presenter).showDebuggerPanel(); when(notificationManager.notify( - anyString(), - any(StatusNotification.Status.class), - any(StatusNotification.DisplayMode.class))) + nullable(String.class), + nullable(StatusNotification.Status.class), + nullable(StatusNotification.DisplayMode.class))) .thenReturn(mock(StatusNotification.class)); presenter.onDebuggerAttached(debuggerDescriptor, promiseVoid); diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerTest.java index 2eb6334c182..c8dc3b80899 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerTest.java @@ -16,6 +16,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Answers.RETURNS_DEEP_STUBS; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; @@ -81,6 +82,7 @@ import org.eclipse.che.ide.util.storage.LocalStorageProvider; import org.eclipse.che.plugin.debugger.ide.BaseTest; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -89,6 +91,8 @@ import org.mockito.MockSettings; import org.mockito.MockitoAnnotations; import org.mockito.internal.creation.MockSettingsImpl; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; /** * Testing {@link AbstractDebugger} functionality. @@ -99,6 +103,8 @@ */ @RunWith(GwtMockitoTestRunner.class) public class DebuggerTest extends BaseTest { + @Rule public MockitoRule mrule = MockitoJUnit.rule().silent(); + private static final String DEBUG_INFO = "debug_info"; private static final String SESSION_ID = "debugger_id"; private static final long THREAD_ID = 1; @@ -486,7 +492,7 @@ public void testGetValue() throws Exception { SimpleValueDto simpleValueDto = mock(SimpleValueDto.class); doReturn(simpleValueDto).when(dtoFactory).createDto(SimpleValueDto.class); - doReturn(simpleValueDto).when(simpleValueDto).withString(anyString()); + doReturn(simpleValueDto).when(simpleValueDto).withString(nullable(String.class)); SimpleValue simpleValue = mock(SimpleValue.class); doReturn(simpleValue).when(variable).getValue(); diff --git a/plugins/plugin-debugger/pom.xml b/plugins/plugin-debugger/pom.xml index 7ae83100182..b34083eeba7 100644 --- a/plugins/plugin-debugger/pom.xml +++ b/plugins/plugin-debugger/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-debugger-parent diff --git a/plugins/plugin-docker/che-plugin-docker-client/pom.xml b/plugins/plugin-docker/che-plugin-docker-client/pom.xml index 39582037949..800576f4718 100644 --- a/plugins/plugin-docker/che-plugin-docker-client/pom.xml +++ b/plugins/plugin-docker/che-plugin-docker-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-docker-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-docker-client jar diff --git a/plugins/plugin-docker/che-plugin-docker-client/src/test/java/org/eclipse/che/plugin/docker/client/DockerConnectorTest.java b/plugins/plugin-docker/che-plugin-docker-client/src/test/java/org/eclipse/che/plugin/docker/client/DockerConnectorTest.java index a5a1273ade5..bb5450d3da9 100644 --- a/plugins/plugin-docker/che-plugin-docker-client/src/test/java/org/eclipse/che/plugin/docker/client/DockerConnectorTest.java +++ b/plugins/plugin-docker/che-plugin-docker-client/src/test/java/org/eclipse/che/plugin/docker/client/DockerConnectorTest.java @@ -13,6 +13,8 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; @@ -191,7 +193,7 @@ public class DockerConnectorTest { @BeforeMethod public void setup() throws IOException, URISyntaxException { dockerConnection = mock(DockerConnection.class, new SelfReturningAnswer()); - when(dockerConnectionFactory.openConnection(any(URI.class))).thenReturn(dockerConnection); + when(dockerConnectionFactory.openConnection(nullable(URI.class))).thenReturn(dockerConnection); when(dockerConnection.request()).thenReturn(dockerResponse); when(dockerConnectorConfiguration.getAuthConfigs()).thenReturn(initialAuthConfig); when(dockerResponse.getStatus()).thenReturn(RESPONSE_SUCCESS_CODE); @@ -221,7 +223,7 @@ public void shouldBeAbleToGetSystemInfo() throws IOException, JsonParseException SystemInfo returnedSystemInfo = dockerConnector.getSystemInfo(); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/info"); verify(dockerConnection).request(); @@ -275,7 +277,7 @@ public void shouldBeAbleToGetVersion() throws IOException, JsonParseException { Version returnedVersion = dockerConnector.getVersion(); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/version"); verify(dockerConnection).request(); @@ -310,7 +312,7 @@ public void shouldBeAbleToGetListImages() throws IOException, JsonParseException List returnedImages = dockerConnector.listImages(listImagesParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/images/json"); verify(dockerConnection).request(); @@ -366,7 +368,7 @@ public void shouldBeAbleToGetListContainersWithListContainersParams() List containers = dockerConnector.listContainers(listContainersParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/containers/json"); verify(dockerConnection).query("all", 1); @@ -462,7 +464,7 @@ public void shouldBeAbleToInspectImage() throws IOException, JsonParseException ImageInfo returnedImageInfo = dockerConnector.inspectImage(inspectImageParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/images/" + inspectImageParams.getImage() + "/json"); verify(dockerConnection).request(); @@ -508,7 +510,7 @@ public void shouldBeAbleToStopContainer() throws IOException { dockerConnector.stopContainer(stopContainerParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/containers/" + stopContainerParams.getContainer() + "/stop"); verify(dockerConnection).request(); @@ -551,7 +553,7 @@ public void shouldBeAbleToKillContainer() throws IOException { dockerConnector.killContainer(killContainerParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/containers/" + killContainerParams.getContainer() + "/kill"); verify(dockerConnection).request(); @@ -581,7 +583,7 @@ public void shouldBeAbleToRemoveContainer() throws IOException { dockerConnector.removeContainer(removeContainerParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_DELETE); verify(dockerConnection).path("/containers/" + removeContainerParams.getContainer()); verify(dockerConnection).request(); @@ -630,7 +632,7 @@ public void shouldBeAbleToWaitContainer() throws IOException, JsonParseException int returnedExitCode = dockerConnector.waitContainer(waitContainerParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/containers/" + waitContainerParams.getContainer() + "/wait"); verify(dockerConnection).request(); @@ -683,7 +685,7 @@ public void shouldBeAbleToInspectContainer() throws IOException, JsonParseExcept ContainerInfo returnedContainerInfo = dockerConnector.inspectContainer(inspectContainerParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/containers/" + inspectContainerParams.getContainer() + "/json"); verify(dockerConnection).request(); @@ -732,7 +734,7 @@ public void shouldBeAbleToAttachContainer() throws IOException { dockerConnector.attachContainer(attachContainerParams, logMessageProcessor); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection) .path("/containers/" + attachContainerParams.getContainer() + "/attach"); @@ -766,7 +768,7 @@ public void shouldBeAbleToGetContainerLogs() throws IOException { dockerConnector.getContainerLogs(getContainerLogsParams, logMessageProcessor); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/containers/" + getContainerLogsParams.getContainer() + "/logs"); verify(dockerConnection).query("stdout", 1); @@ -819,7 +821,7 @@ public void shouldBeAbleToCreateExec() throws IOException, JsonParseException { Exec returnedExec = dockerConnector.createExec(createExecParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/containers/" + createExecParams.getContainer() + "/exec"); verify(dockerConnection).header("Content-Type", MediaType.APPLICATION_JSON); @@ -855,7 +857,7 @@ public void shouldBeAbleToStartExec() throws IOException { dockerConnector.startExec(startExecParams, logMessageProcessor); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/exec/" + startExecParams.getExecId() + "/start"); verify(dockerConnection).header("Content-Type", MediaType.APPLICATION_JSON); @@ -923,7 +925,7 @@ public void shouldBeAbleToGetExecInfo() throws IOException, JsonParseException { ExecInfo returnedExecInfo = dockerConnector.getExecInfo(getExecInfoParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/exec/" + getExecInfoParams.getExecId() + "/json"); verify(dockerConnection).request(); @@ -960,7 +962,7 @@ public void topShouldBeAbleToGetProcesses() throws IOException, JsonParseExcepti ContainerProcesses returnedContainerProcesses = dockerConnector.top(topParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/containers/" + topParams.getContainer() + "/top"); verify(dockerConnection).request(); @@ -982,7 +984,7 @@ public void topWithPsArgsShouldBeAbleToGetProcesses() throws IOException, JsonPa ContainerProcesses returnedContainerProcesses = dockerConnector.top(topParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/containers/" + topParams.getContainer() + "/top"); verify(dockerConnection).query(eq("ps_args"), anyString()); @@ -1020,7 +1022,7 @@ public void shouldBeAbleToGetResourcesFromContainer() throws IOException { String response = CharStreams.toString(new InputStreamReader(dockerConnector.getResource(getResourceParams))); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/containers/" + getResourceParams.getContainer() + "/archive"); verify(dockerConnection).query(eq("path"), eq(PATH_TO_FILE)); @@ -1059,12 +1061,12 @@ public void shouldBeAbleToPutResourcesIntoContainer() throws IOException { dockerConnector.putResource(putResourceParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_PUT); verify(dockerConnection).path("/containers/" + putResourceParams.getContainer() + "/archive"); verify(dockerConnection).query(eq("path"), eq(PATH_TO_FILE)); verify(dockerConnection).header("Content-Type", ExtMediaType.APPLICATION_X_TAR); - verify(dockerConnection).header(eq("Content-Length"), anyInt()); + verify(dockerConnection).header(eq("Content-Length"), anyLong()); verify(dockerConnection).entity(any(InputStream.class)); verify(dockerConnection).request(); verify(dockerResponse).getStatus(); @@ -1098,7 +1100,7 @@ public void shouldBeAbleToGetEvents() throws IOException { dockerConnector.getEvents(getEventsParams, eventMessageProcessor); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/events"); verify(dockerConnection).request(); @@ -1142,16 +1144,16 @@ public void shouldBeAbleToBuildImage() throws IOException, InterruptedException String returnedImageId = dockerConnector.buildImage(buildImageParams, progressMonitor); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/build"); verify(dockerConnection).header("Content-Type", "application/x-compressed-tar"); - verify(dockerConnection).header(eq("Content-Length"), anyInt()); + verify(dockerConnection).header(eq("Content-Length"), anyLong()); verify(dockerConnection).entity(any(InputStream.class)); verify(dockerConnection, never()).header(eq("remote"), anyString()); - verify(dockerConnection).header(eq("X-Registry-Config"), any(byte[].class)); + verify(dockerConnection).header(eq("X-Registry-Config"), nullable(byte[].class)); verify(dockerConnection).request(); verify(dockerResponse).getStatus(); verify(dockerResponse).getInputStream(); @@ -1181,7 +1183,7 @@ public void shouldBeAbleToBuildImageWithRemoteContext() throws IOException, Inte String returnedImageId = dockerConnector.buildImage(buildImageParams, progressMonitor); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/build"); @@ -1190,7 +1192,7 @@ public void shouldBeAbleToBuildImageWithRemoteContext() throws IOException, Inte verify(dockerConnection, never()).header(eq("Content-Length"), anyInt()); verify(dockerConnection, never()).entity(any(InputStream.class)); - verify(dockerConnection).header(eq("X-Registry-Config"), any(byte[].class)); + verify(dockerConnection).header(eq("X-Registry-Config"), nullable(byte[].class)); verify(dockerConnection).request(); verify(dockerResponse).getStatus(); verify(dockerResponse).getInputStream(); @@ -1250,15 +1252,17 @@ public void shouldBeAbleToBuildImageWithAdditionalQueryParameters() String returnedImageId = dockerConnector.buildImage(buildImageParams, progressMonitor); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/build"); verify(dockerConnection).header("Content-Type", "application/x-compressed-tar"); - verify(dockerConnection).header(eq("Content-Length"), anyInt()); + verify(dockerConnection).header(eq("Content-Length"), anyLong()); verify(dockerConnection).entity(any(InputStream.class)); + verify(dockerConnection, never()).header(eq("remote"), anyString()); + + verify(dockerConnection).header(eq("X-Registry-Config"), nullable(byte[].class)); - verify(dockerConnection).header(eq("X-Registry-Config"), any(byte[].class)); verify(dockerConnection).request(); verify(dockerResponse).getStatus(); verify(dockerResponse).getInputStream(); @@ -1347,7 +1351,7 @@ public void shouldBeAbleToRemoveImage() throws IOException { dockerConnector.removeImage(removeImageParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_DELETE); verify(dockerConnection).path("/images/" + removeImageParams.getImage()); verify(dockerConnection).request(); @@ -1375,7 +1379,7 @@ public void shouldBeAbleToTagImage() throws IOException { dockerConnector.tag(tagParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/images/" + tagParams.getImage() + "/tag"); verify(dockerConnection).query("repo", tagParams.getRepository()); @@ -1409,10 +1413,10 @@ public void shouldBeAbleToPushImageToRepository() throws IOException, Interrupte dockerConnector.push(pushParams, progressMonitor); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/images/" + pushParams.getRepository() + "/push"); - verify(dockerConnection).header(eq("X-Registry-Auth"), any(AuthConfig.class)); + verify(dockerConnection).header(eq("X-Registry-Auth"), nullable(AuthConfig.class)); verify(dockerConnection).request(); verify(dockerResponse).getStatus(); verify(dockerResponse).getInputStream(); @@ -1430,11 +1434,11 @@ public void shouldBeAbleToPushImageToRegistryRepository() dockerConnector.push(pushParams, progressMonitor); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection) .path("/images/" + pushParams.getRegistry() + '/' + pushParams.getRepository() + "/push"); - verify(dockerConnection).header(eq("X-Registry-Auth"), any(AuthConfig.class)); + verify(dockerConnection).header(eq("X-Registry-Auth"), nullable(AuthConfig.class)); verify(dockerConnection).request(); verify(dockerResponse).getStatus(); verify(dockerResponse).getInputStream(); @@ -1538,7 +1542,7 @@ public void shouldBeAbleToCommitImage() throws IOException, JsonParseException { String returnedImage = dockerConnector.commit(commitParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/commit"); verify(dockerConnection).query("container", commitParams.getContainer()); @@ -1573,11 +1577,11 @@ public void shouldBeAbleToPullImageFromRepository() throws IOException, Interrup dockerConnector.pull(pullParams, progressMonitor); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/images/create"); verify(dockerConnection).query("fromImage", pullParams.getImage()); - verify(dockerConnection).header(eq("X-Registry-Auth"), any(AuthConfig.class)); + verify(dockerConnection).header(eq("X-Registry-Auth"), nullable(AuthConfig.class)); verify(dockerConnection).request(); verify(dockerResponse).getStatus(); verify(dockerResponse).getInputStream(); @@ -1592,12 +1596,12 @@ public void shouldBeAbleToPullImageCreateRegistryRepository() dockerConnector.pull(pullParams, progressMonitor); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/images/create"); verify(dockerConnection) .query("fromImage", pullParams.getRegistry() + '/' + pullParams.getImage()); - verify(dockerConnection).header(eq("X-Registry-Auth"), any(AuthConfig.class)); + verify(dockerConnection).header(eq("X-Registry-Auth"), nullable(AuthConfig.class)); verify(dockerConnection).request(); verify(dockerResponse).getStatus(); verify(dockerResponse).getInputStream(); @@ -1633,7 +1637,7 @@ public void shouldBeAbleToCreateContainer() throws IOException, JsonParseExcepti ContainerCreated returnedContainerCreated = dockerConnector.createContainer(createContainerParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/containers/create"); verify(dockerConnection).header("Content-Type", MediaType.APPLICATION_JSON); @@ -1668,7 +1672,7 @@ public void shouldBeAbleToStartContainer() throws IOException { dockerConnector.startContainer(startContainerParams); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/containers/" + startContainerParams.getContainer() + "/start"); verify(dockerConnection).request(); @@ -1874,7 +1878,7 @@ public void shouldBeAbleToGetNetworksWithParams() throws Exception { // then assertEquals(actual, originNetworks); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/networks"); verify(dockerConnection).query(eq("filters"), anyObject()); @@ -1925,7 +1929,7 @@ public void shouldBeAbleToInspectNetworkWithParams() throws Exception { // then assertEquals(actual, originNetwork); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_GET); verify(dockerConnection).path("/networks/" + originNetwork.getId()); verify(dockerConnection).request(); @@ -1963,7 +1967,7 @@ public void shouldBeAbleToCreateNetwork() throws Exception { // then assertEquals(networkCreated, originNetworkCreated); - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/networks/create"); verify(dockerConnection).header("Content-Type", MediaType.APPLICATION_JSON); @@ -2023,7 +2027,7 @@ public void shouldBeAbleToConnectContainerToNetworkWithParams() throws Exception dockerConnector.connectContainerToNetwork(connectToNetworkParams); // then - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/networks/" + netId + "/connect"); verify(dockerConnection).header("Content-Type", MediaType.APPLICATION_JSON); @@ -2085,7 +2089,7 @@ public void shouldBeAbleToDisconnectContainerFromNetworkWithParams() throws Exce dockerConnector.disconnectContainerFromNetwork(disconnectFromNetworkParams); // then - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_POST); verify(dockerConnection).path("/networks/" + netId + "/disconnect"); verify(dockerConnection).header("Content-Type", MediaType.APPLICATION_JSON); @@ -2140,7 +2144,7 @@ public void shouldBeAbleToRemoveNetworkWithParams() throws Exception { dockerConnector.removeNetwork(removeNetworkParams); // then - verify(dockerConnectionFactory).openConnection(any(URI.class)); + verify(dockerConnectionFactory).openConnection(nullable(URI.class)); verify(dockerConnection).method(REQUEST_METHOD_DELETE); verify(dockerConnection).path("/networks/" + netId); verify(dockerConnection).request(); diff --git a/plugins/plugin-docker/che-plugin-openshift-client/pom.xml b/plugins/plugin-docker/che-plugin-openshift-client/pom.xml index 828ab3e4e67..f5cb0c06393 100644 --- a/plugins/plugin-docker/che-plugin-openshift-client/pom.xml +++ b/plugins/plugin-docker/che-plugin-openshift-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-docker-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-openshift-client jar diff --git a/plugins/plugin-docker/pom.xml b/plugins/plugin-docker/pom.xml index c927523b53c..c9b4b86a664 100644 --- a/plugins/plugin-docker/pom.xml +++ b/plugins/plugin-docker/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-docker-parent diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml index 0750974c562..ba4dd45d794 100644 --- a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml +++ b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-gdb-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-gdb-ide jar diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/src/test/java/org/eclipse/che/plugin/gdb/ide/configuration/GdbConfigurationPagePresenterTest.java b/plugins/plugin-gdb/che-plugin-gdb-ide/src/test/java/org/eclipse/che/plugin/gdb/ide/configuration/GdbConfigurationPagePresenterTest.java index 41fb406fb89..d5264dc4b4d 100644 --- a/plugins/plugin-gdb/che-plugin-gdb-ide/src/test/java/org/eclipse/che/plugin/gdb/ide/configuration/GdbConfigurationPagePresenterTest.java +++ b/plugins/plugin-gdb/che-plugin-gdb-ide/src/test/java/org/eclipse/che/plugin/gdb/ide/configuration/GdbConfigurationPagePresenterTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.plugin.gdb.ide.configuration; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -76,7 +76,7 @@ public void testGo() throws Exception { verify(configuration, atLeastOnce()).getConnectionProperties(); verify(pageView).setHost(eq(HOST)); verify(pageView).setPort(eq(PORT)); - verify(pageView).setBinaryPath(anyString()); + verify(pageView).setBinaryPath(nullable(String.class)); verify(pageView).setDevHost(eq(false)); verify(pageView).setPortEnableState(eq(true)); verify(pageView).setHostEnableState(eq(true)); diff --git a/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml index 7afb544a618..43ae917ce51 100644 --- a/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml +++ b/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-gdb-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-gdb-server jar @@ -65,7 +65,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/plugins/plugin-gdb/pom.xml b/plugins/plugin-gdb/pom.xml index ca2020d5db7..bffaaf260fe 100644 --- a/plugins/plugin-gdb/pom.xml +++ b/plugins/plugin-gdb/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-gdb-parent pom diff --git a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml index 8d9cdff5d32..ed376a007b1 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml +++ b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml @@ -16,7 +16,7 @@ che-plugin-git-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-git-ext-git jar diff --git a/plugins/plugin-git/pom.xml b/plugins/plugin-git/pom.xml index 58223b901a2..ec89e19b29a 100644 --- a/plugins/plugin-git/pom.xml +++ b/plugins/plugin-git/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-git-parent diff --git a/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml b/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml index 3dcf177b1ee..c7d24b285ed 100644 --- a/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml +++ b/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-github-factory-resolver jar diff --git a/plugins/plugin-github/che-plugin-github-ide/pom.xml b/plugins/plugin-github/che-plugin-github-ide/pom.xml index 699555fc9f4..a9e05654ade 100644 --- a/plugins/plugin-github/che-plugin-github-ide/pom.xml +++ b/plugins/plugin-github/che-plugin-github-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-github-ide jar diff --git a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java index 1f93ce8ab83..4b94d9cdb68 100644 --- a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java +++ b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java @@ -14,7 +14,7 @@ import static org.eclipse.che.ide.api.notification.StatusNotification.Status.SUCCESS; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.RETURNS_DEFAULTS; import static org.mockito.Mockito.mock; @@ -88,8 +88,9 @@ public void setUp() throws Exception { sshPairDTOsPromise = createPromise(); voidPromise = createPromise(); - when(sshServiceClient.getPairs(anyString())).thenReturn(sshPairDTOsPromise); - when(sshServiceClient.deletePair(anyString(), anyString())).thenReturn(voidPromise); + when(sshServiceClient.getPairs(nullable(String.class))).thenReturn(sshPairDTOsPromise); + when(sshServiceClient.deletePair(nullable(String.class), nullable(String.class))) + .thenReturn(voidPromise); } private Promise createPromise() { @@ -183,7 +184,7 @@ public void onAuthenticatedWhenGenerateKeysIsSuccess() throws Exception { verify(view).isGenerateKeysSelected(); verify(registry).getUploader(eq(GITHUB_HOST)); verify(appContext).getCurrentUser(); - verify(notificationManager).notify(anyString(), eq(SUCCESS), eq(FLOAT_MODE)); + verify(notificationManager).notify(nullable(String.class), eq(SUCCESS), eq(FLOAT_MODE)); } @Test @@ -201,7 +202,7 @@ public void onAuthenticatedWhenGenerateKeysIsFailure() throws Exception { when(appContext.getCurrentUser()).thenReturn(user); when(user.getId()).thenReturn(userId); when(dialogFactory.createMessageDialog( - anyString(), anyString(), Matchers.anyObject())) + nullable(String.class), nullable(String.class), Matchers.anyObject())) .thenReturn(messageDialog); gitHubAuthenticator.authenticate(null, getCallBack()); @@ -215,7 +216,8 @@ public void onAuthenticatedWhenGenerateKeysIsFailure() throws Exception { verify(registry).getUploader(eq(GITHUB_HOST)); verify(appContext).getCurrentUser(); verify(dialogFactory) - .createMessageDialog(anyString(), anyString(), Matchers.anyObject()); + .createMessageDialog( + nullable(String.class), nullable(String.class), Matchers.anyObject()); verify(messageDialog).show(); verify(sshServiceClient).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); } @@ -237,7 +239,7 @@ public void onAuthenticatedWhenGetFailedKeyIsSuccess() throws Exception { when(appContext.getCurrentUser()).thenReturn(user); when(user.getId()).thenReturn(userId); when(dialogFactory.createMessageDialog( - anyString(), anyString(), Matchers.anyObject())) + nullable(String.class), nullable(String.class), Matchers.anyObject())) .thenReturn(messageDialog); when(pair.getName()).thenReturn(GITHUB_HOST); when(pair.getService()).thenReturn(SshKeyManagerPresenter.VCS_SSH_SERVICE); @@ -256,7 +258,8 @@ public void onAuthenticatedWhenGetFailedKeyIsSuccess() throws Exception { verify(registry).getUploader(eq(GITHUB_HOST)); verify(appContext).getCurrentUser(); verify(dialogFactory) - .createMessageDialog(anyString(), anyString(), Matchers.anyObject()); + .createMessageDialog( + nullable(String.class), nullable(String.class), Matchers.anyObject()); verify(messageDialog).show(); verify(sshServiceClient).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); verify(sshServiceClient) diff --git a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java index 1a159d3077b..8ca1d696e26 100644 --- a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java +++ b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; @@ -123,8 +124,8 @@ public void setUp() { locale)); doReturn(Collections.singletonList(gitHubUser)) .when(presenter) - .toOrgList(any(JsArrayMixed.class)); - doReturn(Collections.emptyList()).when(presenter).toRepoList(any(JsArrayMixed.class)); + .toOrgList(nullable(JsArrayMixed.class)); + doReturn(Collections.emptyList()).when(presenter).toRepoList(nullable(JsArrayMixed.class)); presenter.setUpdateDelegate(updateDelegate); presenter.init(dataObject); } @@ -160,7 +161,7 @@ public Void answer(InvocationOnMock invocation) throws Throwable { } }) .when(presenter) - .doRequest(any(Promise.class), any(Promise.class), any(Promise.class)); + .doRequest(nullable(Promise.class), nullable(Promise.class), nullable(Promise.class)); when(view.getAccountName()).thenReturn("AccountName"); presenter.onLoadRepoClicked(); @@ -190,7 +191,7 @@ public Void answer(InvocationOnMock invocation) throws Throwable { } }) .when(presenter) - .doRequest(any(Promise.class), any(Promise.class), any(Promise.class)); + .doRequest(nullable(Promise.class), nullable(Promise.class), nullable(Promise.class)); presenter.onLoadRepoClicked(); @@ -505,7 +506,7 @@ public Void answer(InvocationOnMock invocation) throws Throwable { } }) .when(presenter) - .doRequest(any(Promise.class), any(Promise.class), any(Promise.class)); + .doRequest(nullable(Promise.class), nullable(Promise.class), nullable(Promise.class)); doReturn(exception).when(promiseError).getCause(); presenter.onLoadRepoClicked(); @@ -545,7 +546,7 @@ public Void answer(InvocationOnMock invocation) throws Throwable { } }) .when(presenter) - .doRequest(any(Promise.class), any(Promise.class), any(Promise.class)); + .doRequest(nullable(Promise.class), nullable(Promise.class), nullable(Promise.class)); final Throwable exception = mock(UnauthorizedException.class); String userId = "userId"; CurrentUser user = mock(CurrentUser.class); diff --git a/plugins/plugin-github/che-plugin-github-oauth2/pom.xml b/plugins/plugin-github/che-plugin-github-oauth2/pom.xml index 1034187168c..99d4fee7805 100644 --- a/plugins/plugin-github/che-plugin-github-oauth2/pom.xml +++ b/plugins/plugin-github/che-plugin-github-oauth2/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-github-oauth2 jar diff --git a/plugins/plugin-github/che-plugin-github-provider-github/pom.xml b/plugins/plugin-github/che-plugin-github-provider-github/pom.xml index 571ace5190a..7369c7d0a8b 100644 --- a/plugins/plugin-github/che-plugin-github-provider-github/pom.xml +++ b/plugins/plugin-github/che-plugin-github-provider-github/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-github-provider-github Che Plugin :: Github :: Credential provider diff --git a/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml b/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml index edc330a0a7e..daef39fa37a 100644 --- a/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml +++ b/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-github-pullrequest Che Plugin :: Github :: Pull request @@ -103,7 +103,7 @@ test - mockito-all + mockito-core org.mockito diff --git a/plugins/plugin-github/che-plugin-github-server/pom.xml b/plugins/plugin-github/che-plugin-github-server/pom.xml index 2eb0808d61d..07fe6c61e89 100644 --- a/plugins/plugin-github/che-plugin-github-server/pom.xml +++ b/plugins/plugin-github/che-plugin-github-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-github-server jar diff --git a/plugins/plugin-github/che-plugin-github-shared/pom.xml b/plugins/plugin-github/che-plugin-github-shared/pom.xml index 5f2e0020f45..2fdc9f07f45 100644 --- a/plugins/plugin-github/che-plugin-github-shared/pom.xml +++ b/plugins/plugin-github/che-plugin-github-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-github-shared Che Plugin :: Github :: Shared diff --git a/plugins/plugin-github/pom.xml b/plugins/plugin-github/pom.xml index 16ae63b089a..61360395b1b 100644 --- a/plugins/plugin-github/pom.xml +++ b/plugins/plugin-github/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-github-parent diff --git a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml index 44d74b136cc..484c1f47e69 100644 --- a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml +++ b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml @@ -16,7 +16,7 @@ che-plugin-gwt-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-gwt-ext-gwt jar diff --git a/plugins/plugin-gwt/pom.xml b/plugins/plugin-gwt/pom.xml index 8504f8b760b..050634e2ed9 100644 --- a/plugins/plugin-gwt/pom.xml +++ b/plugins/plugin-gwt/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-gwt-parent diff --git a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml index 76ed335a36f..0989ff24e27 100644 --- a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml +++ b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-help-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-help-ext-client jar diff --git a/plugins/plugin-help/pom.xml b/plugins/plugin-help/pom.xml index 0efde7ea8ea..961b5a17fdf 100644 --- a/plugins/plugin-help/pom.xml +++ b/plugins/plugin-help/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-help-parent diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml index 0781a8b51f9..c9ec09dc7a5 100644 --- a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml +++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-debugger-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-java-debugger-ide jar diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml index 91f14ad5cef..9f7df195ee1 100644 --- a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml +++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-debugger-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-java-debugger-server jar diff --git a/plugins/plugin-java-debugger/pom.xml b/plugins/plugin-java-debugger/pom.xml index a164c1d0d31..6350275e558 100644 --- a/plugins/plugin-java-debugger/pom.xml +++ b/plugins/plugin-java-debugger/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-java-debugger-parent pom diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml index 4f0cb8d59fb..1c0ea0cbf49 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.core.filebuffers jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml index b1fda9af8e5..af0b2b604f5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.core.filesystem jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml index 4e0651fc9b3..191739c69ae 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.core.resources jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml index dc7a3f90d06..a01a6eddcd8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.jdt.ui jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml index cbfb7153bb2..8cbc16be303 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.jface.text jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml index 390d45d423d..b7945b8f6fb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.jface jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml index c836fd86abd..2300af45568 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.ltk.core.refactoring jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml index b50549405cb..f6753d5117a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.search jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml index b6fd96657d3..0d8a2806181 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.ui.ide jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml index 3c0285c2d96..3e3fbfa3150 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-java-ext-jdt-parent pom diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml index e3a2c9beba2..e262d8700ba 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-java-ext-lang-client jar diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategyTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategyTest.java index c8979ed7c63..4ccb45e88ab 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategyTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategyTest.java @@ -12,7 +12,7 @@ import static org.eclipse.che.ide.project.ResolvingProjectStateHolder.ResolvingProjectState.IN_PROGRESS; import static org.eclipse.che.ide.project.ResolvingProjectStateHolder.ResolvingProjectState.RESOLVED; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -89,22 +89,21 @@ public void setUp() throws Exception { when(editor.getEditorInput()).thenReturn(editorInput); when(editorInput.getFile()).thenReturn(file); - when(file.getName()).thenReturn(FILE_NAME); when(file.getProject()).thenReturn(project); when(file.getLocation()).thenReturn(Path.valueOf(FILE_PATH)); when(project.getPath()).thenReturn(PROJECT_PATH); - when(file.getParentWithMarker(any())).thenReturn(srcFolder); + when(file.getParentWithMarker(nullable(String.class))).thenReturn(srcFolder); when(srcFolder.isPresent()).thenReturn(true); when(srcFolder.get()).thenReturn(startPoint); when(startPoint.getLocation()).thenReturn(Path.valueOf("some/path")); - when(resolvingProjectStateHolderRegistry.getResolvingProjectStateHolder(anyString())) + when(resolvingProjectStateHolderRegistry.getResolvingProjectStateHolder(nullable(String.class))) .thenReturn(resolvingProjectStateHolder); when(localizationConstant.codeAssistErrorMessageResolvingProject()).thenReturn("error"); when(client.reconcile(anyString(), anyString())).thenReturn(reconcileResultPromise); - when(reconcileResultPromise.onSuccess(Matchers.>anyObject())) + when(reconcileResultPromise.onSuccess(Matchers.>any())) .thenReturn(reconcileResultPromise); javaReconcilerStrategy.setDocument(mock(Document.class)); diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenterTest.java index 5d690c1b0d0..b7bcfabd1ca 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenterTest.java @@ -17,10 +17,10 @@ import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus.INFO; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus.OK; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus.WARNING; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -220,11 +220,11 @@ public void showPreviewWindowWhenPreviewButtonClicked() throws Exception { presenter.onPreviewButtonClicked(); - verify(moveSettings).setSessionId(anyString()); + verify(moveSettings).setSessionId(nullable(String.class)); verify(moveSettings).setUpdateReferences(anyBoolean()); verify(moveSettings).setUpdateQualifiedNames(anyBoolean()); - verify(moveSettings).setFilePatterns(anyString()); - verify(session).setSessionId(anyString()); + verify(moveSettings).setFilePatterns(nullable(String.class)); + verify(session).setSessionId(nullable(String.class)); verify(moveSettingsPromise).thenPromise(changeCreationFunction.capture()); changeCreationFunction.getValue().apply(any()); @@ -232,7 +232,7 @@ public void showPreviewWindowWhenPreviewButtonClicked() throws Exception { verify(changeCreationResultPromise).then(changeResultOperation.capture()); changeResultOperation.getValue().apply(changeCreationResult); - verify(previewPresenter).show(anyString(), any()); + verify(previewPresenter).show(nullable(String.class), any()); verify(moveView).hide(); } @@ -245,7 +245,8 @@ public void errorMessageShouldBeShownDuringShowingPreviewDialog() throws Operati verify(locale).showPreviewError(); verify(promiseError).getMessage(); - verify(notificationManager).notify(anyString(), anyString(), eq(FAIL), eq(FLOAT_MODE)); + verify(notificationManager) + .notify(nullable(String.class), nullable(String.class), eq(FAIL), eq(FLOAT_MODE)); } @Test @@ -255,11 +256,11 @@ public void showErrorMessageIfCanNotShowPreviewWindow() throws Exception { presenter.onPreviewButtonClicked(); - verify(moveSettings).setSessionId(anyString()); + verify(moveSettings).setSessionId(nullable(String.class)); verify(moveSettings).setUpdateReferences(anyBoolean()); verify(moveSettings).setUpdateQualifiedNames(anyBoolean()); - verify(moveSettings).setFilePatterns(anyString()); - verify(session).setSessionId(anyString()); + verify(moveSettings).setFilePatterns(nullable(String.class)); + verify(session).setSessionId(nullable(String.class)); verify(moveSettingsPromise).thenPromise(changeCreationFunction.capture()); changeCreationFunction.getValue().apply(any()); @@ -267,7 +268,7 @@ public void showErrorMessageIfCanNotShowPreviewWindow() throws Exception { verify(changeCreationResultPromise).then(changeResultOperation.capture()); changeResultOperation.getValue().apply(changeCreationResult); - verify(previewPresenter, never()).show(anyString(), any()); + verify(previewPresenter, never()).show(nullable(String.class), any()); verify(moveView, never()).hide(); verify(moveView).showStatusMessage(refactoringStatus); } @@ -280,11 +281,11 @@ public void acceptButtonActionShouldShowAnErrorMessage() throws Exception { presenter.onAcceptButtonClicked(); - verify(moveSettings).setSessionId(anyString()); + verify(moveSettings).setSessionId(nullable(String.class)); verify(moveSettings).setUpdateReferences(anyBoolean()); verify(moveSettings).setUpdateQualifiedNames(anyBoolean()); - verify(moveSettings).setFilePatterns(anyString()); - verify(session).setSessionId(anyString()); + verify(moveSettings).setFilePatterns(nullable(String.class)); + verify(session).setSessionId(nullable(String.class)); verify(moveSettingsPromise).thenPromise(changeCreationFunction.capture()); changeCreationFunction.getValue().apply(any()); @@ -305,7 +306,8 @@ public void notificationShouldBeShownWhenSomeErrorOccursDuringAcceptMoving() verify(locale).applyMoveError(); verify(promiseError).getMessage(); - verify(notificationManager).notify(anyString(), anyString(), eq(FAIL), eq(FLOAT_MODE)); + verify(notificationManager) + .notify(nullable(String.class), nullable(String.class), eq(FAIL), eq(FLOAT_MODE)); } @Test @@ -323,11 +325,11 @@ public void acceptButtonActionShouldBePerformed() throws Exception { presenter.onAcceptButtonClicked(); - verify(moveSettings).setSessionId(anyString()); + verify(moveSettings).setSessionId(nullable(String.class)); verify(moveSettings).setUpdateReferences(anyBoolean()); verify(moveSettings).setUpdateQualifiedNames(anyBoolean()); - verify(moveSettings).setFilePatterns(anyString()); - verify(session).setSessionId(anyString()); + verify(moveSettings).setFilePatterns(nullable(String.class)); + verify(session).setSessionId(nullable(String.class)); verify(moveSettingsPromise).thenPromise(changeCreationFunction.capture()); changeCreationFunction.getValue().apply(any()); @@ -364,11 +366,11 @@ public void errorLabelShouldBeShowedIfRefactoringStatusIsNotOK() throws Exceptio presenter.onAcceptButtonClicked(); - verify(moveSettings).setSessionId(anyString()); + verify(moveSettings).setSessionId(nullable(String.class)); verify(moveSettings).setUpdateReferences(anyBoolean()); verify(moveSettings).setUpdateQualifiedNames(anyBoolean()); - verify(moveSettings).setFilePatterns(anyString()); - verify(session).setSessionId(anyString()); + verify(moveSettings).setFilePatterns(nullable(String.class)); + verify(session).setSessionId(nullable(String.class)); verify(moveSettingsPromise).thenPromise(changeCreationFunction.capture()); changeCreationFunction.getValue().apply(any()); @@ -397,7 +399,7 @@ public void moveDestinationPathChangedWithOKStatus() throws Exception { presenter.setMoveDestinationPath(DESTINATION, PROJECT_PATH); verify(destination).setType(ReorgDestination.DestinationType.PACKAGE); - verify(destination).setSessionId(anyString()); + verify(destination).setSessionId(nullable(String.class)); verify(destination).setProjectPath(PROJECT_PATH); verify(destination).setDestination(DESTINATION); @@ -415,7 +417,7 @@ public void moveDestinationPathChangedWithINFOStatus() throws Exception { presenter.setMoveDestinationPath(DESTINATION, PROJECT_PATH); verify(destination).setType(ReorgDestination.DestinationType.PACKAGE); - verify(destination).setSessionId(anyString()); + verify(destination).setSessionId(nullable(String.class)); verify(destination).setProjectPath(PROJECT_PATH); verify(destination).setDestination(DESTINATION); @@ -433,7 +435,7 @@ public void moveDestinationPathChangedWithWARNINGStatus() throws Exception { presenter.setMoveDestinationPath(DESTINATION, PROJECT_PATH); verify(destination).setType(ReorgDestination.DestinationType.PACKAGE); - verify(destination).setSessionId(anyString()); + verify(destination).setSessionId(nullable(String.class)); verify(destination).setProjectPath(PROJECT_PATH); verify(destination).setDestination(DESTINATION); @@ -451,7 +453,7 @@ public void moveDestinationPathChangedWithERRORStatus() throws Exception { presenter.setMoveDestinationPath(DESTINATION, PROJECT_PATH); verify(destination).setType(ReorgDestination.DestinationType.PACKAGE); - verify(destination).setSessionId(anyString()); + verify(destination).setSessionId(nullable(String.class)); verify(destination).setProjectPath(PROJECT_PATH); verify(destination).setDestination(DESTINATION); @@ -472,7 +474,7 @@ public void moveDestinationPathChangedWithFATALStatus() throws Exception { presenter.setMoveDestinationPath(DESTINATION, PROJECT_PATH); verify(destination).setType(ReorgDestination.DestinationType.PACKAGE); - verify(destination).setSessionId(anyString()); + verify(destination).setSessionId(nullable(String.class)); verify(destination).setProjectPath(PROJECT_PATH); verify(destination).setDestination(DESTINATION); diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRenameTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRenameTest.java index 27391b059d4..03f9926eef6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRenameTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRenameTest.java @@ -18,6 +18,7 @@ import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus.OK; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus.WARNING; import static org.junit.Assert.assertFalse; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyList; @@ -219,8 +220,6 @@ public void turnOffLinkedEditorModeWhenEditorIsClosed() throws Exception { @Test public void renameRefactoringShouldBeAppliedSuccessAndShowWizard() throws OperationException { - when(result.getSeverity()).thenReturn(OK); - refactoringRename.refactor(textEditor); refactoringRename.refactor(textEditor); @@ -235,7 +234,6 @@ public void renameRefactoringShouldBeShowErrorWindow() throws OperationException PromiseError arg = Mockito.mock(PromiseError.class); MessageDialog dialog = Mockito.mock(MessageDialog.class); - when(result.getSeverity()).thenReturn(OK); when(locale.renameRename()).thenReturn("renameTitle"); when(locale.renameOperationUnavailable()).thenReturn("renameBody"); when(dialogFactory.createMessageDialog(anyString(), anyString(), anyObject())) @@ -269,12 +267,12 @@ public void renameRefactoringShouldBeFailedByError() throws OperationException { when(result.getSeverity()).thenReturn(ERROR); when(dialogFactory.createConfirmDialog( - anyString(), - anyString(), - anyString(), - anyString(), - Matchers.anyObject(), - Matchers.anyObject())) + nullable(String.class), + nullable(String.class), + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), + nullable(CancelCallback.class))) .thenReturn(confirmDialog); refactoringRename.refactor(textEditor); @@ -300,10 +298,10 @@ public void renameRefactoringShouldBeFailedByError() throws OperationException { verify(locale).buttonCancel(); verify(dialogFactory) .createConfirmDialog( - anyString(), - anyString(), - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), + nullable(String.class), + nullable(String.class), Matchers.anyObject(), Matchers.anyObject()); verify(confirmDialog).show(); @@ -315,12 +313,12 @@ public void renameRefactoringShouldBeWithWarningOrErrorStatus() throws Operation when(result.getSeverity()).thenReturn(WARNING); when(dialogFactory.createConfirmDialog( - anyString(), - anyString(), - anyString(), - anyString(), - Matchers.anyObject(), - Matchers.anyObject())) + nullable(String.class), + nullable(String.class), + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), + nullable(CancelCallback.class))) .thenReturn(confirmDialog); refactoringRename.refactor(textEditor); @@ -346,10 +344,10 @@ public void renameRefactoringShouldBeWithWarningOrErrorStatus() throws Operation verify(locale).buttonCancel(); verify(dialogFactory) .createConfirmDialog( - anyString(), - anyString(), - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), + nullable(String.class), + nullable(String.class), Matchers.anyObject(), Matchers.anyObject()); verify(confirmDialog).show(); diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenterTest.java index 832e9cb6766..68a733fd465 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenterTest.java @@ -13,10 +13,10 @@ import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.CreateRenameRefactoring.RenameType.COMPILATION_UNIT; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.CreateRenameRefactoring.RenameType.JAVA_ELEMENT; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.CreateRenameRefactoring.RenameType.PACKAGE; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -216,7 +216,7 @@ public void wizardShouldNotBeShowIfRenameRefactoringObjectWasNotCreated() throws renamePresenter.show(refactorInfo); verify(createRenameRefactoringDto).setRefactorLightweight(false); - verify(createRenameRefactoringDto).setPath(anyString()); + verify(createRenameRefactoringDto).setPath(nullable(String.class)); verify(createRenameRefactoringDto).setType(COMPILATION_UNIT); verify(createRenameRefactoringDto).setProjectPath(eq("/project")); @@ -225,7 +225,10 @@ public void wizardShouldNotBeShowIfRenameRefactoringObjectWasNotCreated() throws promiseErrorCaptor.getValue().apply(promiseError); verify(notificationManager) .notify( - anyString(), anyString(), any(StatusNotification.Status.class), any(DisplayMode.class)); + nullable(String.class), + nullable(String.class), + any(StatusNotification.Status.class), + any(DisplayMode.class)); } @Test @@ -248,7 +251,7 @@ public void renameCompilationUnitWizardShouldBeShowCompilationUnit() throws Exce verifyPreparingWizard(); verify(locale).renameCompilationUnitTitle(); - verify(view).setTitle(anyString()); + verify(view).setTitle(nullable(String.class)); verify(view).setVisiblePatternsPanel(true); verify(view).setVisibleFullQualifiedNamePanel(true); verify(view).setVisibleSimilarlyVariablesPanel(true); @@ -275,7 +278,7 @@ public void renamePackageWizardShouldBeShow() throws Exception { verifyPreparingWizard(); verify(locale).renamePackageTitle(); - verify(view).setTitle(anyString()); + verify(view).setTitle(nullable(String.class)); verify(view).setVisiblePatternsPanel(true); verify(view).setVisibleFullQualifiedNamePanel(true); verify(view).setVisibleRenameSubpackagesPanel(true); @@ -302,7 +305,7 @@ public void renameTypeWizardShouldBeShow() throws Exception { verifyPreparingWizard(); verify(locale).renameTypeTitle(); - verify(view).setTitle(anyString()); + verify(view).setTitle(nullable(String.class)); verify(view).setVisiblePatternsPanel(true); verify(view).setVisibleFullQualifiedNamePanel(true); verify(view).setVisibleSimilarlyVariablesPanel(true); @@ -329,7 +332,7 @@ public void renameFieldWizardShouldBeShow() throws Exception { verifyPreparingWizard(); verify(locale).renameFieldTitle(); - verify(view).setTitle(anyString()); + verify(view).setTitle(nullable(String.class)); verify(view).setVisiblePatternsPanel(true); verify(view).show(); @@ -354,7 +357,7 @@ public void renameEnumConstantWizardShouldBeShow() throws Exception { verifyPreparingWizard(); verify(locale).renameEnumTitle(); - verify(view).setTitle(anyString()); + verify(view).setTitle(nullable(String.class)); verify(view).setVisiblePatternsPanel(true); verify(view).show(); @@ -379,7 +382,7 @@ public void renameTypeParameterWizardShouldBeShow() throws Exception { verifyPreparingWizard(); verify(locale).renameTypeVariableTitle(); - verify(view).setTitle(anyString()); + verify(view).setTitle(nullable(String.class)); verify(view).show(); } @@ -403,7 +406,7 @@ public void renameMethodWizardShouldBeShow() throws Exception { verifyPreparingWizard(); verify(locale).renameMethodTitle(); - verify(view).setTitle(anyString()); + verify(view).setTitle(nullable(String.class)); verify(view).setVisibleKeepOriginalPanel(true); verify(view).show(); @@ -427,7 +430,7 @@ public void renameLocalVariableWizardShouldBeShow() throws Exception { verifyPreparingWizard(); verify(locale).renameLocalVariableTitle(); - verify(view).setTitle(anyString()); + verify(view).setTitle(nullable(String.class)); verify(view).show(); } @@ -439,7 +442,7 @@ public void renameLocalVariableWizardShouldBeShowedIfRefactoringInfoIsNull() thr renamePresenter.show((RefactorInfo) null); verify(createRenameRefactoringDto).setType(JAVA_ELEMENT); - verify(createRenameRefactoringDto).setPath(anyString()); + verify(createRenameRefactoringDto).setPath(nullable(String.class)); verify(createRenameRefactoringDto).setOffset(2); verify(refactorService).createRenameRefactoring(createRenameRefactoringDto); @@ -449,7 +452,7 @@ public void renameLocalVariableWizardShouldBeShowedIfRefactoringInfoIsNull() thr verifyPreparingWizard(); verify(locale).renameLocalVariableTitle(); - verify(view).setTitle(anyString()); + verify(view).setTitle(nullable(String.class)); verify(view).show(); } @@ -476,7 +479,7 @@ public void renameProjectWizardShouldBeShowAsCompilationUnit() throws Exception verifyPreparingWizard(); verify(locale).renameCompilationUnitTitle(); - verify(view).setTitle(anyString()); + verify(view).setTitle(nullable(String.class)); verify(view).show(); } @@ -495,7 +498,7 @@ private void verifyPreparingWizard() { private void verifyPreparingRenameRefactoringDto() { verify(createRenameRefactoringDto).setRefactorLightweight(false); - verify(createRenameRefactoringDto).setPath(anyString()); + verify(createRenameRefactoringDto).setPath(nullable(String.class)); verify(createRenameRefactoringDto).setType(COMPILATION_UNIT); verify(createRenameRefactoringDto).setProjectPath(eq("/project")); } @@ -545,7 +548,10 @@ public void changesShouldNotBeAppliedAndShowNotificationMessage() throws Excepti verify(promiseError).getMessage(); verify(notificationManager) .notify( - anyString(), anyString(), any(StatusNotification.Status.class), any(DisplayMode.class)); + nullable(String.class), + nullable(String.class), + any(StatusNotification.Status.class), + any(DisplayMode.class)); } @Test @@ -677,7 +683,10 @@ public void previewPageIsNotReadyAndShowNotificationMessage() throws Exception { verify(promiseError).getMessage(); verify(notificationManager) .notify( - anyString(), anyString(), any(StatusNotification.Status.class), any(DisplayMode.class)); + nullable(String.class), + nullable(String.class), + any(StatusNotification.Status.class), + any(DisplayMode.class)); } @Test @@ -703,7 +712,7 @@ public void previewPageShouldBeShow() throws Exception { verify(view).hide(); verify(previewPresenter).show(SESSION_ID, refactorInfo); - verify(previewPresenter).setTitle(anyString()); + verify(previewPresenter).setTitle(nullable(String.class)); } @Test @@ -718,10 +727,10 @@ public void warningDialogShouldBeDisplayedWhenRefactoringPerformsWithWarning() when(refactoringStatus.getEntries()).thenReturn(entries); when(refactoringStatus.getSeverity()).thenReturn(2); when(dialogFactory.createConfirmDialog( - anyString(), - anyString(), - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), + nullable(String.class), + nullable(String.class), Matchers.anyObject(), Matchers.anyObject())) .thenReturn(dialog); @@ -732,10 +741,10 @@ public void warningDialogShouldBeDisplayedWhenRefactoringPerformsWithWarning() verify(dialogFactory) .createConfirmDialog( - anyString(), - anyString(), - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), + nullable(String.class), + nullable(String.class), Matchers.anyObject(), Matchers.anyObject()); verify(dialog).show(); @@ -781,7 +790,7 @@ private void verifyPreparingRenameSettingsDto() { verify(view).isUpdateReferences(); verify(renameSettings).setUpdateQualifiedNames(true); verify(view, times(2)).isUpdateQualifiedNames(); - verify(renameSettings).setFilePatterns(anyString()); + verify(renameSettings).setFilePatterns(nullable(String.class)); verify(renameSettings).setUpdateTextualMatches(anyBoolean()); verify(view).isUpdateTextualOccurrences(); verify(renameSettings).setUpdateSimilarDeclarations(true); diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenterTest.java index 3cf3a6f0fcc..867e382af10 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenterTest.java @@ -32,6 +32,7 @@ import static org.eclipse.che.ide.ext.java.client.settings.compiler.ErrorWarningsOptions.USAGE_OF_RAW_TYPE; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -224,7 +225,7 @@ public void propertiesShouldBeDisplayed() throws Exception { operationCaptor.getValue().apply(getAllProperties()); verify(propertyFactory, times(18)).create(Matchers.anyObject()); - verify(widget, times(18)).selectPropertyValue(anyString()); + verify(widget, times(18)).selectPropertyValue(nullable(String.class)); verify(widget, times(18)).setDelegate(presenter); verify(view, times(18)).addProperty(widget); } @@ -244,6 +245,6 @@ public void propertiesShouldBeDisplayedFailed() throws OperationException { errorOperationCaptor.getValue().apply(promiseError); verify(preferencesManager).loadPreferences(); - verify(notificationManager).notify(anyString(), eq(FAIL), eq(FLOAT_MODE)); + verify(notificationManager).notify(nullable(String.class), eq(FAIL), eq(FLOAT_MODE)); } } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml index d5550ffda84..c3e06fb7f38 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-java-ext-lang-server Che Plugin :: Java :: Extension Java Server diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml index a11fc674b8e..b91b94ed8b9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-java-ext-lang-shared Che Plugin :: Java :: Extension Java Shared diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml index 1d0c7e4abab..7ddf88d13aa 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-plain org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-java-plain-ide jar diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml index 948c313c53e..ad32d8f826d 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-plain org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-java-plain-server Che Plugin :: Java :: Plain :: Server diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml index 7246a56583a..787286a4498 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-plain org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-java-plain-shared Che Plugin :: Java :: Plain :: Shared diff --git a/plugins/plugin-java/che-plugin-java-plain/pom.xml b/plugins/plugin-java/che-plugin-java-plain/pom.xml index b0b491aa444..c3521161283 100644 --- a/plugins/plugin-java/che-plugin-java-plain/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-java-plain diff --git a/plugins/plugin-java/pom.xml b/plugins/plugin-java/pom.xml index 404b10c58dd..4202d8da096 100644 --- a/plugins/plugin-java/pom.xml +++ b/plugins/plugin-java/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-java-parent diff --git a/plugins/plugin-json/che-plugin-json-server/pom.xml b/plugins/plugin-json/che-plugin-json-server/pom.xml index 05adea923e2..d03cc57e4ae 100644 --- a/plugins/plugin-json/che-plugin-json-server/pom.xml +++ b/plugins/plugin-json/che-plugin-json-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-json-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-json-server Che Plugin :: JSON :: Extension Server diff --git a/plugins/plugin-json/pom.xml b/plugins/plugin-json/pom.xml index 560c4a0db65..27eb2318913 100644 --- a/plugins/plugin-json/pom.xml +++ b/plugins/plugin-json/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-json-parent diff --git a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml index 6026de03e4c..8b27cadaecb 100644 --- a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml +++ b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-keybinding-eclipse-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-keybinding-eclipse-ide diff --git a/plugins/plugin-keybinding-eclipse/pom.xml b/plugins/plugin-keybinding-eclipse/pom.xml index b40061fd418..f6648e44885 100644 --- a/plugins/plugin-keybinding-eclipse/pom.xml +++ b/plugins/plugin-keybinding-eclipse/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-keybinding-eclipse-parent diff --git a/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml b/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml index 23671a1117b..5890d4e379b 100644 --- a/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml +++ b/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-languageserver-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT .. che-plugin-languageserver-ide diff --git a/plugins/plugin-languageserver/che-plugin-test-ls/pom.xml b/plugins/plugin-languageserver/che-plugin-test-ls/pom.xml index 1b7fa985514..54eb2706958 100644 --- a/plugins/plugin-languageserver/che-plugin-test-ls/pom.xml +++ b/plugins/plugin-languageserver/che-plugin-test-ls/pom.xml @@ -16,7 +16,7 @@ che-plugin-languageserver-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-test-ls-server Che Plugin :: TEST LS :: Extension Server diff --git a/plugins/plugin-languageserver/pom.xml b/plugins/plugin-languageserver/pom.xml index ac86c4a048e..dd261e0faa2 100644 --- a/plugins/plugin-languageserver/pom.xml +++ b/plugins/plugin-languageserver/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-languageserver-parent diff --git a/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml b/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml index a86a1dcf129..a3afea4748f 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-machine-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-machine-ext-server diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml index 43b10830607..61dd4ce6777 100644 --- a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-machine-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-machine-ssh-client jar diff --git a/plugins/plugin-machine/pom.xml b/plugins/plugin-machine/pom.xml index 484addd7bc4..c11541262f5 100644 --- a/plugins/plugin-machine/pom.xml +++ b/plugins/plugin-machine/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-machine-parent diff --git a/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml b/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml index 78cf71e2649..1ece68941a1 100644 --- a/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-maven-generator-archetype jar diff --git a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml index 0278d30353f..31bf44251c0 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-maven-ide Che Plugin :: Maven :: Extension Maven Client diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenterTest.java b/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenterTest.java index 017f3d168fe..50ba1558005 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenterTest.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenterTest.java @@ -83,8 +83,6 @@ public void setUp() throws Exception { when(containerPromise.then(Matchers.>>anyObject())) .thenReturn(containerPromise); - when(containerPromise.catchError(Matchers.>anyObject())) - .thenReturn(containerPromise); } @Test diff --git a/plugins/plugin-maven/che-plugin-maven-server/pom.xml b/plugins/plugin-maven/che-plugin-maven-server/pom.xml index 44bad199917..b64cedd4f6f 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-maven-server jar diff --git a/plugins/plugin-maven/che-plugin-maven-shared/pom.xml b/plugins/plugin-maven/che-plugin-maven-shared/pom.xml index 8920453ce81..1f1b9a2826f 100644 --- a/plugins/plugin-maven/che-plugin-maven-shared/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-maven-shared Che Plugin :: Maven :: Extension Maven Shared diff --git a/plugins/plugin-maven/che-plugin-maven-tools/pom.xml b/plugins/plugin-maven/che-plugin-maven-tools/pom.xml index 56327ea892d..7927ea97712 100644 --- a/plugins/plugin-maven/che-plugin-maven-tools/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-tools/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-java-maven-tools jar diff --git a/plugins/plugin-maven/maven-server/maven-server-api/pom.xml b/plugins/plugin-maven/maven-server/maven-server-api/pom.xml index 8d1750e0b01..6d1abf1cf2d 100644 --- a/plugins/plugin-maven/maven-server/maven-server-api/pom.xml +++ b/plugins/plugin-maven/maven-server/maven-server-api/pom.xml @@ -16,7 +16,7 @@ che-maven-server org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT maven-server-api jar diff --git a/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml b/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml index fae69f9fe5d..7c4c5a0b91f 100644 --- a/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml +++ b/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml @@ -16,7 +16,7 @@ che-maven-server org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT maven-server-impl jar diff --git a/plugins/plugin-maven/maven-server/pom.xml b/plugins/plugin-maven/maven-server/pom.xml index 644b2a5d5d8..99b3163584e 100644 --- a/plugins/plugin-maven/maven-server/pom.xml +++ b/plugins/plugin-maven/maven-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-maven-server pom diff --git a/plugins/plugin-maven/pom.xml b/plugins/plugin-maven/pom.xml index 9f7708b2f0c..3cdb97e991a 100644 --- a/plugins/plugin-maven/pom.xml +++ b/plugins/plugin-maven/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-maven-parent diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml index 9da57b2fba2..ac7b95d76ef 100644 --- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml +++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-debugger-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-nodejs-debugger-ide jar diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/test/java/org/eclipse/che/plugin/nodejsdbg/ide/configuration/NodeJsDebuggerConfigurationPagePresenterTest.java b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/test/java/org/eclipse/che/plugin/nodejsdbg/ide/configuration/NodeJsDebuggerConfigurationPagePresenterTest.java index 9fd27ab08e3..513ae3a6191 100644 --- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/test/java/org/eclipse/che/plugin/nodejsdbg/ide/configuration/NodeJsDebuggerConfigurationPagePresenterTest.java +++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/test/java/org/eclipse/che/plugin/nodejsdbg/ide/configuration/NodeJsDebuggerConfigurationPagePresenterTest.java @@ -12,7 +12,7 @@ import static org.eclipse.che.plugin.nodejsdbg.ide.NodeJsDebugger.ConnectionProperties.SCRIPT; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -50,9 +50,6 @@ public class NodeJsDebuggerConfigurationPagePresenterTest { @Before public void setUp() { - when(configuration.getHost()).thenReturn(HOST); - when(configuration.getPort()).thenReturn(PORT); - pagePresenter.resetFrom(configuration); } @@ -70,7 +67,7 @@ public void testGo() throws Exception { verify(container).setWidget(eq(pageView)); verify(configuration, atLeastOnce()).getConnectionProperties(); - verify(pageView).setScriptPath(anyString()); + verify(pageView).setScriptPath(nullable(String.class)); } @Test diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml index 4b5a99fbe2d..d52ccc65046 100644 --- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml +++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-debugger-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-nodejs-debugger-server jar @@ -69,7 +69,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/plugins/plugin-nodejs-debugger/pom.xml b/plugins/plugin-nodejs-debugger/pom.xml index aa5f731cf39..b4f0512b812 100644 --- a/plugins/plugin-nodejs-debugger/pom.xml +++ b/plugins/plugin-nodejs-debugger/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-nodejs-debugger-parent pom diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml index 502a368c0b9..a3cbb2f721b 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-nodejs-lang-ide jar diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-server/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-server/pom.xml index c7ce09778f3..e436dba81ca 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-server/pom.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-nodejs-lang-server Che Plugin :: NodeJs :: Extension Server diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml index 13501359b17..7ebe9e6bed2 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-nodejs-lang-shared Che Plugin :: NodeJs :: Extension Shared diff --git a/plugins/plugin-nodejs/pom.xml b/plugins/plugin-nodejs/pom.xml index 996183e87a3..4fe88b351fe 100644 --- a/plugins/plugin-nodejs/pom.xml +++ b/plugins/plugin-nodejs/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-nodejs-parent diff --git a/plugins/plugin-orion/che-plugin-orion-compare/pom.xml b/plugins/plugin-orion/che-plugin-orion-compare/pom.xml index 0c6213c135c..eae5a671fee 100644 --- a/plugins/plugin-orion/che-plugin-orion-compare/pom.xml +++ b/plugins/plugin-orion/che-plugin-orion-compare/pom.xml @@ -16,7 +16,7 @@ che-plugin-orion-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-orion-compare jar diff --git a/plugins/plugin-orion/che-plugin-orion-editor/pom.xml b/plugins/plugin-orion/che-plugin-orion-editor/pom.xml index 376dc774843..b87f9b07872 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/pom.xml +++ b/plugins/plugin-orion/che-plugin-orion-editor/pom.xml @@ -16,7 +16,7 @@ che-plugin-orion-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-orion-editor diff --git a/plugins/plugin-orion/pom.xml b/plugins/plugin-orion/pom.xml index d36735cbbd8..0d6a2231534 100644 --- a/plugins/plugin-orion/pom.xml +++ b/plugins/plugin-orion/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-orion-parent diff --git a/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml b/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml index ab337eb8fd3..34d84ff73ca 100644 --- a/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml +++ b/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-php-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-php-lang-ide jar diff --git a/plugins/plugin-php/che-plugin-php-lang-server/pom.xml b/plugins/plugin-php/che-plugin-php-lang-server/pom.xml index 7990c18f0e7..1e04242f931 100644 --- a/plugins/plugin-php/che-plugin-php-lang-server/pom.xml +++ b/plugins/plugin-php/che-plugin-php-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-php-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-php-lang-server Che Plugin :: PHP :: Extension Server diff --git a/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml b/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml index 84d867d046a..5188185583c 100644 --- a/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml +++ b/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-php-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-php-lang-shared Che Plugin :: PHP :: Shared diff --git a/plugins/plugin-php/pom.xml b/plugins/plugin-php/pom.xml index 5f12542da42..9db525f0b36 100644 --- a/plugins/plugin-php/pom.xml +++ b/plugins/plugin-php/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-php-parent diff --git a/plugins/plugin-product-info/pom.xml b/plugins/plugin-product-info/pom.xml index 55fde740a41..ae75d726838 100644 --- a/plugins/plugin-product-info/pom.xml +++ b/plugins/plugin-product-info/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-product-info diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml index 5a51b0a3b91..a3b47df8ed2 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml +++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-pullrequest-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-pullrequest-ide Che Plugin :: Pull request :: IDE diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml index eec5461587e..95030bdc44f 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml +++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-pullrequest-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-pullrequest-server Che Plugin :: Pull request :: Server @@ -74,7 +74,7 @@ test - mockito-all + mockito-core org.mockito diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml index 663d0f99155..0b3e38d8746 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml +++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-pullrequest-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-pullrequest-shared Che Plugin :: Pull request :: Shared diff --git a/plugins/plugin-pullrequest-parent/pom.xml b/plugins/plugin-pullrequest-parent/pom.xml index 16c2f388140..d2a29df29c8 100644 --- a/plugins/plugin-pullrequest-parent/pom.xml +++ b/plugins/plugin-pullrequest-parent/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-pullrequest-parent pom diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml index 774ea66b94c..6e36076d13a 100644 --- a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-python-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-python-lang-ide jar diff --git a/plugins/plugin-python/che-plugin-python-lang-server/pom.xml b/plugins/plugin-python/che-plugin-python-lang-server/pom.xml index 677628feac9..cda4c466376 100644 --- a/plugins/plugin-python/che-plugin-python-lang-server/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-python-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-python-lang-server Che Plugin :: Python :: Extension Server diff --git a/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml b/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml index 9b7dacaba5d..3ac0e29c307 100644 --- a/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-python-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-python-lang-shared che-plugin-python-lang-shared diff --git a/plugins/plugin-python/pom.xml b/plugins/plugin-python/pom.xml index a53a2299430..96f9fa1a001 100644 --- a/plugins/plugin-python/pom.xml +++ b/plugins/plugin-python/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-python-parent diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml index e70ea1d360b..7d4ae134df7 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml +++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml @@ -16,7 +16,7 @@ che-plugin-sdk-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-sdk-ext-plugins jar diff --git a/plugins/plugin-sdk/che-plugin-sdk-tools/pom.xml b/plugins/plugin-sdk/che-plugin-sdk-tools/pom.xml index 98b7e10ef7f..8878ed7265e 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-tools/pom.xml +++ b/plugins/plugin-sdk/che-plugin-sdk-tools/pom.xml @@ -16,7 +16,7 @@ che-plugin-sdk-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-sdk-tools jar diff --git a/plugins/plugin-sdk/pom.xml b/plugins/plugin-sdk/pom.xml index 4e1a5cc0c20..9bcda584f36 100644 --- a/plugins/plugin-sdk/pom.xml +++ b/plugins/plugin-sdk/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-sdk-parent diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml b/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml index 5ad5d1fce5c..f6aba8126fe 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-svn-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-svn-ext-ide jar diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/test/java/org/eclipse/che/plugin/svn/ide/importer/SubversionProjectImporterPresenterTest.java b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/test/java/org/eclipse/che/plugin/svn/ide/importer/SubversionProjectImporterPresenterTest.java index 3f607066d1d..0f404651656 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/src/test/java/org/eclipse/che/plugin/svn/ide/importer/SubversionProjectImporterPresenterTest.java +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/src/test/java/org/eclipse/che/plugin/svn/ide/importer/SubversionProjectImporterPresenterTest.java @@ -10,8 +10,8 @@ */ package org.eclipse.che.plugin.svn.ide.importer; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -52,7 +52,6 @@ public class SubversionProjectImporterPresenterTest { */ @Before public void setUp() throws Exception { - when(sourceStorage.getParameters()).thenReturn(parameters); when(dataObject.getSource()).thenReturn(sourceStorage); when(view.getProjectRelativePath()).thenReturn(""); @@ -70,8 +69,6 @@ public void setUp() throws Exception { public void testEmptyProjectName() throws Exception { final String projectName = ""; - when(view.getProjectName()).thenReturn(projectName); - presenter.onProjectNameChanged(projectName); verify(dataObject).setName(eq(projectName)); @@ -89,8 +86,6 @@ public void testEmptyProjectName() throws Exception { public void testInvalidProjectName() throws Exception { final String projectName = "+subversion+"; - when(view.getProjectName()).thenReturn(projectName); - presenter.onProjectNameChanged(projectName); verify(dataObject).setName(eq(projectName)); @@ -108,8 +103,6 @@ public void testInvalidProjectName() throws Exception { public void testValidProjectName() throws Exception { final String projectName = "subversion"; - when(view.getProjectName()).thenReturn(projectName); - presenter.onProjectNameChanged(projectName); verify(dataObject).setName(eq(projectName)); @@ -165,8 +158,6 @@ public void testValidProjectUrl() throws Exception { public void testProjectDescription() throws Exception { final String description = "Some description."; - when(view.getProjectDescription()).thenReturn(description); - presenter.onProjectDescriptionChanged(description); verify(dataObject).setDescription(eq(description)); @@ -183,14 +174,12 @@ public void testGo() throws Exception { final AcceptsOneWidget container = mock(AcceptsOneWidget.class); final ProjectImporterDescriptor projectImporter = mock(ProjectImporterDescriptor.class); - when(projectImporter.getDescription()).thenReturn(importerDescription); - presenter.go(container); verify(container).setWidget(eq(view)); - verify(view).setProjectName(anyString()); - verify(view).setProjectDescription(anyString()); - verify(view).setProjectUrl(anyString()); + verify(view).setProjectName(nullable(String.class)); + verify(view).setProjectDescription(nullable(String.class)); + verify(view).setProjectUrl(nullable(String.class)); verify(view).setInputsEnableState(eq(true)); } } diff --git a/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml b/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml index 5df44907ff3..04d6cd702b3 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml +++ b/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-svn-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-svn-ext-server jar diff --git a/plugins/plugin-svn/che-plugin-svn-ext-server/src/test/java/org/eclipse/che/plugin/svn/server/SubversionProjectImporterTest.java b/plugins/plugin-svn/che-plugin-svn-ext-server/src/test/java/org/eclipse/che/plugin/svn/server/SubversionProjectImporterTest.java index 120ba5379b0..ff67b564e3a 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-server/src/test/java/org/eclipse/che/plugin/svn/server/SubversionProjectImporterTest.java +++ b/plugins/plugin-svn/che-plugin-svn-ext-server/src/test/java/org/eclipse/che/plugin/svn/server/SubversionProjectImporterTest.java @@ -80,9 +80,6 @@ protected void configure() { VirtualFileSystem virtualFileSystem = TestUtils.createVirtualFileSystem(); root = virtualFileSystem.getRoot(); - // Create the test user - TestUtils.createTestUser(userProfileDao); - // Create the Subversion repository repoRoot = TestUtils.createGreekTreeRepository(); diff --git a/plugins/plugin-svn/che-plugin-svn-ext-shared/pom.xml b/plugins/plugin-svn/che-plugin-svn-ext-shared/pom.xml index 72ebc601cfb..30358b22514 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-shared/pom.xml +++ b/plugins/plugin-svn/che-plugin-svn-ext-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-svn-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-svn-ext-shared jar diff --git a/plugins/plugin-svn/pom.xml b/plugins/plugin-svn/pom.xml index a812ab34ad1..9888160a02b 100644 --- a/plugins/plugin-svn/pom.xml +++ b/plugins/plugin-svn/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-svn-parent diff --git a/plugins/plugin-testing-java/plugin-testing-classpath/pom.xml b/plugins/plugin-testing-java/plugin-testing-classpath/pom.xml index 898390c257c..268d245701c 100644 --- a/plugins/plugin-testing-java/plugin-testing-classpath/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-classpath/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-java-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-classpath Che Plugin :: Java Testing :: Classpath diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml index 92d53509e68..d860a6fb92d 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-junit org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-junit-ide Che Plugin :: Java Testing :: JUnit IDE diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/pom.xml index 9e88613383f..54f7cb1caea 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-junit org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-junit-runtime Che Plugin :: Java Testing :: JUnit Runtime diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/pom.xml index 30fbb9b957b..1dd097b1720 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-junit org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-junit-server Che Plugin :: Java Testing :: JUnit Server diff --git a/plugins/plugin-testing-java/plugin-testing-junit/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/pom.xml index c6bc891ddd0..b9b9d9197bc 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-junit/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-java-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-junit pom diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml index b8d731d4344..c0ceb7bfcf6 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-testng org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-testng-ide Che Plugin :: Java Testing :: TestNG IDE diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-runtime/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-runtime/pom.xml index 1978bd73105..b4b518e6837 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-runtime/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-runtime/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-testng org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-testng-runtime Che Plugin :: Java Testing :: TestNG Runtime diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/pom.xml index dc11679b573..4851547d312 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-testng org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-testng-server Che Plugin :: Java Testing :: TestNG Server diff --git a/plugins/plugin-testing-java/plugin-testing-testng/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/pom.xml index 729eabdd3c2..eb5b66c5de0 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-java-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-testng pom diff --git a/plugins/plugin-testing-java/pom.xml b/plugins/plugin-testing-java/pom.xml index 5f475dbde14..e298c22ed9b 100644 --- a/plugins/plugin-testing-java/pom.xml +++ b/plugins/plugin-testing-java/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-java-parent pom diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml index d0e0b857087..7dde4bc717e 100644 --- a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml +++ b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-phpunit org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-phpunit-ide Che Plugin :: PHP Testing :: PHPUnit IDE diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-server/pom.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-server/pom.xml index 1b10f9abedb..1eccaa7c9e5 100644 --- a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-server/pom.xml +++ b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-phpunit org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-phpunit-server Che Plugin :: PHP Testing :: PHPUnit Server diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/pom.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/pom.xml index e2ab629452c..b6725371d8f 100644 --- a/plugins/plugin-testing-php/plugin-testing-phpunit/pom.xml +++ b/plugins/plugin-testing-php/plugin-testing-phpunit/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-php-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-phpunit pom diff --git a/plugins/plugin-testing-php/pom.xml b/plugins/plugin-testing-php/pom.xml index e8238178b19..f7524b68d18 100644 --- a/plugins/plugin-testing-php/pom.xml +++ b/plugins/plugin-testing-php/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-php-parent pom diff --git a/plugins/plugin-testing/che-plugin-testing-ide/pom.xml b/plugins/plugin-testing/che-plugin-testing-ide/pom.xml index ae4bee269e3..bda2708cc48 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/pom.xml +++ b/plugins/plugin-testing/che-plugin-testing-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-ide Che Plugin :: Testing :: IDE diff --git a/plugins/plugin-testing/pom.xml b/plugins/plugin-testing/pom.xml index d97125bd5de..3aefe888169 100644 --- a/plugins/plugin-testing/pom.xml +++ b/plugins/plugin-testing/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-testing-parent pom diff --git a/plugins/plugin-traefik/plugin-traefik-docker/pom.xml b/plugins/plugin-traefik/plugin-traefik-docker/pom.xml index 1bb8d09b06e..193ecf4d554 100644 --- a/plugins/plugin-traefik/plugin-traefik-docker/pom.xml +++ b/plugins/plugin-traefik/plugin-traefik-docker/pom.xml @@ -16,7 +16,7 @@ che-plugin-traefik-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-traefik-docker jar @@ -52,7 +52,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/plugins/plugin-traefik/pom.xml b/plugins/plugin-traefik/pom.xml index 8bd282a76ff..7cdf4011ca8 100644 --- a/plugins/plugin-traefik/pom.xml +++ b/plugins/plugin-traefik/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-traefik-parent diff --git a/plugins/plugin-urlfactory/pom.xml b/plugins/plugin-urlfactory/pom.xml index 2b51b1de44e..63d03d1dd39 100644 --- a/plugins/plugin-urlfactory/pom.xml +++ b/plugins/plugin-urlfactory/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-url-factory diff --git a/plugins/plugin-web/che-plugin-web-ext-server/pom.xml b/plugins/plugin-web/che-plugin-web-ext-server/pom.xml index eadd2e7197d..700f7c151f9 100644 --- a/plugins/plugin-web/che-plugin-web-ext-server/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-web-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-web-ext-server diff --git a/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml b/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml index babca06de3f..8c4a0f18143 100644 --- a/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-web-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-web-ext-shared diff --git a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml index 2522fba0a85..406a6b5f6cd 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml @@ -16,7 +16,7 @@ che-plugin-web-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-web-ext-web jar diff --git a/plugins/plugin-web/pom.xml b/plugins/plugin-web/pom.xml index 861e22c6d58..ddf1485a117 100644 --- a/plugins/plugin-web/pom.xml +++ b/plugins/plugin-web/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-web-parent diff --git a/plugins/plugin-yaml/che-plugin-yaml-ide/pom.xml b/plugins/plugin-yaml/che-plugin-yaml-ide/pom.xml index 58bbe3d031b..786def2e958 100644 --- a/plugins/plugin-yaml/che-plugin-yaml-ide/pom.xml +++ b/plugins/plugin-yaml/che-plugin-yaml-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-yaml-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-yaml-ide jar diff --git a/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml b/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml index 663df27903f..e33fc09bd8c 100644 --- a/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml +++ b/plugins/plugin-yaml/che-plugin-yaml-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-yaml-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-yaml-server Che Plugin :: Yaml :: Server diff --git a/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml b/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml index f900bf6601d..c0fa4775fec 100644 --- a/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml +++ b/plugins/plugin-yaml/che-plugin-yaml-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-yaml-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-yaml-shared jar diff --git a/plugins/plugin-yaml/pom.xml b/plugins/plugin-yaml/pom.xml index 43a65ebc721..858a6599e41 100644 --- a/plugins/plugin-yaml/pom.xml +++ b/plugins/plugin-yaml/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-yaml-parent diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml index b661c47567e..387948db689 100644 --- a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml +++ b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml @@ -13,7 +13,7 @@ che-plugin-zend-debugger-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-zend-debugger-ide jar diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml index f4910898b8c..652db486743 100644 --- a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml +++ b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml @@ -13,7 +13,7 @@ che-plugin-zend-debugger-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-plugin-zend-debugger-server jar diff --git a/plugins/plugin-zend-debugger/pom.xml b/plugins/plugin-zend-debugger/pom.xml index f1d294989bd..fcca811b83c 100644 --- a/plugins/plugin-zend-debugger/pom.xml +++ b/plugins/plugin-zend-debugger/pom.xml @@ -13,7 +13,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-plugin-zend-debugger-parent diff --git a/plugins/pom.xml b/plugins/pom.xml index 364e57af4e9..fd9fa0ec0ff 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml org.eclipse.che.plugin che-plugin-parent - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT pom Che Plugin :: Parent diff --git a/pom.xml b/pom.xml index 25f4afbf6fa..bf9dcc5c1f3 100644 --- a/pom.xml +++ b/pom.xml @@ -16,11 +16,11 @@ maven-depmgt-pom org.eclipse.che.depmgt - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.che che-parent - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT pom Che Parent @@ -46,10 +46,9 @@ https://github.com/eclipse/che - 5.19.0-SNAPSHOT - 5.19.0-SNAPSHOT - 5.19.0-SNAPSHOT - 1.7.1 + 5.20.0-SNAPSHOT + 5.20.0-SNAPSHOT + 5.20.0-SNAPSHOT 1.0-beta2 @@ -59,11 +58,6 @@ jsr305 ${version.jsr305.plugin} - - io.jsonwebtoken - jjwt - 0.7.0 - org.apache.tomcat tomcat-catalina diff --git a/samples/pom.xml b/samples/pom.xml index d52629f9c71..7a6845be752 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml org.eclipse.che.sample che-sample-parent - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT pom Che Sample :: Parent diff --git a/samples/sample-plugin-actions/che-sample-plugin-actions-ide/pom.xml b/samples/sample-plugin-actions/che-sample-plugin-actions-ide/pom.xml index 216718467a1..26f7030a67b 100644 --- a/samples/sample-plugin-actions/che-sample-plugin-actions-ide/pom.xml +++ b/samples/sample-plugin-actions/che-sample-plugin-actions-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-actions-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-actions-ide jar diff --git a/samples/sample-plugin-actions/pom.xml b/samples/sample-plugin-actions/pom.xml index a41fcae8c7b..81b1b0e925b 100644 --- a/samples/sample-plugin-actions/pom.xml +++ b/samples/sample-plugin-actions/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-sample-plugin-actions-parent diff --git a/samples/sample-plugin-embedjs/che-sample-plugin-embedjs-ide/pom.xml b/samples/sample-plugin-embedjs/che-sample-plugin-embedjs-ide/pom.xml index 2b30cd4537d..4074cffcfde 100644 --- a/samples/sample-plugin-embedjs/che-sample-plugin-embedjs-ide/pom.xml +++ b/samples/sample-plugin-embedjs/che-sample-plugin-embedjs-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-embedjs-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-embedjs-ide jar diff --git a/samples/sample-plugin-embedjs/pom.xml b/samples/sample-plugin-embedjs/pom.xml index c8cdc8fc29c..d8f486900fe 100644 --- a/samples/sample-plugin-embedjs/pom.xml +++ b/samples/sample-plugin-embedjs/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-sample-plugin-embedjs-parent diff --git a/samples/sample-plugin-filetype/che-sample-plugin-filetype-ide/pom.xml b/samples/sample-plugin-filetype/che-sample-plugin-filetype-ide/pom.xml index 0a0b65ab15f..2d92f1c56ef 100644 --- a/samples/sample-plugin-filetype/che-sample-plugin-filetype-ide/pom.xml +++ b/samples/sample-plugin-filetype/che-sample-plugin-filetype-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-filetype-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-filetype-ide jar diff --git a/samples/sample-plugin-filetype/pom.xml b/samples/sample-plugin-filetype/pom.xml index 58c029fa013..4df9ef0d675 100644 --- a/samples/sample-plugin-filetype/pom.xml +++ b/samples/sample-plugin-filetype/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-sample-plugin-filetype-parent diff --git a/samples/sample-plugin-json/che-sample-plugin-json-ide/pom.xml b/samples/sample-plugin-json/che-sample-plugin-json-ide/pom.xml index 22beea48fb3..df70c7e608d 100644 --- a/samples/sample-plugin-json/che-sample-plugin-json-ide/pom.xml +++ b/samples/sample-plugin-json/che-sample-plugin-json-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-json-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-json-ide jar diff --git a/samples/sample-plugin-json/che-sample-plugin-json-server/pom.xml b/samples/sample-plugin-json/che-sample-plugin-json-server/pom.xml index b99297fb9d6..79f941d3d98 100644 --- a/samples/sample-plugin-json/che-sample-plugin-json-server/pom.xml +++ b/samples/sample-plugin-json/che-sample-plugin-json-server/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-json-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-json-server Che Sample :: Plugin JSON :: Server diff --git a/samples/sample-plugin-json/che-sample-plugin-json-shared/pom.xml b/samples/sample-plugin-json/che-sample-plugin-json-shared/pom.xml index 0cf3e6aca86..0f9e1cc91a2 100644 --- a/samples/sample-plugin-json/che-sample-plugin-json-shared/pom.xml +++ b/samples/sample-plugin-json/che-sample-plugin-json-shared/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-json-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-json-shared Che Sample :: Plugin JSON :: Shared diff --git a/samples/sample-plugin-json/pom.xml b/samples/sample-plugin-json/pom.xml index decb0415073..f7bd3ca77e2 100644 --- a/samples/sample-plugin-json/pom.xml +++ b/samples/sample-plugin-json/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-sample-plugin-json-parent diff --git a/samples/sample-plugin-nativeaccess/che-sample-plugin-nativeaccess-ide/pom.xml b/samples/sample-plugin-nativeaccess/che-sample-plugin-nativeaccess-ide/pom.xml index 39507fb199d..3a249936b34 100644 --- a/samples/sample-plugin-nativeaccess/che-sample-plugin-nativeaccess-ide/pom.xml +++ b/samples/sample-plugin-nativeaccess/che-sample-plugin-nativeaccess-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-nativeaccess-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-nativeaccess-ide jar diff --git a/samples/sample-plugin-nativeaccess/pom.xml b/samples/sample-plugin-nativeaccess/pom.xml index 70b0466dd52..02830f3077c 100644 --- a/samples/sample-plugin-nativeaccess/pom.xml +++ b/samples/sample-plugin-nativeaccess/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-sample-plugin-nativeaccess-parent diff --git a/samples/sample-plugin-parts/che-sample-plugin-parts-ide/pom.xml b/samples/sample-plugin-parts/che-sample-plugin-parts-ide/pom.xml index d7d8557b6e1..b43b3ede078 100644 --- a/samples/sample-plugin-parts/che-sample-plugin-parts-ide/pom.xml +++ b/samples/sample-plugin-parts/che-sample-plugin-parts-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-parts-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-parts-ide jar diff --git a/samples/sample-plugin-parts/pom.xml b/samples/sample-plugin-parts/pom.xml index 8d8fe3c56e1..f439587f601 100644 --- a/samples/sample-plugin-parts/pom.xml +++ b/samples/sample-plugin-parts/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-sample-plugin-parts-parent diff --git a/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-ide/pom.xml b/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-ide/pom.xml index 1bedcf21896..cefe12a23d8 100644 --- a/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-ide/pom.xml +++ b/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-serverservice-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-serverservice-ide jar diff --git a/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-server/pom.xml b/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-server/pom.xml index b1dc9bfb51d..f5f1ebdc596 100644 --- a/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-server/pom.xml +++ b/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-server/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-serverservice-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-serverservice-server Che Sample :: Plugin ServerService :: Server diff --git a/samples/sample-plugin-serverservice/pom.xml b/samples/sample-plugin-serverservice/pom.xml index 5f7cf731ae5..938fdec5ac6 100644 --- a/samples/sample-plugin-serverservice/pom.xml +++ b/samples/sample-plugin-serverservice/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-sample-plugin-serverservice-parent diff --git a/samples/sample-plugin-wizard/che-sample-plugin-wizard-ide/pom.xml b/samples/sample-plugin-wizard/che-sample-plugin-wizard-ide/pom.xml index 2a4494854d0..3db5b0cb68f 100644 --- a/samples/sample-plugin-wizard/che-sample-plugin-wizard-ide/pom.xml +++ b/samples/sample-plugin-wizard/che-sample-plugin-wizard-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-wizard-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-wizard-ide jar diff --git a/samples/sample-plugin-wizard/che-sample-plugin-wizard-server/pom.xml b/samples/sample-plugin-wizard/che-sample-plugin-wizard-server/pom.xml index e95aabd6d0f..93004fb9351 100644 --- a/samples/sample-plugin-wizard/che-sample-plugin-wizard-server/pom.xml +++ b/samples/sample-plugin-wizard/che-sample-plugin-wizard-server/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-wizard-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-wizard-server Che Sample :: Plugin Wizard :: Server diff --git a/samples/sample-plugin-wizard/che-sample-plugin-wizard-shared/pom.xml b/samples/sample-plugin-wizard/che-sample-plugin-wizard-shared/pom.xml index d491e092edc..e383d64ace2 100644 --- a/samples/sample-plugin-wizard/che-sample-plugin-wizard-shared/pom.xml +++ b/samples/sample-plugin-wizard/che-sample-plugin-wizard-shared/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-wizard-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-sample-plugin-wizard-shared Che Sample :: Plugin Wizard :: Shared diff --git a/samples/sample-plugin-wizard/pom.xml b/samples/sample-plugin-wizard/pom.xml index c7cd0a7ca1c..82de7e31673 100644 --- a/samples/sample-plugin-wizard/pom.xml +++ b/samples/sample-plugin-wizard/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml che-sample-plugin-wizard-parent diff --git a/selenium/che-selenium-core/pom.xml b/selenium/che-selenium-core/pom.xml index 87261d70ed8..1c6e45864de 100644 --- a/selenium/che-selenium-core/pom.xml +++ b/selenium/che-selenium-core/pom.xml @@ -16,7 +16,7 @@ che-selenium-parent org.eclipse.che.selenium - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-selenium-core jar diff --git a/selenium/che-selenium-test/pom.xml b/selenium/che-selenium-test/pom.xml index cbd21c56d1c..2d0511f21bb 100644 --- a/selenium/che-selenium-test/pom.xml +++ b/selenium/che-selenium-test/pom.xml @@ -16,7 +16,7 @@ che-selenium-parent org.eclipse.che.selenium - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-selenium-test jar @@ -203,7 +203,7 @@ org.mockito - mockito-all + mockito-core ${org.mockito.version} jar diff --git a/selenium/pom.xml b/selenium/pom.xml index 9e64a212efa..1f6a1709efe 100644 --- a/selenium/pom.xml +++ b/selenium/pom.xml @@ -16,7 +16,7 @@ che-parent org.eclipse.che - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.che.selenium che-selenium-parent diff --git a/wsagent/agent/pom.xml b/wsagent/agent/pom.xml index 61a4d4e053c..88fe5dc023c 100644 --- a/wsagent/agent/pom.xml +++ b/wsagent/agent/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT wsagent Workspace Agent @@ -66,11 +66,6 @@ che-core-commons-test test - - org.mockito - mockito-all - test - org.mockito mockito-core diff --git a/wsagent/che-core-api-debug-shared/pom.xml b/wsagent/che-core-api-debug-shared/pom.xml index 86cbb309160..457b2cdcb8e 100644 --- a/wsagent/che-core-api-debug-shared/pom.xml +++ b/wsagent/che-core-api-debug-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-debug-shared jar diff --git a/wsagent/che-core-api-debug/pom.xml b/wsagent/che-core-api-debug/pom.xml index df141e7db82..d525b2cad8c 100644 --- a/wsagent/che-core-api-debug/pom.xml +++ b/wsagent/che-core-api-debug/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-debug Che Core :: API :: Debug diff --git a/wsagent/che-core-api-git-shared/pom.xml b/wsagent/che-core-api-git-shared/pom.xml index 052cd8355f2..1bfcae2050e 100644 --- a/wsagent/che-core-api-git-shared/pom.xml +++ b/wsagent/che-core-api-git-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-git-shared jar diff --git a/wsagent/che-core-api-git/pom.xml b/wsagent/che-core-api-git/pom.xml index b4a474c5d3a..1440af189ca 100644 --- a/wsagent/che-core-api-git/pom.xml +++ b/wsagent/che-core-api-git/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-git jar diff --git a/wsagent/che-core-api-languageserver-maven-plugin/pom.xml b/wsagent/che-core-api-languageserver-maven-plugin/pom.xml index abf49321b18..5dcfcafe1dd 100644 --- a/wsagent/che-core-api-languageserver-maven-plugin/pom.xml +++ b/wsagent/che-core-api-languageserver-maven-plugin/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-languageserver-maven-plugin maven-plugin diff --git a/wsagent/che-core-api-languageserver-shared/pom.xml b/wsagent/che-core-api-languageserver-shared/pom.xml index 3efdb792de1..a9f0ce41ae4 100644 --- a/wsagent/che-core-api-languageserver-shared/pom.xml +++ b/wsagent/che-core-api-languageserver-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-languageserver-shared jar diff --git a/wsagent/che-core-api-languageserver/pom.xml b/wsagent/che-core-api-languageserver/pom.xml index eb1eb67c701..03a094fc236 100644 --- a/wsagent/che-core-api-languageserver/pom.xml +++ b/wsagent/che-core-api-languageserver/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-languageserver jar diff --git a/wsagent/che-core-api-oauth/pom.xml b/wsagent/che-core-api-oauth/pom.xml index fbea962ece9..927f9da7810 100644 --- a/wsagent/che-core-api-oauth/pom.xml +++ b/wsagent/che-core-api-oauth/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-oauth jar diff --git a/wsagent/che-core-api-project-shared/pom.xml b/wsagent/che-core-api-project-shared/pom.xml index c74367903be..d4f301e05d1 100644 --- a/wsagent/che-core-api-project-shared/pom.xml +++ b/wsagent/che-core-api-project-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-project-shared jar diff --git a/wsagent/che-core-api-project/pom.xml b/wsagent/che-core-api-project/pom.xml index 00204f025af..1c7add99d4d 100644 --- a/wsagent/che-core-api-project/pom.xml +++ b/wsagent/che-core-api-project/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-project jar @@ -105,7 +105,7 @@ org.eclipse.che.core che-core-api-project-shared - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.che.core diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/FSLuceneSearcherTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/FSLuceneSearcherTest.java index a538548faba..8b367d45626 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/FSLuceneSearcherTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/FSLuceneSearcherTest.java @@ -33,7 +33,6 @@ import org.eclipse.che.api.vfs.search.SearchResult; import org.eclipse.che.commons.lang.IoUtil; import org.eclipse.che.commons.lang.NameGenerator; -import org.mockito.ArgumentMatcher; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; @@ -388,12 +387,6 @@ private VirtualFileSystem virtualFileSystem() throws Exception { } private static VirtualFile withName(String name) { - return argThat( - new ArgumentMatcher() { - @Override - public boolean matches(Object argument) { - return name.equals(((VirtualFile) argument).getName()); - } - }); + return argThat(argument -> name.equals((argument).getName())); } } diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/MemoryLuceneSearcherTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/MemoryLuceneSearcherTest.java index 24ef59af8a0..41fa00b33f3 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/MemoryLuceneSearcherTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/MemoryLuceneSearcherTest.java @@ -33,7 +33,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.mockito.ArgumentMatcher; public class MemoryLuceneSearcherTest { private static final String[] TEST_CONTENT = { @@ -303,12 +302,6 @@ private VirtualFileSystem virtualFileSystem() throws Exception { } private static VirtualFile withName(String name) { - return argThat( - new ArgumentMatcher() { - @Override - public boolean matches(Object argument) { - return name.equals(((VirtualFile) argument).getName()); - } - }); + return argThat(argument -> name.equals((argument).getName())); } } diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherServiceTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherServiceTest.java index 08f146075bd..39eef178c2c 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherServiceTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherServiceTest.java @@ -17,6 +17,7 @@ import static org.apache.commons.io.FileUtils.write; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.Mockito.after; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; @@ -138,7 +139,7 @@ public void shouldWatchRegisteredFolderForFolderRemoval() throws Exception { public void shouldNotWatchUnRegisteredFolderForFileCreation() throws Exception { Path path = rootFolder.newFile(FILE_NAME).toPath(); - verify(handler, timeout(TIMEOUT_VALUE).never()).handle(path, ENTRY_CREATE); + verify(handler, after(TIMEOUT_VALUE).never()).handle(path, ENTRY_CREATE); } @Test @@ -169,14 +170,14 @@ public void shouldNotWatchUnRegisteredFolderForFileRemoval() throws Exception { boolean deleted = file.delete(); assertTrue(deleted); - verify(handler, timeout(TIMEOUT_VALUE).never()).handle(path, ENTRY_DELETE); + verify(handler, after(TIMEOUT_VALUE).never()).handle(path, ENTRY_DELETE); } @Test public void shouldNotWatchUnRegisteredFolderForDirectoryCreation() throws Exception { Path path = rootFolder.newFolder(FOLDER_NAME).toPath(); - verify(handler, timeout(TIMEOUT_VALUE).never()).handle(path, ENTRY_CREATE); + verify(handler, after(TIMEOUT_VALUE).never()).handle(path, ENTRY_CREATE); } @Test @@ -190,7 +191,7 @@ public void shouldNotWatchUnRegisteredFolderForFileModification() throws Excepti service.unRegister(rootFolder.getRoot().toPath()); write(file, ""); - verify(handler, timeout(TIMEOUT_VALUE).never()).handle(path, ENTRY_MODIFY); + verify(handler, after(TIMEOUT_VALUE).never()).handle(path, ENTRY_MODIFY); } @Test @@ -205,7 +206,7 @@ public void shouldNotWatchUnRegisteredFolderForFolderRemoval() throws Exception boolean deleted = file.delete(); assertTrue(deleted); - verify(handler, timeout(TIMEOUT_VALUE).never()).handle(path, ENTRY_DELETE); + verify(handler, after(TIMEOUT_VALUE).never()).handle(path, ENTRY_DELETE); } @Test @@ -234,7 +235,7 @@ public void shouldNotWatchTwiceRegisteredFolderForFileCreationAfterDoubleUnRegis Path path = rootFolder.newFile(FILE_NAME).toPath(); - verify(handler, timeout(TIMEOUT_VALUE).never()).handle(path, ENTRY_CREATE); + verify(handler, after(TIMEOUT_VALUE).never()).handle(path, ENTRY_CREATE); } @Test @@ -248,6 +249,6 @@ public void shouldNotWatchUnRegisteredFolderForFolderModification() throws Excep service.unRegister(rootFolder.getRoot().toPath()); createDirectory(path.resolve(FILE_NAME)); - verify(handler, timeout(TIMEOUT_VALUE).never()).handle(path, ENTRY_MODIFY); + verify(handler, after(TIMEOUT_VALUE).never()).handle(path, ENTRY_MODIFY); } } diff --git a/wsagent/che-core-api-testing-shared/pom.xml b/wsagent/che-core-api-testing-shared/pom.xml index 8a9ebd8db95..3cb870cf037 100644 --- a/wsagent/che-core-api-testing-shared/pom.xml +++ b/wsagent/che-core-api-testing-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-testing-shared Che Core :: API :: Testing Shared diff --git a/wsagent/che-core-api-testing/pom.xml b/wsagent/che-core-api-testing/pom.xml index 315131a1e6a..dd5de6bdccc 100644 --- a/wsagent/che-core-api-testing/pom.xml +++ b/wsagent/che-core-api-testing/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-testing Che Core :: API :: Testing diff --git a/wsagent/che-core-git-impl-jgit/pom.xml b/wsagent/che-core-git-impl-jgit/pom.xml index b8aa4d4ae0c..0b88ad23b58 100644 --- a/wsagent/che-core-git-impl-jgit/pom.xml +++ b/wsagent/che-core-git-impl-jgit/pom.xml @@ -17,7 +17,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-git-impl-jgit jar @@ -136,7 +136,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/wsagent/che-core-git-impl-jgit/src/test/java/org/eclipse/che/git/impl/jgit/JGitConnectionTest.java b/wsagent/che-core-git-impl-jgit/src/test/java/org/eclipse/che/git/impl/jgit/JGitConnectionTest.java index 24ce67cc0c2..9ed96d09435 100644 --- a/wsagent/che-core-git-impl-jgit/src/test/java/org/eclipse/che/git/impl/jgit/JGitConnectionTest.java +++ b/wsagent/che-core-git-impl-jgit/src/test/java/org/eclipse/che/git/impl/jgit/JGitConnectionTest.java @@ -12,6 +12,7 @@ package org.eclipse.che.git.impl.jgit; import static java.util.Collections.singletonList; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; @@ -277,7 +278,11 @@ public void shouldCloseCloneCommand() throws Exception { when(repository.getConfig()).thenReturn(mock(StoredConfig.class)); doReturn(cloneCommand) .when(jGitConnection) - .executeRemoteCommand(anyString(), anyObject(), anyString(), anyString()); + .executeRemoteCommand( + nullable(String.class), + nullable(TransportCommand.class), + nullable(String.class), + nullable(String.class)); //when jGitConnection.clone(CloneParams.create("url").withWorkingDir("fakePath")); diff --git a/wsagent/che-core-ssh-key-ide/pom.xml b/wsagent/che-core-ssh-key-ide/pom.xml index b959e258c34..bf04b1a0eea 100644 --- a/wsagent/che-core-ssh-key-ide/pom.xml +++ b/wsagent/che-core-ssh-key-ide/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.che.plugin che-plugin-ssh-key-ide diff --git a/wsagent/che-core-ssh-key-ide/src/test/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenterTest.java b/wsagent/che-core-ssh-key-ide/src/test/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenterTest.java index 32b0f23cba2..6c973de606d 100644 --- a/wsagent/che-core-ssh-key-ide/src/test/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenterTest.java +++ b/wsagent/che-core-ssh-key-ide/src/test/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenterTest.java @@ -13,6 +13,7 @@ import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; @@ -57,6 +58,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.ArgumentMatchers; import org.mockito.Captor; import org.mockito.InjectMocks; import org.mockito.Matchers; @@ -167,15 +169,18 @@ public void testOnDeleteClickedWhenDeleteKeyConfirmed() { when(constant.deleteSshKeyQuestion(anyString())).thenReturn(safeHtml); when(safeHtml.asString()).thenReturn(""); when(dialogFactory.createConfirmDialog( - anyString(), anyString(), (ConfirmCallback) anyObject(), (CancelCallback) anyObject())) + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), + nullable(CancelCallback.class))) .thenReturn(confirmDialog); presenter.onDeleteClicked(sshPairDto); verify(dialogFactory) .createConfirmDialog( - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), confirmCallbackCaptor.capture(), (CancelCallback) anyObject()); ConfirmCallback confirmCallback = confirmCallbackCaptor.getValue(); @@ -190,19 +195,22 @@ public void testOnDeleteClickedWhenDeleteKeyConfirmed() { public void testOnDeleteClickedWhenDeleteKeyCanceled() { SafeHtml safeHtml = mock(SafeHtml.class); ConfirmDialog confirmDialog = mock(ConfirmDialog.class); - when(constant.deleteSshKeyQuestion(anyString())).thenReturn(safeHtml); + when(constant.deleteSshKeyQuestion(nullable(String.class))).thenReturn(safeHtml); when(safeHtml.asString()).thenReturn(""); when(dialogFactory.createConfirmDialog( - anyString(), anyString(), (ConfirmCallback) anyObject(), (CancelCallback) anyObject())) + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), + nullable(CancelCallback.class))) .thenReturn(confirmDialog); presenter.onDeleteClicked(sshPairDto); verify(dialogFactory) .createConfirmDialog( - anyString(), - anyString(), - (ConfirmCallback) anyObject(), + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), cancelCallbackCaptor.capture()); CancelCallback cancelCallback = cancelCallbackCaptor.getValue(); cancelCallback.cancelled(); @@ -221,15 +229,18 @@ public void testOnDeleteClickedWhenDeleteKeyIsSuccess() throws OperationExceptio when(constant.deleteSshKeyQuestion(anyString())).thenReturn(safeHtml); when(safeHtml.asString()).thenReturn(""); when(dialogFactory.createConfirmDialog( - anyString(), anyString(), (ConfirmCallback) anyObject(), (CancelCallback) anyObject())) + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), + nullable(CancelCallback.class))) .thenReturn(confirmDialog); presenter.onDeleteClicked(sshPairDto); verify(dialogFactory) .createConfirmDialog( - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), confirmCallbackCaptor.capture(), (CancelCallback) anyObject()); ConfirmCallback confirmCallback = confirmCallbackCaptor.getValue(); @@ -253,15 +264,18 @@ public void testOnDeleteClickedWhenDeleteKeyIsFailure() throws OperationExceptio when(constant.deleteSshKeyQuestion(anyString())).thenReturn(safeHtml); when(safeHtml.asString()).thenReturn(""); when(dialogFactory.createConfirmDialog( - anyString(), anyString(), (ConfirmCallback) anyObject(), (CancelCallback) anyObject())) + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), + nullable(CancelCallback.class))) .thenReturn(confirmDialog); presenter.onDeleteClicked(sshPairDto); verify(dialogFactory) .createConfirmDialog( - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), confirmCallbackCaptor.capture(), (CancelCallback) anyObject()); ConfirmCallback confirmCallback = confirmCallbackCaptor.getValue(); @@ -287,17 +301,20 @@ public void testShouldRefreshKeysAfterSuccessfulDeleteKey() throws OperationExce when(constant.deleteSshKeyQuestion(anyString())).thenReturn(safeHtml); when(safeHtml.asString()).thenReturn(""); when(dialogFactory.createConfirmDialog( - anyString(), anyString(), (ConfirmCallback) anyObject(), (CancelCallback) anyObject())) + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), + nullable(CancelCallback.class))) .thenReturn(confirmDialog); presenter.onDeleteClicked(sshPairDto); verify(dialogFactory) .createConfirmDialog( - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), confirmCallbackCaptor.capture(), - (CancelCallback) anyObject()); + nullable(CancelCallback.class)); ConfirmCallback confirmCallback = confirmCallbackCaptor.getValue(); confirmCallback.accepted(); @@ -324,15 +341,18 @@ public void testFailedRefreshKeysAfterSuccessfulDeleteKey() throws OperationExce when(constant.deleteSshKeyQuestion(anyString())).thenReturn(safeHtml); when(safeHtml.asString()).thenReturn(""); when(dialogFactory.createConfirmDialog( - anyString(), anyString(), (ConfirmCallback) anyObject(), (CancelCallback) anyObject())) + nullable(String.class), + nullable(String.class), + nullable(ConfirmCallback.class), + nullable(CancelCallback.class))) .thenReturn(confirmDialog); presenter.onDeleteClicked(sshPairDto); verify(dialogFactory) .createConfirmDialog( - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), confirmCallbackCaptor.capture(), (CancelCallback) anyObject()); ConfirmCallback confirmCallback = confirmCallbackCaptor.getValue(); @@ -350,7 +370,10 @@ public void testFailedRefreshKeysAfterSuccessfulDeleteKey() throws OperationExce verify(service).getPairs(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); verify(view, never()).setPairs(eq(sshPairDtoArray)); verify(notificationManager) - .notify(anyString(), any(StatusNotification.Status.class), (DisplayMode) anyObject()); + .notify( + nullable(String.class), + any(StatusNotification.Status.class), + (DisplayMode) anyObject()); } @Test @@ -390,14 +413,20 @@ public void testFailedRefreshKeysAfterSuccessfulUploadKey() throws OperationExce @Test public void testOnGenerateClickedWhenUserConfirmGenerateKey() { when(dialogFactory.createInputDialog( - anyString(), anyString(), (InputCallback) anyObject(), (CancelCallback) anyObject())) + nullable(String.class), + nullable(String.class), + nullable(InputCallback.class), + nullable(CancelCallback.class))) .thenReturn(inputDialog); presenter.onGenerateClicked(); verify(dialogFactory) .createInputDialog( - anyString(), anyString(), inputCallbackCaptor.capture(), (CancelCallback) anyObject()); + nullable(String.class), + nullable(String.class), + inputCallbackCaptor.capture(), + (CancelCallback) anyObject()); InputCallback inputCallback = inputCallbackCaptor.getValue(); inputCallback.accepted(GITHUB_HOST); @@ -408,14 +437,20 @@ public void testOnGenerateClickedWhenUserConfirmGenerateKey() { @Test public void testOnGenerateClickedWhenUserCancelGenerateKey() { when(dialogFactory.createInputDialog( - anyString(), anyString(), (InputCallback) anyObject(), (CancelCallback) anyObject())) + nullable(String.class), + nullable(String.class), + nullable(InputCallback.class), + nullable(CancelCallback.class))) .thenReturn(inputDialog); presenter.onGenerateClicked(); verify(dialogFactory) .createInputDialog( - anyString(), anyString(), (InputCallback) anyObject(), cancelCallbackCaptor.capture()); + nullable(String.class), + nullable(String.class), + ArgumentMatchers.any(), + cancelCallbackCaptor.capture()); CancelCallback cancelCallback = cancelCallbackCaptor.getValue(); cancelCallback.cancelled(); @@ -426,14 +461,17 @@ public void testOnGenerateClickedWhenUserCancelGenerateKey() { @Test public void testOnGenerateClickedWhenGenerateKeyIsFailed() throws OperationException { when(dialogFactory.createInputDialog( - anyString(), anyString(), (InputCallback) anyObject(), (CancelCallback) anyObject())) + nullable(String.class), + nullable(String.class), + nullable(InputCallback.class), + nullable(CancelCallback.class))) .thenReturn(inputDialog); presenter.onGenerateClicked(); verify(dialogFactory) .createInputDialog( - anyString(), anyString(), + nullable(String.class), nullable(String.class), inputCallbackCaptor.capture(), cancelCallbackCaptor.capture()); InputCallback inputCallback = inputCallbackCaptor.getValue(); inputCallback.accepted(GITHUB_HOST); @@ -447,8 +485,8 @@ public void testOnGenerateClickedWhenGenerateKeyIsFailed() throws OperationExcep verify(view, never()).setPairs((List) anyObject()); verify(notificationManager) .notify( - anyString(), - anyString(), + nullable(String.class), + nullable(String.class), any(StatusNotification.Status.class), (DisplayMode) anyObject()); } @@ -457,14 +495,17 @@ public void testOnGenerateClickedWhenGenerateKeyIsFailed() throws OperationExcep public void testShouldRefreshKeysAfterSuccessfulGenerateKey() throws OperationException { List sshPairDtoArray = new ArrayList<>(); when(dialogFactory.createInputDialog( - anyString(), anyString(), (InputCallback) anyObject(), (CancelCallback) anyObject())) + nullable(String.class), + nullable(String.class), + nullable(InputCallback.class), + nullable(CancelCallback.class))) .thenReturn(inputDialog); presenter.onGenerateClicked(); verify(dialogFactory) .createInputDialog( - anyString(), anyString(), + nullable(String.class), nullable(String.class), inputCallbackCaptor.capture(), cancelCallbackCaptor.capture()); InputCallback inputCallback = inputCallbackCaptor.getValue(); inputCallback.accepted(GITHUB_HOST); diff --git a/wsagent/che-core-ssh-key-server/pom.xml b/wsagent/che-core-ssh-key-server/pom.xml index d80366e6bf8..d8a37b5186f 100644 --- a/wsagent/che-core-ssh-key-server/pom.xml +++ b/wsagent/che-core-ssh-key-server/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT org.eclipse.che.plugin che-plugin-ssh-key-server diff --git a/wsagent/che-wsagent-core/pom.xml b/wsagent/che-wsagent-core/pom.xml index 7be58cad03f..7d05caa90b5 100644 --- a/wsagent/che-wsagent-core/pom.xml +++ b/wsagent/che-wsagent-core/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-wsagent-core war diff --git a/wsagent/pom.xml b/wsagent/pom.xml index 359c9ecdef5..8818bf7de9d 100644 --- a/wsagent/pom.xml +++ b/wsagent/pom.xml @@ -16,12 +16,12 @@ che-core-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../core/pom.xml org.eclipse.che.core che-agent-parent - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT pom Che Agent Parent diff --git a/wsagent/wsagent-local/pom.xml b/wsagent/wsagent-local/pom.xml index 3179b41dc5d..2ed947a7bed 100644 --- a/wsagent/wsagent-local/pom.xml +++ b/wsagent/wsagent-local/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT wsagent-local Che Core :: API :: Agent @@ -69,7 +69,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/wsmaster/che-core-api-account/pom.xml b/wsmaster/che-core-api-account/pom.xml index deb148e6465..3c7eb303de3 100644 --- a/wsmaster/che-core-api-account/pom.xml +++ b/wsmaster/che-core-api-account/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-account Che Core :: API :: Account @@ -101,11 +101,6 @@ flyway-core test - - org.mockito - mockito-all - test - org.mockito mockito-core diff --git a/wsmaster/che-core-api-auth-shared/pom.xml b/wsmaster/che-core-api-auth-shared/pom.xml index 21a5912faab..25cc1dc3611 100644 --- a/wsmaster/che-core-api-auth-shared/pom.xml +++ b/wsmaster/che-core-api-auth-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-auth-shared jar diff --git a/wsmaster/che-core-api-auth/pom.xml b/wsmaster/che-core-api-auth/pom.xml index 698c70810df..3f03c6a0bc0 100644 --- a/wsmaster/che-core-api-auth/pom.xml +++ b/wsmaster/che-core-api-auth/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-auth jar diff --git a/wsmaster/che-core-api-factory-shared/pom.xml b/wsmaster/che-core-api-factory-shared/pom.xml index b55ba0d9a5c..d766244d0c5 100644 --- a/wsmaster/che-core-api-factory-shared/pom.xml +++ b/wsmaster/che-core-api-factory-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-factory-shared jar diff --git a/wsmaster/che-core-api-factory/pom.xml b/wsmaster/che-core-api-factory/pom.xml index 50a28ea9fa6..3975955d5f7 100644 --- a/wsmaster/che-core-api-factory/pom.xml +++ b/wsmaster/che-core-api-factory/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-factory jar diff --git a/wsmaster/che-core-api-installer-shared/pom.xml b/wsmaster/che-core-api-installer-shared/pom.xml index 0f3ff259197..1ae699dfe02 100644 --- a/wsmaster/che-core-api-installer-shared/pom.xml +++ b/wsmaster/che-core-api-installer-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-installer-shared jar diff --git a/wsmaster/che-core-api-installer/pom.xml b/wsmaster/che-core-api-installer/pom.xml index ade6e9b6163..5977f8bf268 100644 --- a/wsmaster/che-core-api-installer/pom.xml +++ b/wsmaster/che-core-api-installer/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-installer jar diff --git a/wsmaster/che-core-api-project-templates-shared/pom.xml b/wsmaster/che-core-api-project-templates-shared/pom.xml index 60cff21cbee..b3141f4de3b 100644 --- a/wsmaster/che-core-api-project-templates-shared/pom.xml +++ b/wsmaster/che-core-api-project-templates-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-project-templates-shared Che Core :: API :: Project Templates :: Shared diff --git a/wsmaster/che-core-api-project-templates/pom.xml b/wsmaster/che-core-api-project-templates/pom.xml index 5e27b8b809c..b5b3cff7bb6 100644 --- a/wsmaster/che-core-api-project-templates/pom.xml +++ b/wsmaster/che-core-api-project-templates/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-project-templates Che Core :: API :: Project Templates diff --git a/wsmaster/che-core-api-ssh-shared/pom.xml b/wsmaster/che-core-api-ssh-shared/pom.xml index 4834d1f9fb3..25062246c96 100644 --- a/wsmaster/che-core-api-ssh-shared/pom.xml +++ b/wsmaster/che-core-api-ssh-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-ssh-shared jar diff --git a/wsmaster/che-core-api-ssh/pom.xml b/wsmaster/che-core-api-ssh/pom.xml index cd555ed1f54..772ffd23f03 100644 --- a/wsmaster/che-core-api-ssh/pom.xml +++ b/wsmaster/che-core-api-ssh/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-ssh jar diff --git a/wsmaster/che-core-api-system-shared/pom.xml b/wsmaster/che-core-api-system-shared/pom.xml index 4abc80d2fca..8aede7b0702 100644 --- a/wsmaster/che-core-api-system-shared/pom.xml +++ b/wsmaster/che-core-api-system-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-system-shared jar diff --git a/wsmaster/che-core-api-system/pom.xml b/wsmaster/che-core-api-system/pom.xml index 818d71743c9..c2bccfc1f7e 100644 --- a/wsmaster/che-core-api-system/pom.xml +++ b/wsmaster/che-core-api-system/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-system jar @@ -102,11 +102,6 @@ everrest-assured test - - org.mockito - mockito-all - test - org.mockito mockito-core diff --git a/wsmaster/che-core-api-user-shared/pom.xml b/wsmaster/che-core-api-user-shared/pom.xml index b683ef9acf4..dd3b4f1a418 100644 --- a/wsmaster/che-core-api-user-shared/pom.xml +++ b/wsmaster/che-core-api-user-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-user-shared Che Core :: API :: User :: Shared diff --git a/wsmaster/che-core-api-user/pom.xml b/wsmaster/che-core-api-user/pom.xml index 25a1b7f155f..cf1539a2847 100644 --- a/wsmaster/che-core-api-user/pom.xml +++ b/wsmaster/che-core-api-user/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-user Che Core :: API :: User diff --git a/wsmaster/che-core-api-workspace-shared/pom.xml b/wsmaster/che-core-api-workspace-shared/pom.xml index 7f092a2487f..0b71e2f626d 100644 --- a/wsmaster/che-core-api-workspace-shared/pom.xml +++ b/wsmaster/che-core-api-workspace-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-workspace-shared jar diff --git a/wsmaster/che-core-api-workspace/pom.xml b/wsmaster/che-core-api-workspace/pom.xml index e9899a3f180..4a4e27e5814 100644 --- a/wsmaster/che-core-api-workspace/pom.xml +++ b/wsmaster/che-core-api-workspace/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-api-workspace jar diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/TemporaryWorkspaceRemoverTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/TemporaryWorkspaceRemoverTest.java index 67df5aeb27c..6c02e147902 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/TemporaryWorkspaceRemoverTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/TemporaryWorkspaceRemoverTest.java @@ -24,7 +24,6 @@ import java.util.List; import org.eclipse.che.api.workspace.server.model.impl.WorkspaceImpl; import org.eclipse.che.api.workspace.server.spi.WorkspaceDao; -import org.mockito.ArgumentMatcher; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.testng.MockitoTestNGListener; @@ -48,40 +47,14 @@ public void shouldRemoveTemporaryWorkspaces() throws Exception { // return 50 items when skip count is 200, and return empty list when skip count is 300. doReturn(createEntities(100)) .when(workspaceDao) - .getWorkspaces( - eq(true), - intThat( - new ArgumentMatcher() { - @Override - public boolean matches(Object argument) { - return ((int) argument) < 200; - } - }), - anyInt()); + .getWorkspaces(eq(true), intThat(integer -> integer.intValue() < 200), anyInt()); doReturn(createEntities(50)) .when(workspaceDao) - .getWorkspaces( - eq(true), - intThat( - new ArgumentMatcher() { - @Override - public boolean matches(Object argument) { - return ((int) argument) == 200; - } - }), - anyInt()); + .getWorkspaces(eq(true), intThat(argument -> ((int) argument) == 200), anyInt()); doReturn(Collections.emptyList()) .when(workspaceDao) .getWorkspaces( - eq(true), - intThat( - new ArgumentMatcher() { - @Override - public boolean matches(Object argument) { - return ((int) argument) > COUNT_OF_WORKSPACES; - } - }), - anyInt()); + eq(true), intThat(argument -> ((int) argument) > COUNT_OF_WORKSPACES), anyInt()); remover.removeTemporaryWs(); diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackServiceTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackServiceTest.java index 92efd62b8bf..1b5ff9bdfa0 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackServiceTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackServiceTest.java @@ -23,9 +23,9 @@ import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyList; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; @@ -426,7 +426,8 @@ public void shouldReturnsAllStacksWhenListTagsIsEmpty() throws ServerException { StackImpl stack2 = new StackImpl(stackImpl); stack2.setTags(singletonList("subversion")); List stacks = asList(stackImpl, stack2); - when(stackDao.searchStacks(anyString(), anyList(), anyInt(), anyInt())).thenReturn(stacks); + when(stackDao.searchStacks(anyString(), nullable(List.class), anyInt(), anyInt())) + .thenReturn(stacks); Response response = given() @@ -436,7 +437,7 @@ public void shouldReturnsAllStacksWhenListTagsIsEmpty() throws ServerException { .get(SECURE_PATH + "/stack"); assertEquals(response.getStatusCode(), 200); - verify(stackDao).searchStacks(anyString(), anyList(), anyInt(), anyInt()); + verify(stackDao).searchStacks(anyString(), nullable(List.class), anyInt(), anyInt()); List result = unwrapListDto(response, StackDto.class); assertEquals(result.size(), 2); diff --git a/wsmaster/che-core-sql-schema/pom.xml b/wsmaster/che-core-sql-schema/pom.xml index c8ccf4aed20..2cf0a608c78 100644 --- a/wsmaster/che-core-sql-schema/pom.xml +++ b/wsmaster/che-core-sql-schema/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT che-core-sql-schema Che Core :: SQL :: Schema diff --git a/wsmaster/integration-tests/cascade-removal/pom.xml b/wsmaster/integration-tests/cascade-removal/pom.xml index c8122cc00f1..6b9cc58676a 100644 --- a/wsmaster/integration-tests/cascade-removal/pom.xml +++ b/wsmaster/integration-tests/cascade-removal/pom.xml @@ -16,7 +16,7 @@ integration-tests-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT cascade-removal Integration Tests :: Cascade Removal @@ -141,11 +141,6 @@ org.eclipse.persistence.jpa test - - org.mockito - mockito-all - test - org.mockito mockito-core diff --git a/wsmaster/integration-tests/pom.xml b/wsmaster/integration-tests/pom.xml index 0af4130c018..d1edc05003a 100644 --- a/wsmaster/integration-tests/pom.xml +++ b/wsmaster/integration-tests/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../pom.xml integration-tests-parent diff --git a/wsmaster/integration-tests/postgresql-tck/pom.xml b/wsmaster/integration-tests/postgresql-tck/pom.xml index ebd79f91882..a35882bc5fa 100644 --- a/wsmaster/integration-tests/postgresql-tck/pom.xml +++ b/wsmaster/integration-tests/postgresql-tck/pom.xml @@ -16,7 +16,7 @@ integration-tests-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT postgresql-tck jar diff --git a/wsmaster/pom.xml b/wsmaster/pom.xml index 69c951c64a4..d6f9051ba64 100644 --- a/wsmaster/pom.xml +++ b/wsmaster/pom.xml @@ -16,11 +16,11 @@ che-core-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT ../core/pom.xml che-master-parent - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT pom Che Master Parent diff --git a/wsmaster/wsmaster-local/pom.xml b/wsmaster/wsmaster-local/pom.xml index e54ae4dcb1a..d4e0176c611 100644 --- a/wsmaster/wsmaster-local/pom.xml +++ b/wsmaster/wsmaster-local/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.19.0-SNAPSHOT + 5.20.0-SNAPSHOT wsmaster-local Che Core :: API :: Impl Local @@ -112,11 +112,6 @@ everrest-assured test - - org.mockito - mockito-all - test - org.mockito mockito-core