diff --git a/assembly/assembly-che-tomcat/pom.xml b/assembly/assembly-che-tomcat/pom.xml index 054ad6e536e..2b8169c133e 100644 --- a/assembly/assembly-che-tomcat/pom.xml +++ b/assembly/assembly-che-tomcat/pom.xml @@ -17,7 +17,7 @@ che-assembly-parent org.eclipse.che - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT assembly-che-tomcat jar diff --git a/assembly/assembly-main/pom.xml b/assembly/assembly-main/pom.xml index f5b8f858d6e..715e899890a 100644 --- a/assembly/assembly-main/pom.xml +++ b/assembly/assembly-main/pom.xml @@ -17,7 +17,7 @@ che-assembly-parent org.eclipse.che - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT assembly-main pom diff --git a/assembly/assembly-root-war/pom.xml b/assembly/assembly-root-war/pom.xml index f825f124731..81ab802450e 100644 --- a/assembly/assembly-root-war/pom.xml +++ b/assembly/assembly-root-war/pom.xml @@ -17,7 +17,7 @@ che-assembly-parent org.eclipse.che - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT assembly-root-war war diff --git a/assembly/assembly-swagger-war/pom.xml b/assembly/assembly-swagger-war/pom.xml index c621fffbf9d..d6802e1d434 100644 --- a/assembly/assembly-swagger-war/pom.xml +++ b/assembly/assembly-swagger-war/pom.xml @@ -17,7 +17,7 @@ che-assembly-parent org.eclipse.che - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT assembly-swagger-war war diff --git a/assembly/assembly-wsmaster-war/.deps/EXCLUDED/prod.md b/assembly/assembly-wsmaster-war/.deps/EXCLUDED/prod.md index 6dcff53600e..7147c851b6e 100644 --- a/assembly/assembly-wsmaster-war/.deps/EXCLUDED/prod.md +++ b/assembly/assembly-wsmaster-war/.deps/EXCLUDED/prod.md @@ -8,5 +8,10 @@ This file lists dependencies that do not need CQs or auto-detection does not wor | `org.jgroups.kubernetes/jgroups-kubernetes@1.0.13.Final` | [CQ20984](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20984) | | `org.flywaydb/flyway-core@4.2.0` | [CQ14689](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=14689) | | `com.auth0/jwks-rsa@0.19.0` | [CQ23769](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23769) | -| `org.apache.tomcat/tomcat-jni@10.0.14` | [CQ23765](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23765) | - +| `io.swagger.core.v3/swagger-annotations-jakarta@2.1.11` | Apache-2.0 clearlydefined | +| `io.swagger.core.v3/swagger-core-jakarta@2.1.11` | Apache-2.0 clearlydefined | +| `io.swagger.core.v3/swagger-integration-jakarta@2.1.11` | Apache-2.0 clearlydefined | +| `io.swagger.core.v3/swaqqgger-jaxrs2-jakarta@2.1.11` | Apache-2.0 clearlydefined | +| `io.swagger.core.v3/swagger-models-jakarta@2.1.11` | Apache-2.0 clearlydefined | +| `io.swagger.core.v3/swagger-jaxrs2-jakarta@2.1.11` | Apache-2.0 clearlydefined | + diff --git a/assembly/assembly-wsmaster-war/.deps/dev.md b/assembly/assembly-wsmaster-war/.deps/dev.md index c7c134bd00c..0945c38fc31 100644 --- a/assembly/assembly-wsmaster-war/.deps/dev.md +++ b/assembly/assembly-wsmaster-war/.deps/dev.md @@ -2,14 +2,12 @@ | Packages | License | Resolved CQs | | --- | --- | --- | -| `antlr/antlr@2.7.7` | BSD-3-Clause | #148 | | `com.beust/jcommander@1.78` | Apache-2.0 | [CQ22738](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22738) | | `com.h2database/h2@1.4.196` | EPL-1.0 | [CQ11693](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11693) | | `net.bytebuddy/byte-buddy-agent@1.11.3` | Apache-2.0 | clearlydefined | | `net.bytebuddy/byte-buddy@1.11.3` | Apache-2.0 | clearlydefined | -| `org.antlr/ST4@4.0.7` | NOASSERTION | [CQ14504](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=14504) | -| `org.antlr/antlr-runtime@3.5` | BSD-3-Clause | clearlydefined | -| `org.antlr/stringtemplate@3.2.1` | BSD-2-Clause | [CQ6759](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=6759) | +| `org.antlr/ST4@4.3.1` | BSD-3-Clause | #1495 | +| `org.antlr/antlr-runtime@3.5.2` | BSD-3-Clause | clearlydefined | | `org.eclipse.che.core/che-core-commons-test@7.41.0-SNAPSHOT` | EPL-2.0 | ecd.che | | `org.mockito/mockito-core@3.11.2` | MIT | clearlydefined | | `org.objenesis/objenesis@3.2` | Apache-2.0 | clearlydefined | diff --git a/assembly/assembly-wsmaster-war/.deps/problems.md b/assembly/assembly-wsmaster-war/.deps/problems.md index 49290b57c58..f00baf852b6 100644 --- a/assembly/assembly-wsmaster-war/.deps/problems.md +++ b/assembly/assembly-wsmaster-war/.deps/problems.md @@ -1,5 +1,3 @@ # Dependency analysis ## UNRESOLVED Production dependencies - -1. `org.apache.tomcat/tomcat-jni@10.0.14` diff --git a/assembly/assembly-wsmaster-war/.deps/prod.md b/assembly/assembly-wsmaster-war/.deps/prod.md index a144cf111e7..2a4064ef064 100644 --- a/assembly/assembly-wsmaster-war/.deps/prod.md +++ b/assembly/assembly-wsmaster-war/.deps/prod.md @@ -3,8 +3,8 @@ | Packages | License | Resolved CQs | | --- | --- | --- | | `aopalliance/aopalliance@1.0` | LicenseRef-Public-Domain | [CQ2918](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=2918) | -| `ch.qos.logback/logback-classic@1.2.8` | EPL-1.0 | [CQ13636](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13636) | -| `ch.qos.logback/logback-core@1.2.8` | EPL-1.0 | [CQ13635](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13635) | +| `ch.qos.logback/logback-classic@1.2.9` | EPL-1.0 | [CQ13636](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13636) | +| `ch.qos.logback/logback-core@1.2.9` | EPL-1.0 | [CQ13635](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13635) | | `com.auth0/jwks-rsa@0.19.0` | NOASSERTION | [CQ23769](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23769) | | `com.fasterxml.jackson.core/jackson-annotations@2.11.2` | Apache-2.0 | [CQ23491](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23491) | | `com.fasterxml.jackson.core/jackson-core@2.11.2` | Apache-2.0 | [CQ23092](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23092) | @@ -25,7 +25,7 @@ | `com.google.j2objc/j2objc-annotations@1.3` | Apache-2.0 | [CQ21195](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=21195) | | `com.google.oauth-client/google-oauth-client@1.32.1` | Apache-2.0 | clearlydefined | | `com.ibm.icu/icu4j@68.1` | NOASSERTION | [CQ23669](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23654) | -| `com.jcraft/jsch@0.1.54` | BSD-2-Clause | [CQ12480](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12480) | +| `com.jcraft/jsch@0.1.55` | BSD-3-Clause | [CQ19435](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19435) | | `com.squareup.okhttp3/logging-interceptor@3.12.12` | Apache-2.0 | clearlydefined | | `com.squareup.okhttp3/okhttp@3.12.12` | Apache-2.0 | [CQ19549](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19549) | | `com.squareup.okio/okio@1.15.0` | Apache-2.0 | [CQ20187](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20187) | @@ -95,21 +95,20 @@ | `io.prometheus/simpleclient@0.7.0` | Apache-2.0 | clearlydefined | | `io.prometheus/simpleclient_common@0.7.0` | Apache-2.0 | clearlydefined | | `io.prometheus/simpleclient_httpserver@0.7.0` | Apache-2.0 | clearlydefined | -| `io.swagger.core.v3/swagger-annotations-jakarta@2.1.10` | Apache-2.0 | clearlydefined | -| `io.swagger.core.v3/swagger-core-jakarta@2.1.10` | Apache-2.0 | clearlydefined | -| `io.swagger.core.v3/swagger-integration-jakarta@2.1.10` | Apache-2.0 | clearlydefined | -| `io.swagger.core.v3/swagger-jaxrs2-jakarta@2.1.10` | Apache-2.0 | clearlydefined | -| `io.swagger.core.v3/swagger-models-jakarta@2.1.10` | Apache-2.0 | clearlydefined | +| `io.swagger.core.v3/swagger-annotations-jakarta@2.1.11` | - | Apache-2.0 clearlydefined | +| `io.swagger.core.v3/swagger-core-jakarta@2.1.11` | - | Apache-2.0 clearlydefined | +| `io.swagger.core.v3/swagger-integration-jakarta@2.1.11` | - | Apache-2.0 clearlydefined | +| `io.swagger.core.v3/swagger-jaxrs2-jakarta@2.1.11` | - | Apache-2.0 clearlydefined | +| `io.swagger.core.v3/swagger-models-jakarta@2.1.11` | - | Apache-2.0 clearlydefined | | `jakarta.activation/jakarta.activation-api@2.0.1` | EPL-2.0 OR BSD-3-Clause OR GPL-2.0-with-classpath-exception | ee4j.jaf | | `jakarta.annotation/jakarta.annotation-api@2.0.0` | EPL-2.0 OR GPL-2.0-with-classpath-exception | ee4j.ca | -| `jakarta.inject/jakarta.inject-api@1.0.3` | - | eclipse | +| `jakarta.inject/jakarta.inject-api@1.0.5` | - | eclipse | | `jakarta.servlet/jakarta.servlet-api@5.0.0` | EPL-2.0 OR GPL-2.0-with-classpath-exception | ee4j.servlet | | `jakarta.validation/jakarta.validation-api@3.0.0` | EPL-1.0 | modeling.emf.validation | | `jakarta.websocket/jakarta.websocket-api@2.0.0` | EPL-2.0 OR GPL-2.0-with-classpath-exception | ee4j.websocket | | `jakarta.ws.rs/jakarta.ws.rs-api@3.0.0` | EPL-2.0 OR GPL-2.0-with-classpath-exception | ee4j.jaxrs | | `jakarta.xml.bind/jakarta.xml.bind-api@3.0.0` | BSD-3-Clause | ee4j.jaxb | -| `net.java.dev.jna/jna@4.1.0` | Apache-2.0 | [CQ9291](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=9291) | -| `net.logstash.logback/logstash-logback-encoder@6.6` | Apache-2.0 | clearlydefined | +| `net.logstash.logback/logstash-logback-encoder@7.0.1` | Apache-2.0 | clearlydefined | | `org.apache.commons/commons-lang3@3.12.0` | Apache-2.0 | clearlydefined | | `org.apache.httpcomponents/httpcore@4.4.14` | Apache-2.0 | [CQ23528](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23528) | | `org.apache.thrift/libthrift@0.12.0` | Apache-2.0 | clearlydefined | @@ -120,7 +119,7 @@ | `org.apache.tomcat/tomcat-dbcp@10.0.14` | Apache-2.0 | clearlydefined | | `org.apache.tomcat/tomcat-el-api@10.0.14` | Apache-2.0 | clearlydefined | | `org.apache.tomcat/tomcat-jaspic-api@10.0.14` | Apache-2.0 | clearlydefined | -| `org.apache.tomcat/tomcat-jni@10.0.14` | - | [CQ23765](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23765) | +| `org.apache.tomcat/tomcat-jni@10.0.14` | Apache-2.0 | clearlydefined | | `org.apache.tomcat/tomcat-jsp-api@10.0.14` | Apache-2.0 | clearlydefined | | `org.apache.tomcat/tomcat-juli@10.0.14` | Apache-2.0 | clearlydefined | | `org.apache.tomcat/tomcat-servlet-api@10.0.14` | Apache-2.0 AND (EPL-2.0 OR GPL-2.0-with-classpath-exception) | #921 | diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml index 5159f395bfe..d26239dd571 100644 --- a/assembly/assembly-wsmaster-war/pom.xml +++ b/assembly/assembly-wsmaster-war/pom.xml @@ -17,7 +17,7 @@ che-assembly-parent org.eclipse.che - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT assembly-wsmaster-war war diff --git a/assembly/assembly-wsmaster-war/src/test/java/org/eclipse/che/integration/IntegrityConfigurationTest.java b/assembly/assembly-wsmaster-war/src/test/java/org/eclipse/che/integration/IntegrityConfigurationTest.java index 25a687a4b62..f60f01e5917 100644 --- a/assembly/assembly-wsmaster-war/src/test/java/org/eclipse/che/integration/IntegrityConfigurationTest.java +++ b/assembly/assembly-wsmaster-war/src/test/java/org/eclipse/che/integration/IntegrityConfigurationTest.java @@ -134,41 +134,31 @@ public void shouldNotDeclareUnused() { new MethodAnnotationsScanner()); Set parameters = new HashSet<>(); parameters.addAll( - reflections - .getConstructorsWithAnyParamAnnotated(Named.class) - .stream() + reflections.getConstructorsWithAnyParamAnnotated(Named.class).stream() .flatMap(c -> Stream.of(c.getParameters())) .filter(p -> p.isAnnotationPresent(Named.class)) .map(p -> p.getAnnotation(Named.class).value()) .collect(Collectors.toSet())); parameters.addAll( - reflections - .getFieldsAnnotatedWith(Named.class) - .stream() + reflections.getFieldsAnnotatedWith(Named.class).stream() .filter(f -> f.isAnnotationPresent(Named.class)) .map(f -> f.getAnnotation(Named.class).value()) .collect(Collectors.toSet())); parameters.addAll( - reflections - .getMethodsAnnotatedWith(ScheduleDelay.class) - .stream() + reflections.getMethodsAnnotatedWith(ScheduleDelay.class).stream() .filter(m -> m.isAnnotationPresent(ScheduleDelay.class)) .map(m -> m.getAnnotation(ScheduleDelay.class).delayParameterName()) .collect(Collectors.toSet())); parameters.addAll( - reflections - .getMethodsAnnotatedWith(ScheduleDelay.class) - .stream() + reflections.getMethodsAnnotatedWith(ScheduleDelay.class).stream() .filter(m -> m.isAnnotationPresent(ScheduleDelay.class)) .map(m -> m.getAnnotation(ScheduleDelay.class).initialDelayParameterName()) .collect(Collectors.toSet())); Set unusedDeclaredConfigurationParameters = - getProperties(new File(Resources.getResource("che").getPath())) - .keySet() - .stream() + getProperties(new File(Resources.getResource("che").getPath())).keySet().stream() .filter(k -> !parameters.contains(k)) .collect(Collectors.toSet()); Assert.assertTrue( diff --git a/assembly/pom.xml b/assembly/pom.xml index 32d6d20c984..abe8a4d6690 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -17,7 +17,7 @@ che-server org.eclipse.che - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT ../pom.xml che-assembly-parent diff --git a/core/che-core-api-core/pom.xml b/core/che-core-api-core/pom.xml index 2ecfe37825a..46f4e4b4350 100644 --- a/core/che-core-api-core/pom.xml +++ b/core/che-core-api-core/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-core jar @@ -63,10 +63,6 @@ jakarta.ws.rs jakarta.ws.rs-api - - net.java.dev.jna - jna - org.eclipse.che.core che-core-api-dto diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/jsonrpc/impl/ServerSideRequestProcessorConfigurator.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/jsonrpc/impl/ServerSideRequestProcessorConfigurator.java index 656772741e8..23d351bde96 100644 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/jsonrpc/impl/ServerSideRequestProcessorConfigurator.java +++ b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/jsonrpc/impl/ServerSideRequestProcessorConfigurator.java @@ -29,8 +29,7 @@ public class ServerSideRequestProcessorConfigurator public ServerSideRequestProcessorConfigurator( Set configurations) { this.configurations = - configurations - .stream() + configurations.stream() .collect(Collectors.toMap(Configuration::getEndpointId, Function.identity())); } diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/notification/RemoteSubscriptionManager.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/notification/RemoteSubscriptionManager.java index 2a2439a163b..f486b4cf1ec 100644 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/notification/RemoteSubscriptionManager.java +++ b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/notification/RemoteSubscriptionManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -60,9 +60,7 @@ public void register( String method, Class eventType, BiPredicate> biPredicate) { eventService.subscribe( event -> - remoteSubscriptionStorage - .getByMethod(method) - .stream() + remoteSubscriptionStorage.getByMethod(method).stream() .filter(context -> biPredicate.test(event, context.getScope())) .forEach(context -> transmit(context.getEndpointId(), method, event)), eventType); diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/ApiInfoService.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/ApiInfoService.java index 0efddec7ea5..88b670442d5 100644 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/ApiInfoService.java +++ b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/ApiInfoService.java @@ -46,9 +46,7 @@ public ApiInfo info() { public RootResourcesList listJSON(@Context ServletContext context) { ResourceBinder binder = (ResourceBinder) context.getAttribute(ResourceBinder.class.getName()); return new RootResourcesList( - binder - .getResources() - .stream() + binder.getResources().stream() .map( new Function, RootResource>() { @Nullable diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/DefaultHttpJsonResponse.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/DefaultHttpJsonResponse.java index edf36e2f3d2..cc8a3ebd03e 100644 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/DefaultHttpJsonResponse.java +++ b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/rest/DefaultHttpJsonResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -51,9 +51,7 @@ protected DefaultHttpJsonResponse( this.responseCode = responseCode; this.headers = unmodifiableMap( - headers - .entrySet() - .stream() + headers.entrySet().stream() .collect(Collectors.toMap(Map.Entry::getKey, e -> unmodifiableList(e.getValue())))); } diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/CancellableProcessWrapper.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/CancellableProcessWrapper.java deleted file mode 100644 index f00c1fabc58..00000000000 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/CancellableProcessWrapper.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2012-2018 Red Hat, Inc. - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.api.core.util; - -/** - * Cancellable wrapper of {@code Process}. - * - * @author andrew00x - */ -public final class CancellableProcessWrapper implements Cancellable { - private final Process process; - private final Callback callback; - - public CancellableProcessWrapper(Process process) { - this(process, null); - } - - public CancellableProcessWrapper(Process process, Callback callback) { - this.process = process; - this.callback = callback; - } - - @Override - public void cancel() { - ProcessUtil.kill(process); - if (callback != null) { - callback.cancelled(this); - } - } -} diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/DefaultProcessManager.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/DefaultProcessManager.java deleted file mode 100644 index bd31528d8ad..00000000000 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/DefaultProcessManager.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2012-2018 Red Hat, Inc. - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.api.core.util; - -/** - * Typically may be in use for windows systems only. For *nix like system UnixProcessManager is in - * use. - * - * @author andrew00x - */ -class DefaultProcessManager extends ProcessManager { - /* - NOTE: some methods are not implemented for other system than unix like system. - */ - - @Override - public void kill(Process process) { - if (isAlive(process)) { - process.destroy(); - try { - process.waitFor(); // wait for process death - } catch (InterruptedException e) { - Thread.interrupted(); - } - } - } - - @Override - public boolean isAlive(Process process) { - try { - process.exitValue(); - return false; - } catch (IllegalThreadStateException e) { - return true; - } - } - - @Override - int system(String command) { - throw new UnsupportedOperationException(); - } -} diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointIdsHolder.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointIdsHolder.java index 9b3ed3cfd8e..7581869f041 100644 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointIdsHolder.java +++ b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointIdsHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -55,9 +55,7 @@ private void configureUnSubscribeHandler(RequestHandlerConfigurator configurator } public Set getEndpointIdsByWorkspaceId(String workspaceId) { - return endpointIds - .entrySet() - .stream() + return endpointIds.entrySet().stream() .filter(it -> it.getValue().contains(workspaceId)) .map(Map.Entry::getKey) .collect(toSet()); diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointToMachineNameHolder.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointToMachineNameHolder.java index 3c4f0747d1f..a857f4896a0 100644 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointToMachineNameHolder.java +++ b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointToMachineNameHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -55,9 +55,7 @@ private void configureUnSubscribeHandler(RequestHandlerConfigurator configurator } public Set getEndpointIdsByWorkspaceIdPlusMachineName(String workspaceIdPlusMachineName) { - return endpointIds - .entrySet() - .stream() + return endpointIds.entrySet().stream() .filter(it -> it.getValue().contains(workspaceIdPlusMachineName)) .map(Map.Entry::getKey) .collect(toSet()); diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/PagingUtil.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/PagingUtil.java index a3cb682dfa2..1777ef2cc92 100644 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/PagingUtil.java +++ b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/PagingUtil.java @@ -66,8 +66,7 @@ public static String createLinkHeader(Page page, URI uri) { pageRefs.add(Pair.of("next", page.getNextPageRef())); } final UriBuilder ub = UriBuilder.fromUri(uri); - return pageRefs - .stream() + return pageRefs.stream() .map( refPair -> format( diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/ProcessManager.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/ProcessManager.java deleted file mode 100644 index b150dca9801..00000000000 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/ProcessManager.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2012-2018 Red Hat, Inc. - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.api.core.util; - -/** @author andrew00x */ -abstract class ProcessManager { - static ProcessManager newInstance() { - if (SystemInfo.isUnix()) { - return new UnixProcessManager(); - } - return new DefaultProcessManager(); - } - - abstract void kill(Process process); - - abstract boolean isAlive(Process process); - - abstract int system(String command); -} diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/ProcessUtil.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/ProcessUtil.java deleted file mode 100644 index ea34b5a66c7..00000000000 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/ProcessUtil.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright (c) 2012-2018 Red Hat, Inc. - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.api.core.util; - -import static java.lang.String.format; - -import com.google.common.base.Joiner; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Helpers to manage system processes. - * - * @author andrew00x - * @author Alexander Garagatyi - */ -public final class ProcessUtil { - - private static final Logger LOG = LoggerFactory.getLogger(ProcessUtil.class); - private static final ProcessManager PROCESS_MANAGER = ProcessManager.newInstance(); - - /** - * Writes stdout and stderr of the process to consumers.
- * Supposes that stderr of the process is redirected to stdout. - * - * @param p process to read output from - * @param stdout a consumer where stdout will be redirected - * @param stderr a consumer where stderr will be redirected - * @throws IOException - */ - public static void process(Process p, LineConsumer stdout, LineConsumer stderr) - throws IOException { - try (BufferedReader inputReader = - new BufferedReader(new InputStreamReader(p.getInputStream())); - BufferedReader errorReader = - new BufferedReader(new InputStreamReader(p.getErrorStream()))) { - String line; - while ((line = inputReader.readLine()) != null) { - stdout.writeLine(line); - } - while ((line = errorReader.readLine()) != null) { - stderr.writeLine(line); - } - } - } - - /** - * Writes stdout of the process to consumer.
- * Supposes that stderr of the process is redirected to stdout. - * - * @param p process to read output from - * @param stdout a consumer where stdout will be redirected - * @throws IOException - */ - public static void process(Process p, LineConsumer stdout) throws IOException { - try (BufferedReader inputReader = - new BufferedReader(new InputStreamReader(p.getInputStream()))) { - String line; - while ((line = inputReader.readLine()) != null) { - stdout.writeLine(line); - } - } - } - - /** - * Start the process, writing the stdout and stderr to {@code outputConsumer} and terminate - * process by {@code timeout}.
- * - * @param commandLine arguments of process command - * @param timeout timeout for process. If process duration > {@code timeout} than kill process and - * throw {@link TimeoutException}. - * @param timeUnit timeUnit of the {@code timeout}. - * @param outputConsumer a consumer where stdout and stderr will be redirected - * @return the started process - * @throws InterruptedException in case terminate process - * @throws IOException in case I/O error - * @throws TimeoutException if process gets more time then defined by {@code timeout} - */ - public static Process executeAndWait( - String[] commandLine, int timeout, TimeUnit timeUnit, LineConsumer outputConsumer) - throws TimeoutException, IOException, InterruptedException { - ProcessBuilder pb = new ProcessBuilder(commandLine).redirectErrorStream(true); - - Process process = pb.start(); - - CompletableFuture.runAsync( - () -> { - try { - // consume logs until process ends - process(process, outputConsumer); - } catch (IOException e) { - LOG.error( - format( - "Failed to complete reading of the process '%s' output due to occurred error", - Joiner.on(" ").join(commandLine)), - e); - } - }); - - if (!process.waitFor(timeout, timeUnit)) { - try { - ProcessUtil.kill(process); - } catch (RuntimeException x) { - LOG.error("An error occurred while killing process '{}'", Joiner.on(" ").join(commandLine)); - } - throw new TimeoutException( - format( - "Process '%s' was terminated by timeout %s %s.", - Joiner.on(" ").join(commandLine), timeout, timeUnit.name().toLowerCase())); - } - - return process; - } - - /** - * Start the process, writing the stdout and stderr to consumer. - * - * @param pb process builder to start - * @param consumer a consumer where stdout and stderr will be redirected - * @return the started process - * @throws IOException - */ - public static Process execute(ProcessBuilder pb, LineConsumer consumer) throws IOException { - pb.redirectErrorStream(true); - Process process = pb.start(); - - process(process, consumer); - - return process; - } - - public static boolean isAlive(Process process) { - return PROCESS_MANAGER.isAlive(process); - } - - public static void kill(Process process) { - PROCESS_MANAGER.kill(process); - } - - public static int system(String command) { - return PROCESS_MANAGER.system(command); - } - - private ProcessUtil() {} -} diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/UnixProcessManager.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/UnixProcessManager.java deleted file mode 100644 index ca22f5b2297..00000000000 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/UnixProcessManager.java +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright (c) 2012-2021 Red Hat, Inc. - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.api.core.util; - -import com.sun.jna.Library; -import com.sun.jna.Native; -import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Pattern; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Process manager for *nix like system. - * - * @author andrew00x - */ -class UnixProcessManager extends ProcessManager { - /* - At the moment tested on linux only. - */ - - private static final Logger LOG = LoggerFactory.getLogger(UnixProcessManager.class); - - private static final CLibrary C_LIBRARY; - - private static final Field PID_FIELD; - private static final Method PID_METHOD; - - static { - CLibrary lib = null; - Field pidField = null; - Method pidMethod = null; - if (SystemInfo.isUnix()) { - try { - lib = ((CLibrary) Native.loadLibrary("c", CLibrary.class)); - } catch (Exception e) { - LOG.error("Cannot load native library", e); - } - try { - pidField = - Thread.currentThread() - .getContextClassLoader() - .loadClass("java.lang.UNIXProcess") - .getDeclaredField("pid"); - pidField.setAccessible(true); - } catch (Exception e) { - // try with Java9 - try { - pidMethod = Process.class.getDeclaredMethod("pid"); - } catch (NoSuchMethodException e1) { - LOG.error(e1.getMessage(), e1); - } - } - } - C_LIBRARY = lib; - PID_FIELD = pidField; - PID_METHOD = pidMethod; - } - - private static interface CLibrary extends Library { - // kill -l - int SIGKILL = 9; - int SIGTERM = 15; - - int kill(int pid, int signal); - - String strerror(int errno); - - int system(String cmd); - } - - private static final Pattern UNIX_PS_TABLE_PATTERN = Pattern.compile("\\s+"); - - @Override - public void kill(Process process) { - if (C_LIBRARY != null) { - killTree(getPid(process)); - } else { - throw new IllegalStateException("Cannot kill process. Not a UNIX system?"); - } - } - - private void killTree(int pid) { - final int[] children = getChildProcesses(pid); - LOG.debug("PID: {}, child PIDs: {}", pid, children); - if (children.length > 0) { - for (int cpid : children) { - killTree(cpid); // kill process tree recursively - } - } - int r = C_LIBRARY.kill(pid, CLibrary.SIGKILL); // kill origin process - LOG.debug("kill {}", pid); - if (r != 0) { - if (LOG.isDebugEnabled()) { - LOG.debug("kill for {} returns {}, strerror '{}'", pid, r, C_LIBRARY.strerror(r)); - } - } - } - - private int[] getChildProcesses(final int myPid) { - final String ps = "ps -e -o ppid,pid,comm"; /* PPID, PID, COMMAND */ - final List children = new ArrayList<>(); - final StringBuilder error = new StringBuilder(); - final LineConsumer stdout = - new LineConsumer() { - @Override - public void writeLine(String line) throws IOException { - if (line != null && !line.isEmpty()) { - final String[] tokens = UNIX_PS_TABLE_PATTERN.split(line.trim()); - if (tokens.length == 3 /* PPID, PID, COMMAND */) { - int ppid; - try { - ppid = Integer.parseInt(tokens[0]); - } catch (NumberFormatException e) { - // May be first line from process table: 'PPID PID COMMAND'. Skip it. - return; - } - if (ppid == myPid) { - int pid = Integer.parseInt(tokens[1]); - children.add(pid); - } - } - } - } - - @Override - public void close() throws IOException {} - }; - - final LineConsumer stderr = - new LineConsumer() { - @Override - public void writeLine(String line) throws IOException { - if (error.length() > 0) { - error.append('\n'); - } - error.append(line); - } - - @Override - public void close() throws IOException {} - }; - - try { - ProcessUtil.process(Runtime.getRuntime().exec(ps), stdout, stderr); - } catch (IOException e) { - throw new IllegalStateException(e); - } - - if (error.length() > 0) { - throw new IllegalStateException("Cannot get child processes: " + error.toString()); - } - final int size = children.size(); - final int[] result = new int[size]; - for (int i = 0; i < size; i++) { - result[i] = children.get(i); - } - return result; - } - - @Override - public boolean isAlive(Process process) { - return process.isAlive(); - } - - int getPid(Process process) { - if (PID_FIELD != null) { - try { - return ((Number) PID_FIELD.get(process)).intValue(); - } catch (IllegalAccessException e) { - throw new IllegalStateException("Cannot get process ID. Not a UNIX system?", e); - } - } else if (PID_METHOD != null) { - try { - return ((Long) PID_METHOD.invoke(process)).intValue(); - } catch (IllegalAccessException | InvocationTargetException e) { - throw new IllegalStateException("Cannot get process ID. Not a UNIX system?", e); - } - } else { - throw new IllegalStateException("Cannot get process ID. Not a UNIX system?"); - } - } - - @Override - int system(String command) { - return C_LIBRARY.system(command); - } -} diff --git a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/websocket/impl/WebSocketSessionRegistry.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/websocket/impl/WebSocketSessionRegistry.java index 8330c9eb5f8..61053db867c 100644 --- a/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/websocket/impl/WebSocketSessionRegistry.java +++ b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/websocket/impl/WebSocketSessionRegistry.java @@ -55,18 +55,14 @@ public Optional get(String endpointId) { } public Set getByPartialMatch(String partialEndpointId) { - return sessionsMap - .entrySet() - .stream() + return sessionsMap.entrySet().stream() .filter(it -> it.getKey().contains(partialEndpointId)) .map(Map.Entry::getValue) .collect(toSet()); } public Optional get(Session session) { - return sessionsMap - .entrySet() - .stream() + return sessionsMap.entrySet().stream() .filter(entry -> entry.getValue().equals(session)) .map(Map.Entry::getKey) .findAny(); diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/ProcessUtilTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/ProcessUtilTest.java deleted file mode 100644 index d887198afe2..00000000000 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/ProcessUtilTest.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2012-2018 Red Hat, Inc. - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.api.core.util; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import org.testng.Assert; -import org.testng.annotations.Test; - -/** @author andrew00x */ -public class ProcessUtilTest { - - @Test - public void testKill() throws Exception { - final Process p = Runtime.getRuntime().exec(new String[] {"ping", "google.com"}); - final List stdout = new ArrayList<>(); - final List stderr = new ArrayList<>(); - final IOException[] processError = new IOException[1]; - final CountDownLatch latch = new CountDownLatch(1); - final long start = System.currentTimeMillis(); - new Thread() { - public void run() { - try { - ProcessUtil.process( - p, - new LineConsumer() { - @Override - public void writeLine(String line) throws IOException { - stdout.add(line); - } - - @Override - public void close() throws IOException {} - }, - new LineConsumer() { - @Override - public void writeLine(String line) throws IOException { - stderr.add(line); - } - - @Override - public void close() throws IOException {} - }); - } catch (IOException e) { - processError[0] = e; // throw when kill process - } finally { - latch.countDown(); - } - } - }.start(); - - Thread.sleep(1000); // give time to start process - Assert.assertTrue(ProcessUtil.isAlive(p), "Process is not started."); - - ProcessUtil.kill(p); // kill process - - latch.await(15, TimeUnit.SECONDS); // should not stop here if process killed - final long end = System.currentTimeMillis(); - - Thread.sleep(200); - - // System process sleeps 10 seconds. It is safety to check we done in less then 3 sec. - Assert.assertFalse(ProcessUtil.isAlive(p)); - Assert.assertTrue((end - start) < 3000, "Fail kill process"); - - System.out.println(processError[0]); - // processError[0].printStackTrace(); - System.out.println(stdout); - System.out.println(stderr); - } -} diff --git a/core/che-core-api-dto-maven-plugin/pom.xml b/core/che-core-api-dto-maven-plugin/pom.xml index b8bbbc4c3ab..b61a35b75a7 100644 --- a/core/che-core-api-dto-maven-plugin/pom.xml +++ b/core/che-core-api-dto-maven-plugin/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 9f4d874d1a5..550f1195189 100644 --- a/core/che-core-api-dto/pom.xml +++ b/core/che-core-api-dto/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 811d5cf8fb9..a193cfdf95d 100644 --- a/core/che-core-api-model/pom.xml +++ b/core/che-core-api-model/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 7052f39e04a..0bb1c3af795 100644 --- a/core/che-core-db-vendor-h2/pom.xml +++ b/core/che-core-db-vendor-h2/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-db-vendor-h2 Che Core :: Commons :: DB :: Vendor H2 diff --git a/core/che-core-db-vendor-mysql/pom.xml b/core/che-core-db-vendor-mysql/pom.xml index 116a7672a45..1daa7ccd5b1 100644 --- a/core/che-core-db-vendor-mysql/pom.xml +++ b/core/che-core-db-vendor-mysql/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-db-vendor-mysql Che Core :: Commons :: DB :: Vendor MySQL diff --git a/core/che-core-db-vendor-postgresql/pom.xml b/core/che-core-db-vendor-postgresql/pom.xml index 8ac964360d9..56d412f3168 100644 --- a/core/che-core-db-vendor-postgresql/pom.xml +++ b/core/che-core-db-vendor-postgresql/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-db-vendor-postgresql Che Core :: Commons :: DB :: Vendor PostgreSQL diff --git a/core/che-core-db/pom.xml b/core/che-core-db/pom.xml index 16e9783479a..6ae9ac23ca0 100644 --- a/core/che-core-db/pom.xml +++ b/core/che-core-db/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-db Che Core :: Commons :: DB diff --git a/core/che-core-db/src/main/java/org/eclipse/che/core/db/schema/impl/flyway/CustomSqlMigrationResolver.java b/core/che-core-db/src/main/java/org/eclipse/che/core/db/schema/impl/flyway/CustomSqlMigrationResolver.java index 5656aae46ea..e1abaaac7db 100644 --- a/core/che-core-db/src/main/java/org/eclipse/che/core/db/schema/impl/flyway/CustomSqlMigrationResolver.java +++ b/core/che-core-db/src/main/java/org/eclipse/che/core/db/schema/impl/flyway/CustomSqlMigrationResolver.java @@ -187,9 +187,7 @@ private List resolveSqlMigrations() throws IOException, SQLEx final Map migrations = new HashMap<>(); for (SqlScript script : - scriptsInDir - .values() - .stream() + scriptsInDir.values().stream() .flatMap(scripts -> scripts.values().stream()) .collect(toList())) { final ResolvedMigrationImpl migration = new ResolvedMigrationImpl(); diff --git a/core/che-core-logback/pom.xml b/core/che-core-logback/pom.xml index 0683b3d408b..1ce42b64ce6 100644 --- a/core/che-core-logback/pom.xml +++ b/core/che-core-logback/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-logback jar diff --git a/core/che-core-metrics-core/pom.xml b/core/che-core-metrics-core/pom.xml index cc67bc1f255..e1e17f07cb9 100644 --- a/core/che-core-metrics-core/pom.xml +++ b/core/che-core-metrics-core/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-metrics-core Che Core :: Commons :: Metrics :: Core diff --git a/core/che-core-tracing-core/pom.xml b/core/che-core-tracing-core/pom.xml index 0889dfd9e81..bdab0cbedd8 100644 --- a/core/che-core-tracing-core/pom.xml +++ b/core/che-core-tracing-core/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-tracing-core Che Core :: Commons :: Tracing :: Core diff --git a/core/che-core-tracing-metrics/pom.xml b/core/che-core-tracing-metrics/pom.xml index 21f53cd576e..b20c224dd89 100644 --- a/core/che-core-tracing-metrics/pom.xml +++ b/core/che-core-tracing-metrics/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-tracing-metrics Che Core :: Commons :: Tracing :: Metrics diff --git a/core/che-core-tracing-web/pom.xml b/core/che-core-tracing-web/pom.xml index 9757efc6e62..7527ebf5c82 100644 --- a/core/che-core-tracing-web/pom.xml +++ b/core/che-core-tracing-web/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-tracing-web Che Core :: Commons :: Tracing :: Web diff --git a/core/che-core-typescript-dto-maven-plugin/pom.xml b/core/che-core-typescript-dto-maven-plugin/pom.xml index a9028967949..2b9dd3c30c7 100644 --- a/core/che-core-typescript-dto-maven-plugin/pom.xml +++ b/core/che-core-typescript-dto-maven-plugin/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-typescript-dto-maven-plugin maven-plugin diff --git a/core/che-core-typescript-dto-maven-plugin/src/main/java/org/eclipse/che/plugin/typescript/dto/TypeScriptDtoGenerator.java b/core/che-core-typescript-dto-maven-plugin/src/main/java/org/eclipse/che/plugin/typescript/dto/TypeScriptDtoGenerator.java index 9f41e159684..f8d33ab9284 100644 --- a/core/che-core-typescript-dto-maven-plugin/src/main/java/org/eclipse/che/plugin/typescript/dto/TypeScriptDtoGenerator.java +++ b/core/che-core-typescript-dto-maven-plugin/src/main/java/org/eclipse/che/plugin/typescript/dto/TypeScriptDtoGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -80,8 +80,7 @@ protected void init() { List> annotatedWithDtos = new ArrayList<>(reflections.getTypesAnnotatedWith(DTO.class)); List> interfacesDtos = - annotatedWithDtos - .stream() + annotatedWithDtos.stream() .filter(clazz -> clazz.isInterface()) .collect(Collectors.toList()); interfacesDtos.stream().forEach(this::analyze); diff --git a/core/che-core-typescript-dto-maven-plugin/src/main/java/org/eclipse/che/plugin/typescript/dto/model/DtoModel.java b/core/che-core-typescript-dto-maven-plugin/src/main/java/org/eclipse/che/plugin/typescript/dto/model/DtoModel.java index 5198555cdb2..ccc4fc1535a 100644 --- a/core/che-core-typescript-dto-maven-plugin/src/main/java/org/eclipse/che/plugin/typescript/dto/model/DtoModel.java +++ b/core/che-core-typescript-dto-maven-plugin/src/main/java/org/eclipse/che/plugin/typescript/dto/model/DtoModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -61,8 +61,7 @@ public DtoModel(Class dto) { /** Scan all getter/setter/with methods that are not inherited */ protected void analyze() { - Arrays.asList(this.dto.getMethods()) - .stream() + Arrays.asList(this.dto.getMethods()).stream() .filter( method -> !method.isBridge() @@ -85,9 +84,7 @@ protected void analyze() { }); // now convert map into list - fieldAttributes - .entrySet() - .stream() + fieldAttributes.entrySet().stream() .forEach( field -> fieldAttributeModels.add( diff --git a/core/commons/che-core-commons-annotations/pom.xml b/core/commons/che-core-commons-annotations/pom.xml index 8d23cd1b4f5..f765f77a92a 100644 --- a/core/commons/che-core-commons-annotations/pom.xml +++ b/core/commons/che-core-commons-annotations/pom.xml @@ -17,7 +17,7 @@ che-core-commons-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-commons-annotations jar diff --git a/core/commons/che-core-commons-inject/pom.xml b/core/commons/che-core-commons-inject/pom.xml index 96fbfcb8a34..97835237419 100644 --- a/core/commons/che-core-commons-inject/pom.xml +++ b/core/commons/che-core-commons-inject/pom.xml @@ -17,7 +17,7 @@ che-core-commons-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-commons-inject jar diff --git a/core/commons/che-core-commons-inject/src/main/java/org/eclipse/che/inject/CheBootstrap.java b/core/commons/che-core-commons-inject/src/main/java/org/eclipse/che/inject/CheBootstrap.java index e1b1724eca0..347b21d5378 100644 --- a/core/commons/che-core-commons-inject/src/main/java/org/eclipse/che/inject/CheBootstrap.java +++ b/core/commons/che-core-commons-inject/src/main/java/org/eclipse/che/inject/CheBootstrap.java @@ -257,9 +257,7 @@ static class CheSystemPropertiesConfigurationModule extends AbstractConfiguratio @Override protected void configure() { Iterable> cheProperties = - System.getProperties() - .entrySet() - .stream() + System.getProperties().entrySet().stream() .filter(new PropertyNamePrefixPredicate<>("che.", "codenvy.")) .collect(toList()); bindProperties(null, cheProperties); @@ -274,9 +272,7 @@ static class CheEnvironmentVariablesConfigurationModule extends AbstractConfigur @Override protected void configure() { Iterable> cheProperties = - System.getenv() - .entrySet() - .stream() + System.getenv().entrySet().stream() .filter(new PropertyNamePrefixPredicate<>("CHE_", "CODENVY_")) .map(new EnvironmentVariableToSystemPropertyFormatNameConverter()) .collect(toList()); diff --git a/core/commons/che-core-commons-j2ee/pom.xml b/core/commons/che-core-commons-j2ee/pom.xml index 24e2ae9e199..6f361f6ed89 100644 --- a/core/commons/che-core-commons-j2ee/pom.xml +++ b/core/commons/che-core-commons-j2ee/pom.xml @@ -17,7 +17,7 @@ che-core-commons-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 4f0f5424712..9c9ce5c7442 100644 --- a/core/commons/che-core-commons-json/pom.xml +++ b/core/commons/che-core-commons-json/pom.xml @@ -17,7 +17,7 @@ che-core-commons-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 57370e4173e..8ce2ab4f5a1 100644 --- a/core/commons/che-core-commons-lang/pom.xml +++ b/core/commons/che-core-commons-lang/pom.xml @@ -17,7 +17,7 @@ che-core-commons-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-commons-lang jar diff --git a/core/commons/che-core-commons-lang/src/main/java/org/eclipse/che/commons/lang/IoUtil.java b/core/commons/che-core-commons-lang/src/main/java/org/eclipse/che/commons/lang/IoUtil.java index 7385e8679d1..7102b082f42 100644 --- a/core/commons/che-core-commons-lang/src/main/java/org/eclipse/che/commons/lang/IoUtil.java +++ b/core/commons/che-core-commons-lang/src/main/java/org/eclipse/che/commons/lang/IoUtil.java @@ -516,7 +516,8 @@ public static List list(File dir, FilenameFilter filter) { public static String countFileHash(File file, MessageDigest digest) throws IOException { byte[] b = new byte[8192]; try (DigestInputStream dis = new DigestInputStream(new FileInputStream(file), digest)) { - while (dis.read(b) != -1) ; + while (dis.read(b) != -1) + ; return toHex(digest.digest()); } } diff --git a/core/commons/che-core-commons-observability/pom.xml b/core/commons/che-core-commons-observability/pom.xml index 6f50dfca2ea..18bba70dfeb 100644 --- a/core/commons/che-core-commons-observability/pom.xml +++ b/core/commons/che-core-commons-observability/pom.xml @@ -17,7 +17,7 @@ che-core-commons-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-commons-observability Che Core :: Commons :: Tracing and Monitoring wrapper diff --git a/core/commons/che-core-commons-schedule/pom.xml b/core/commons/che-core-commons-schedule/pom.xml index 6679bd2c8d4..3047a8e24d2 100644 --- a/core/commons/che-core-commons-schedule/pom.xml +++ b/core/commons/che-core-commons-schedule/pom.xml @@ -17,7 +17,7 @@ che-core-commons-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-commons-schedule jar diff --git a/core/commons/che-core-commons-schedule/src/main/java/org/eclipse/che/commons/schedule/executor/CronExpression.java b/core/commons/che-core-commons-schedule/src/main/java/org/eclipse/che/commons/schedule/executor/CronExpression.java index e0751c4c2fd..4c479a51f78 100644 --- a/core/commons/che-core-commons-schedule/src/main/java/org/eclipse/che/commons/schedule/executor/CronExpression.java +++ b/core/commons/che-core-commons-schedule/src/main/java/org/eclipse/che/commons/schedule/executor/CronExpression.java @@ -909,14 +909,16 @@ protected String getExpressionSetSummary(java.util.ArrayList list) { } protected int skipWhiteSpace(int i, String s) { - for (; i < s.length() && (s.charAt(i) == ' ' || s.charAt(i) == '\t'); i++) {; + for (; i < s.length() && (s.charAt(i) == ' ' || s.charAt(i) == '\t'); i++) { + ; } return i; } protected int findNextWhiteSpace(int i, String s) { - for (; i < s.length() && (s.charAt(i) != ' ' || s.charAt(i) != '\t'); i++) {; + for (; i < s.length() && (s.charAt(i) != ' ' || s.charAt(i) != '\t'); i++) { + ; } return i; diff --git a/core/commons/che-core-commons-test/pom.xml b/core/commons/che-core-commons-test/pom.xml index 8f293c5936f..556b577e197 100644 --- a/core/commons/che-core-commons-test/pom.xml +++ b/core/commons/che-core-commons-test/pom.xml @@ -17,7 +17,7 @@ che-core-commons-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-commons-test jar diff --git a/core/commons/che-core-commons-tracing/pom.xml b/core/commons/che-core-commons-tracing/pom.xml index c6948ff358c..bdd968ede8f 100644 --- a/core/commons/che-core-commons-tracing/pom.xml +++ b/core/commons/che-core-commons-tracing/pom.xml @@ -17,7 +17,7 @@ che-core-commons-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-commons-tracing Che Core :: Commons :: Tracing diff --git a/core/commons/pom.xml b/core/commons/pom.xml index f5b41815174..a1a46d336b2 100644 --- a/core/commons/pom.xml +++ b/core/commons/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT ../pom.xml che-core-commons-parent diff --git a/core/pom.xml b/core/pom.xml index 5717d1c4a8e..b2a6dc83654 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -17,7 +17,7 @@ che-server org.eclipse.che - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT ../pom.xml org.eclipse.che.core diff --git a/dockerfiles/che/rhel.Dockerfile b/dockerfiles/che/rhel.Dockerfile index 0c982a3d510..5c069b38692 100644 --- a/dockerfiles/che/rhel.Dockerfile +++ b/dockerfiles/che/rhel.Dockerfile @@ -10,7 +10,7 @@ # # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal -FROM registry.access.redhat.com/ubi8-minimal:8.5-204 +FROM registry.access.redhat.com/ubi8-minimal:8.5-218 USER root ENV CHE_HOME=/home/user/eclipse-che ENV JAVA_HOME=/usr/lib/jvm/jre diff --git a/infrastructures/infrastructure-distributed/pom.xml b/infrastructures/infrastructure-distributed/pom.xml index e1b8c43d4cd..f421452cb5a 100644 --- a/infrastructures/infrastructure-distributed/pom.xml +++ b/infrastructures/infrastructure-distributed/pom.xml @@ -17,7 +17,7 @@ che-infrastructures-parent org.eclipse.che.infrastructure - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT infrastructure-distributed jar diff --git a/infrastructures/infrastructure-factory/pom.xml b/infrastructures/infrastructure-factory/pom.xml index ea0dac7f973..e889cd73c83 100644 --- a/infrastructures/infrastructure-factory/pom.xml +++ b/infrastructures/infrastructure-factory/pom.xml @@ -17,7 +17,7 @@ che-infrastructures-parent org.eclipse.che.infrastructure - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT infrastructure-factory jar diff --git a/infrastructures/infrastructure-factory/src/main/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManager.java b/infrastructures/infrastructure-factory/src/main/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManager.java index 27bceadd761..b145d363915 100644 --- a/infrastructures/infrastructure-factory/src/main/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManager.java +++ b/infrastructures/infrastructure-factory/src/main/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManager.java @@ -177,9 +177,7 @@ public Optional get(Subject cheUser, String scmServerUrl) private String getFirstNamespace() throws UnsatisfiedScmPreconditionException, ScmConfigurationPersistenceException { try { - return namespaceFactory - .list() - .stream() + return namespaceFactory.list().stream() .map(KubernetesNamespaceMeta::getName) .findFirst() .orElseThrow( diff --git a/infrastructures/infrastructure-metrics/pom.xml b/infrastructures/infrastructure-metrics/pom.xml index 895ca7f7512..98c1c8c53d7 100644 --- a/infrastructures/infrastructure-metrics/pom.xml +++ b/infrastructures/infrastructure-metrics/pom.xml @@ -17,7 +17,7 @@ che-infrastructures-parent org.eclipse.che.infrastructure - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT ../pom.xml infrastructure-metrics diff --git a/infrastructures/infrastructure-permission/pom.xml b/infrastructures/infrastructure-permission/pom.xml index 22723763c0f..24a327da558 100644 --- a/infrastructures/infrastructure-permission/pom.xml +++ b/infrastructures/infrastructure-permission/pom.xml @@ -17,7 +17,7 @@ che-infrastructures-parent org.eclipse.che.infrastructure - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT infrastructure-permission Infrastructure :: Kubernetes Permissions diff --git a/infrastructures/kubernetes/pom.xml b/infrastructures/kubernetes/pom.xml index 8bacdd2cad3..552c9a04c06 100644 --- a/infrastructures/kubernetes/pom.xml +++ b/infrastructures/kubernetes/pom.xml @@ -17,7 +17,7 @@ che-infrastructures-parent org.eclipse.che.infrastructure - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT infrastructure-kubernetes Infrastructure :: Kubernetes diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntime.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntime.java index 85f6b861194..a23077f74d0 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntime.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntime.java @@ -656,10 +656,7 @@ private void watchLogsIfDebugEnabled(Map startOptions) getContext().getIdentity().getWorkspaceId()); // get all the pods we care about Set podNames = - machines - .getMachines(getContext().getIdentity()) - .values() - .stream() + machines.getMachines(getContext().getIdentity()).values().stream() .filter(Objects::nonNull) .map(KubernetesMachineImpl::getPodName) .filter(Objects::nonNull) @@ -810,8 +807,7 @@ private List getAllInjectablePods( ObjectMeta toCreateMeta, List toCreateContainers, Map> injectables) { - return toCreateContainers - .stream() + return toCreateContainers.stream() .map(c -> Names.machineName(toCreateMeta, c)) .map(injectables::get) // we're only interested in pods for which we require injection @@ -1035,9 +1031,7 @@ protected void handleUnrecoverableEvent(PodEvent podEvent) { */ public boolean isConsistent() throws InfrastructureException { Set podNames = - getInternalMachines() - .values() - .stream() + getInternalMachines().values().stream() .map(KubernetesMachineImpl::getPodName) .collect(Collectors.toSet()); for (String podName : podNames) { diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearch.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearch.java index 535caa5e9dd..18c9aa70f47 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearch.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearch.java @@ -98,13 +98,7 @@ private Stream findContainers(HasMetadata o) { return ((StatefulSet) o).getSpec().getTemplate().getSpec().getContainers().stream(); } else if (o instanceof CronJob) { return ((CronJob) o) - .getSpec() - .getJobTemplate() - .getSpec() - .getTemplate() - .getSpec() - .getContainers() - .stream(); + .getSpec().getJobTemplate().getSpec().getTemplate().getSpec().getContainers().stream(); } else if (o instanceof DeploymentConfig) { return ((DeploymentConfig) o).getSpec().getTemplate().getSpec().getContainers().stream(); } else if (o instanceof Template) { diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/DockerimageComponentToWorkspaceApplier.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/DockerimageComponentToWorkspaceApplier.java index a476e8f1dc8..0a5bf5d3382 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/DockerimageComponentToWorkspaceApplier.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/DockerimageComponentToWorkspaceApplier.java @@ -124,9 +124,7 @@ public void apply( componentObjects, ImmutableMap.of(machineName, machineConfig)); - workspaceConfig - .getCommands() - .stream() + workspaceConfig.getCommands().stream() .filter( c -> componentAlias != null @@ -177,9 +175,7 @@ private List createComponentObjects( dockerimageComponent.getMemoryLimit(), dockerimageComponent.getCpuRequest(), dockerimageComponent.getCpuLimit(), - dockerimageComponent - .getEnv() - .stream() + dockerimageComponent.getEnv().stream() .map(e -> new EnvVar(e.getName(), e.getValue(), null)) .collect(Collectors.toCollection(ArrayList::new)), dockerimageComponent.getCommand(), diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplier.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplier.java index ad41536877c..0acfdeac8ab 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplier.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplier.java @@ -165,8 +165,7 @@ public void apply( prepareComponentObjects(k8sComponent, componentContent); List podsData = getPodDatas(componentObjects); - podsData - .stream() + podsData.stream() .flatMap( e -> Stream.concat( @@ -205,8 +204,7 @@ private List prepareComponentObjects(Component k8sComponent, String } private void applyProjectsVolumes(List podsData, List componentObjects) { - if (componentObjects - .stream() + if (componentObjects.stream() .noneMatch( hasMeta -> hasMeta instanceof PersistentVolumeClaim @@ -221,18 +219,13 @@ private void applyProjectsVolumes(List podsData, List comp } for (PodData podData : podsData) { - if (podData - .getSpec() - .getVolumes() - .stream() + if (podData.getSpec().getVolumes().stream() .noneMatch(volume -> volume.getName().equals(PROJECTS_VOLUME_NAME))) { Volume volume = newVolume(PROJECTS_VOLUME_NAME, PROJECTS_VOLUME_NAME); podData.getSpec().getVolumes().add(volume); } for (Container container : podData.getSpec().getContainers()) { - if (container - .getVolumeMounts() - .stream() + if (container.getVolumeMounts().stream() .noneMatch(mount -> mount.getName().equals(PROJECTS_VOLUME_NAME))) { VolumeMount volumeMount = newVolumeMount(PROJECTS_VOLUME_NAME, projectFolderPath, null); container.getVolumeMounts().add(volumeMount); @@ -282,9 +275,7 @@ private void provisionVolumes( for (org.eclipse.che.api.workspace.server.model.impl.devfile.VolumeImpl componentVolume : component.getVolumes()) { Optional sameNameMount = - container - .getVolumeMounts() - .stream() + container.getVolumeMounts().stream() .filter(vm -> vm.getName().equals(componentVolume.getName())) .findFirst(); if (sameNameMount.isPresent() @@ -299,9 +290,7 @@ private void provisionVolumes( getIdentifiableComponentName(component), container.getName())); } - if (container - .getVolumeMounts() - .stream() + if (container.getVolumeMounts().stream() .anyMatch(vm -> vm.getMountPath().equals(componentVolume.getContainerPath()))) { throw new DevfileException( format( @@ -365,9 +354,7 @@ private String retrieveContent(Component recipeComponent, FileContentProvider fi private void linkCommandsToMachineName( WorkspaceConfig workspaceConfig, Component component, Set machinesNames) { List componentCommands = - workspaceConfig - .getCommands() - .stream() + workspaceConfig.getCommands().stream() .filter( c -> component.getAlias() != null @@ -392,14 +379,12 @@ private void linkCommandsToMachineName( private List getPodDatas(List componentsObjects) { List podsData = new ArrayList<>(); - componentsObjects - .stream() + componentsObjects.stream() .filter(hasMetadata -> hasMetadata instanceof Pod) .map(hasMetadata -> (Pod) hasMetadata) .forEach(p -> podsData.add(new PodData(p))); - componentsObjects - .stream() + componentsObjects.stream() .filter(hasMetadata -> hasMetadata instanceof Deployment) .map(hasMetadata -> (Deployment) hasMetadata) .forEach(d -> podsData.add(new PodData(d))); diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesEnvironmentProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesEnvironmentProvisioner.java index bbbe74a3d95..55e0317d896 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesEnvironmentProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesEnvironmentProvisioner.java @@ -134,8 +134,7 @@ private void mergeProjectsPVC(List envObjects, List co co -> co instanceof PersistentVolumeClaim && co.getMetadata().getName().equals(PROJECTS_VOLUME_NAME) - && envObjects - .stream() + && envObjects.stream() .filter(envObject -> envObject instanceof PersistentVolumeClaim) .anyMatch(pvc -> pvc.equals(co))); } diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/KubernetesRecipeParser.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/KubernetesRecipeParser.java index b37c885162c..4c60dc1c73a 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/KubernetesRecipeParser.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/KubernetesRecipeParser.java @@ -97,8 +97,7 @@ public List parse(String recipeContent) clientFactory.create().load(new ByteArrayInputStream(recipeContent.getBytes())).get(); // needed because Che master namespace is set by K8s API during list loading - parsed - .stream() + parsed.stream() .filter(o -> o.getMetadata() != null) .forEach(o -> o.getMetadata().setNamespace(null)); diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/model/KubernetesMachineImpl.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/model/KubernetesMachineImpl.java index a8b2534f6f4..529c470d161 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/model/KubernetesMachineImpl.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/model/KubernetesMachineImpl.java @@ -92,9 +92,7 @@ public KubernetesMachineImpl( this.status = status; this.attributes = attributes; this.servers = - servers - .entrySet() - .stream() + servers.entrySet().stream() .collect( Collectors.toMap( Map.Entry::getKey, diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesDeployments.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesDeployments.java index 618e435fa0c..df86d5715db 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesDeployments.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesDeployments.java @@ -452,9 +452,7 @@ private void handleStartingPodStatus(CompletableFuture podRunningFuture, P errorMessage.append("The following containers have terminated:\n"); errorMessage.append( - terminatedContainers - .entrySet() - .stream() + terminatedContainers.entrySet().stream() .map(e -> e.getKey() + ": " + e.getValue()) .collect(Collectors.joining("" + "\n"))); } diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespaceFactory.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespaceFactory.java index 01402f7b42d..a480aafe628 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespaceFactory.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespaceFactory.java @@ -144,8 +144,7 @@ public KubernetesNamespaceFactory( if (isNullOrEmpty(defaultNamespaceName)) { throw new ConfigurationException("che.infra.kubernetes.namespace.default must be configured"); - } else if (REQUIRED_NAMESPACE_NAME_PLACEHOLDERS - .stream() + } else if (REQUIRED_NAMESPACE_NAME_PLACEHOLDERS.stream() .noneMatch(defaultNamespaceName::contains)) { throw new ConfigurationException( format( @@ -450,8 +449,7 @@ private Optional findFirstLabeledNamespace(NamespaceResolutionContext re List labeledNamespaces = findPreparedNamespaces(resolutionCtx); if (!labeledNamespaces.isEmpty()) { String foundNamespace = - labeledNamespaces - .stream() + labeledNamespaces.stream() .findFirst() .map(KubernetesNamespaceMeta::getName) .orElseThrow( @@ -542,8 +540,7 @@ protected List findPreparedNamespaces( cheClientFactory.create().namespaces().withLabels(namespaceLabels).list().getItems(); if (!workspaceNamespaces.isEmpty()) { Map evaluatedAnnotations = evaluateAnnotationPlaceholders(namespaceCtx); - return workspaceNamespaces - .stream() + return workspaceNamespaces.stream() .filter(p -> matchesAnnotations(p, evaluatedAnnotations)) .map(this::asNamespaceMeta) .collect(Collectors.toList()); diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/SshKeysConfigurator.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/SshKeysConfigurator.java index a9467159928..0393da52212 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/SshKeysConfigurator.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/SshKeysConfigurator.java @@ -76,8 +76,7 @@ public void configure(NamespaceResolutionContext namespaceResolutionContext, Str List vcsSshPairs = getVcsSshPairs(namespaceResolutionContext); List invalidSshKeyNames = - vcsSshPairs - .stream() + vcsSshPairs.stream() .filter(keyPair -> !isValidSshKeyPair(keyPair)) .map(SshPairImpl::getName) .collect(toList()); diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/CommonPVCStrategy.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/CommonPVCStrategy.java index 5810300a16a..f086c7a0219 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/CommonPVCStrategy.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/CommonPVCStrategy.java @@ -264,10 +264,7 @@ private PersistentVolumeClaim replacePVCsWithCommon( } private Set combineVolumeMountsSubpaths(KubernetesEnvironment k8sEnv) { - return k8sEnv - .getPodsData() - .values() - .stream() + return k8sEnv.getPodsData().values().stream() .flatMap(p -> p.getSpec().getContainers().stream()) .flatMap(c -> c.getVolumeMounts().stream()) .map(VolumeMount::getSubPath) diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/EphemeralWorkspaceAdapter.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/EphemeralWorkspaceAdapter.java index 9784e24517f..11516f403c2 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/EphemeralWorkspaceAdapter.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/EphemeralWorkspaceAdapter.java @@ -70,9 +70,7 @@ public void provision(KubernetesEnvironment k8sEnv, RuntimeIdentity identity) private void replacePVCsWithEmptyDir(KubernetesEnvironment k8sEnv) { for (PodData pod : k8sEnv.getPodsData().values()) { PodSpec podSpec = pod.getSpec(); - podSpec - .getVolumes() - .stream() + podSpec.getVolumes().stream() .filter(v -> v.getPersistentVolumeClaim() != null) .forEach( v -> { diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisioner.java index 5da0a49766b..b43ebbf7093 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisioner.java @@ -195,9 +195,7 @@ private void addMachineVolumes( String pvcName = pvc.getMetadata().getName(); PodSpec podSpec = pod.getSpec(); Optional volumeOpt = - podSpec - .getVolumes() - .stream() + podSpec.getVolumes().stream() .filter( volume -> volume.getPersistentVolumeClaim() != null diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/CertificateProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/CertificateProvisioner.java index 7d63d4fda02..d40b9ec8361 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/CertificateProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/CertificateProvisioner.java @@ -84,9 +84,7 @@ public void provision(KubernetesEnvironment k8sEnv, RuntimeIdentity identity) for (PodData pod : k8sEnv.getPodsData().values()) { if (pod.getRole() == PodRole.DEPLOYMENT) { - if (pod.getSpec() - .getVolumes() - .stream() + if (pod.getSpec().getVolumes().stream() .noneMatch(v -> v.getName().equals(CHE_SELF_SIGNED_CERT_VOLUME))) { pod.getSpec().getVolumes().add(buildCertSecretVolume(selfSignedCertSecretName)); } @@ -102,9 +100,7 @@ public void provision(KubernetesEnvironment k8sEnv, RuntimeIdentity identity) } private void provisionCertVolumeMountIfNeeded(Container container) { - if (container - .getVolumeMounts() - .stream() + if (container.getVolumeMounts().stream() .noneMatch(vm -> vm.getName().equals(CHE_SELF_SIGNED_CERT_VOLUME))) { container.getVolumeMounts().add(buildCertVolumeMount()); } diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesTrustedCAProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesTrustedCAProvisioner.java index 7febebb9f3b..5de2726f078 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesTrustedCAProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesTrustedCAProvisioner.java @@ -127,9 +127,7 @@ public void provision(KubernetesEnvironment k8sEnv, RuntimeIdentity runtimeID) for (PodData pod : k8sEnv.getPodsData().values()) { if (pod.getRole() == PodRole.DEPLOYMENT) { - if (pod.getSpec() - .getVolumes() - .stream() + if (pod.getSpec().getVolumes().stream() .noneMatch(v -> v.getName().equals(CHE_TRUST_STORE_VOLUME))) { pod.getSpec() .getVolumes() @@ -151,9 +149,7 @@ public void provision(KubernetesEnvironment k8sEnv, RuntimeIdentity runtimeID) } private void provisionTrustStoreVolumeMountIfNeeded(Container container) { - if (container - .getVolumeMounts() - .stream() + if (container.getVolumeMounts().stream() .noneMatch(vm -> vm.getName().equals(CHE_TRUST_STORE_VOLUME))) { container .getVolumeMounts() diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/PreviewUrlCommandProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/PreviewUrlCommandProvisioner.java index 8f1ab59b52d..847f2bd47ba 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/PreviewUrlCommandProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/PreviewUrlCommandProvisioner.java @@ -67,8 +67,7 @@ private void injectsPreviewUrlToCommands(E env, KubernetesNamespace namespace) List exposureObjects = loadExposureObjects(namespace); List services = namespace.services().get(); for (CommandImpl command : - env.getCommands() - .stream() + env.getCommands().stream() .filter(c -> c.getPreviewUrl() != null) .collect(Collectors.toList())) { Optional foundService = diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/ProxySettingsProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/ProxySettingsProvisioner.java index 2b74ddca2ff..427fcf96a86 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/ProxySettingsProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/ProxySettingsProvisioner.java @@ -62,10 +62,7 @@ public void provision(KubernetesEnvironment k8sEnv, RuntimeIdentity identity) TracingTags.WORKSPACE_ID.set(identity::getWorkspaceId); if (!proxyEnvVars.isEmpty()) { - k8sEnv - .getPodsData() - .entrySet() - .stream() + k8sEnv.getPodsData().entrySet().stream() // JWTProxy container doesn't need proxy settings since it never does any outbound // requests, and setting of it may fail accessing internal addresses. .filter(entry -> !entry.getKey().equals(JWT_PROXY_POD_NAME)) diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/SshKeysProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/SshKeysProvisioner.java index 91e65dd8d1e..ebdb3178419 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/SshKeysProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/SshKeysProvisioner.java @@ -124,8 +124,7 @@ public void provision(KubernetesEnvironment k8sEnv, RuntimeIdentity identity) allSshPairs.addAll(systemSshPairs); List invalidSshKeyNames = - allSshPairs - .stream() + allSshPairs.stream() .filter(keyPair -> !isValidSshKeyPair(keyPair)) .map(SshPairImpl::getName) .collect(toList()); @@ -220,8 +219,7 @@ private void doProvisionSshKeys( List sshPairs, KubernetesEnvironment k8sEnv, String wsId) { Map data = - sshPairs - .stream() + sshPairs.stream() .filter(sshPair -> !isNullOrEmpty(sshPair.getPrivateKey())) .collect( toMap( diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/UniqueNamesProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/UniqueNamesProvisioner.java index 03d87a0a05d..0cc1126915a 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/UniqueNamesProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/UniqueNamesProvisioner.java @@ -108,9 +108,7 @@ private void rewriteConfigMapNames(PodData pod, Map configMapNam for (Container container : pod.getSpec().getContainers()) { // Can set env vars to key/value pairs in configmap if (container.getEnv() != null) { - container - .getEnv() - .stream() + container.getEnv().stream() .filter( env -> env.getValueFrom() != null && env.getValueFrom().getConfigMapKeyRef() != null) @@ -128,9 +126,7 @@ private void rewriteConfigMapNames(PodData pod, Map configMapNam } if (container.getEnvFrom() != null) { // Can use all entries in configMap as env vars - container - .getEnvFrom() - .stream() + container.getEnvFrom().stream() .filter(envFrom -> envFrom.getConfigMapRef() != null) .forEach( envFrom -> { @@ -145,8 +141,7 @@ private void rewriteConfigMapNames(PodData pod, Map configMapNam // Next update any mounted configMaps List volumes = pod.getSpec().getVolumes(); if (pod.getSpec().getVolumes() != null) { - volumes - .stream() + volumes.stream() .filter(vol -> vol.getConfigMap() != null) .forEach( volume -> { diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/VcsSslCertificateProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/VcsSslCertificateProvisioner.java index f8c29515186..5147c579f64 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/VcsSslCertificateProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/VcsSslCertificateProvisioner.java @@ -104,9 +104,7 @@ public void provision(KubernetesEnvironment k8sEnv, RuntimeIdentity identity) for (PodData pod : k8sEnv.getPodsData().values()) { if (pod.getRole() != PodRole.INJECTABLE) { - if (pod.getSpec() - .getVolumes() - .stream() + if (pod.getSpec().getVolumes().stream() .noneMatch(v -> v.getName().equals(CHE_GIT_SELF_SIGNED_VOLUME))) { pod.getSpec().getVolumes().add(buildCertVolume(selfSignedCertConfigMapName)); } @@ -122,9 +120,7 @@ public void provision(KubernetesEnvironment k8sEnv, RuntimeIdentity identity) } private void provisionCertVolumeMountIfNeeded(Container container) { - if (container - .getVolumeMounts() - .stream() + if (container.getVolumeMounts().stream() .noneMatch(vm -> vm.getName().equals(CHE_GIT_SELF_SIGNED_VOLUME))) { container.getVolumeMounts().add(buildCertVolumeMount()); } diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/env/EnvVarsConverter.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/env/EnvVarsConverter.java index 8621ff23a0b..e3637d0e2e2 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/env/EnvVarsConverter.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/env/EnvVarsConverter.java @@ -58,10 +58,7 @@ public void provision(KubernetesEnvironment k8sEnv, RuntimeIdentity identity) // we need to combine the env vars from the machine config with the variables already // present in the container. Let's key the variables by name and use the map for merging Map envVars = - machineConf - .getEnv() - .entrySet() - .stream() + machineConf.getEnv().entrySet().stream() .map(e -> new EnvVar(e.getKey(), e.getValue(), null)) .collect(toMap(EnvVar::getName, identity())); diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/FileSecretApplier.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/FileSecretApplier.java index 1ad3e2cea42..834733685eb 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/FileSecretApplier.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/FileSecretApplier.java @@ -94,10 +94,7 @@ public void applySecret(KubernetesEnvironment env, RuntimeIdentity runtimeIdenti if (!podData.getRole().equals(PodRole.DEPLOYMENT)) { continue; } - if (podData - .getSpec() - .getVolumes() - .stream() + if (podData.getSpec().getVolumes().stream() .anyMatch(v -> v.getName().equals(volumeFromSecret.getName()))) { volumeFromSecret.setName(volumeFromSecret.getName() + "_" + NameGenerator.generate("", 6)); } @@ -135,10 +132,7 @@ public void applySecret(KubernetesEnvironment env, RuntimeIdentity runtimeIdenti container .getVolumeMounts() .addAll( - secret - .getData() - .keySet() - .stream() + secret.getData().keySet().stream() .map( secretFile -> buildVolumeMount(volumeFromSecret, componentMountPath, secretFile)) diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/KubernetesSecretApplier.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/KubernetesSecretApplier.java index 287592d8f83..4e60d58344f 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/KubernetesSecretApplier.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/KubernetesSecretApplier.java @@ -53,9 +53,7 @@ final Optional getComponent(E env, String containerName) { String componentName = internalMachineConfig.getAttributes().get(DEVFILE_COMPONENT_ALIAS_ATTRIBUTE); if (componentName != null) { - return env.getDevfile() - .getComponents() - .stream() + return env.getDevfile().getComponents().stream() .filter(c -> componentName.equals(c.getAlias())) .findFirst(); } diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/KubernetesServerExposer.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/KubernetesServerExposer.java index 7e519d03e1e..f0b3e7e6369 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/KubernetesServerExposer.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/KubernetesServerExposer.java @@ -336,9 +336,7 @@ private void exposeSecureServers( private Map match( Map servers, ServicePort servicePort) { int port = servicePort.getTargetPort().getIntVal(); - return servers - .entrySet() - .stream() + return servers.entrySet().stream() .filter(e -> parseInt(e.getValue().getPort().split("/")[0]) == port) .collect(toMap(Map.Entry::getKey, Map.Entry::getValue)); } @@ -356,9 +354,7 @@ private ServicePort getServicePort(ServerConfig serverConfig) { } private void exposeInContainerIfNeeded(ServicePort servicePort) { - if (container - .getPorts() - .stream() + if (container.getPorts().stream() .noneMatch( p -> p.getContainerPort().equals(servicePort.getPort()) diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/PreviewUrlExposer.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/PreviewUrlExposer.java index aff7c12db8f..e4da8de4ffb 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/PreviewUrlExposer.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/PreviewUrlExposer.java @@ -59,8 +59,7 @@ protected PreviewUrlExposer(ExternalServerExposer externalServerExposer) { public void expose(T env) throws InternalInfrastructureException { List previewUrlCommands = - env.getCommands() - .stream() + env.getCommands().stream() .filter(c -> c.getPreviewUrl() != null) .collect(Collectors.toList()); diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/external/CombinedSingleHostServerExposer.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/external/CombinedSingleHostServerExposer.java index 04ada93e246..7bc500951aa 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/external/CombinedSingleHostServerExposer.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/external/CombinedSingleHostServerExposer.java @@ -87,9 +87,7 @@ public void expose( @Override public Map getStrategyConformingServers( Map externalServers) { - return externalServers - .entrySet() - .stream() + return externalServers.entrySet().stream() .filter(e -> !e.getValue().isRequireSubdomain()) .collect(toMap(Map.Entry::getKey, Map.Entry::getValue)); } @@ -97,9 +95,7 @@ public Map getStrategyConformingServers( @Override public Map getServersRequiringSubdomain( Map externalServers) { - return externalServers - .entrySet() - .stream() + return externalServers.entrySet().stream() .filter(e -> e.getValue().isRequireSubdomain()) .collect(toMap(Map.Entry::getKey, Map.Entry::getValue)); } diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/resolver/AbstractServerResolver.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/resolver/AbstractServerResolver.java index 6e0a76c505a..492021ff3ee 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/resolver/AbstractServerResolver.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/resolver/AbstractServerResolver.java @@ -83,9 +83,7 @@ public final Map resolve(String machineName) { } private Map resolveInternalServers(String machineName) { - return services - .get(machineName) - .stream() + return services.get(machineName).stream() .map(this::resolveServiceServers) .flatMap(s -> s.entrySet().stream()) .collect(Collectors.toMap(Entry::getKey, Entry::getValue, (s1, s2) -> s2)); diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/resolver/ConfigMapServerResolver.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/resolver/ConfigMapServerResolver.java index 6d59d24b8a5..c0100a93683 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/resolver/ConfigMapServerResolver.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/resolver/ConfigMapServerResolver.java @@ -54,9 +54,7 @@ public Map resolveExternalServers(String machineName) { Map serverMap = new HashMap<>(); serverMap.putAll(nativeServerResolver.resolveExternalServers(machineName)); serverMap.putAll( - configMaps - .get(machineName) - .stream() + configMaps.get(machineName).stream() .map(this::fillGatewayServers) .flatMap(m -> m.entrySet().stream()) .collect(Collectors.toMap(Entry::getKey, Entry::getValue, (s1, s2) -> s2))); diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/resolver/IngressServerResolver.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/resolver/IngressServerResolver.java index 20ff7381b82..540690c9e78 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/resolver/IngressServerResolver.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/resolver/IngressServerResolver.java @@ -59,9 +59,7 @@ public IngressServerResolver( @Override public Map resolveExternalServers(String machineName) { - return ingresses - .get(machineName) - .stream() + return ingresses.get(machineName).stream() .map(this::fillIngressServers) .flatMap(m -> m.entrySet().stream()) .collect(Collectors.toMap(Entry::getKey, Entry::getValue, (v1, v2) -> v2)); diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/util/Services.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/util/Services.java index de8ba5da0e3..ec6883feddb 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/util/Services.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/util/Services.java @@ -29,10 +29,7 @@ public static Optional findPort(Service service, int port) { if (service == null || service.getSpec() == null || service.getSpec().getPorts() == null) { return Optional.empty(); } - return service - .getSpec() - .getPorts() - .stream() + return service.getSpec().getPorts().stream() .filter(p -> p.getPort() != null && p.getPort() == port) .findFirst(); } diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/util/UnrecoverablePodEventListenerFactory.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/util/UnrecoverablePodEventListenerFactory.java index c67ad591e54..4f5937b6e15 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/util/UnrecoverablePodEventListenerFactory.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/util/UnrecoverablePodEventListenerFactory.java @@ -62,10 +62,7 @@ public UnrecoverablePodEventListener create( } Set toWatch = - environment - .getPodsData() - .values() - .stream() + environment.getPodsData().values().stream() .map(podData -> podData.getMetadata().getName()) .collect(Collectors.toSet()); diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/ChePluginsVolumeApplier.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/ChePluginsVolumeApplier.java index 3fbc07c65ea..ffe66963474 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/ChePluginsVolumeApplier.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/ChePluginsVolumeApplier.java @@ -82,9 +82,7 @@ private io.fabric8.kubernetes.api.model.Volume provisionPVCPodVolume( PodSpec podSpec = pod.getSpec(); Optional volumeOpt = - podSpec - .getVolumes() - .stream() + podSpec.getVolumes().stream() .filter( vm -> vm.getPersistentVolumeClaim() != null @@ -101,9 +99,7 @@ private io.fabric8.kubernetes.api.model.Volume provisionPVCPodVolume( } private void addEmptyDirVolumeIfAbsent(PodSpec podSpec, String uniqueVolumeName) { - if (podSpec - .getVolumes() - .stream() + if (podSpec.getVolumes().stream() .noneMatch(volume -> volume.getName().equals(uniqueVolumeName))) { podSpec .getVolumes() diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolver.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolver.java index e8be56bf91a..70a52d752d2 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolver.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolver.java @@ -180,8 +180,7 @@ private void provisionCpuRequest(Container container, CheContainer cheContainer) } private List getContainerPorts() { - return containerEndpoints - .stream() + return containerEndpoints.stream() .map( endpoint -> new ContainerPortBuilder() diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolverBuilder.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolverBuilder.java index d45ee9261a7..6573a088192 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolverBuilder.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolverBuilder.java @@ -55,8 +55,7 @@ private List getContainerEndpoints( if (ports == null || ports.isEmpty()) { return Collections.emptyList(); } - return ports - .stream() + return ports.stream() .map(CheContainerPort::getExposedPort) .flatMap(port -> endpoints.stream().filter(e -> e.getTargetPort() == port)) .collect(Collectors.toList()); diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/KubernetesPluginsToolingApplier.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/KubernetesPluginsToolingApplier.java index 35f52190e5b..835c31a38df 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/KubernetesPluginsToolingApplier.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/KubernetesPluginsToolingApplier.java @@ -136,10 +136,7 @@ public void apply( CommandsResolver commandsResolver = new CommandsResolver(k8sEnv); for (ChePlugin chePlugin : chePlugins) { Map devfilePlugins = - k8sEnv - .getDevfile() - .getComponents() - .stream() + k8sEnv.getDevfile().getComponents().stream() .filter(c -> c.getType().equals("cheEditor") || c.getType().equals("chePlugin")) .collect(Collectors.toMap(ComponentImpl::getId, Function.identity())); if (!devfilePlugins.containsKey(chePlugin.getId())) { @@ -192,10 +189,7 @@ private void populateWorkspaceEnvVars( ChePlugin chePlugin, KubernetesEnvironment kubernetesEnvironment) { List workspaceEnv = toK8sEnvVars(chePlugin.getWorkspaceEnv()); - kubernetesEnvironment - .getPodsData() - .values() - .stream() + kubernetesEnvironment.getPodsData().values().stream() .flatMap(pod -> pod.getSpec().getContainers().stream()) .forEach(container -> container.getEnv().addAll(workspaceEnv)); } @@ -205,8 +199,7 @@ private List toK8sEnvVars( if (workspaceEnv == null) { return emptyList(); } - return workspaceEnv - .stream() + return workspaceEnv.stream() .map(e -> new EnvVar(e.getName(), e.getValue(), null)) .collect(Collectors.toList()); } @@ -280,9 +273,7 @@ private void addSidecar( org.eclipse.che.api.core.model.workspace.config.Command.MACHINE_NAME_ATTRIBUTE, machineName)); - container - .getCommands() - .stream() + container.getCommands().stream() .map(c -> asCommand(machineName, c)) .forEach(c -> k8sEnv.getCommands().add(c)); diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesArtifactsBrokerApplierTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesArtifactsBrokerApplierTest.java index 5338af452b7..bed701e2a39 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesArtifactsBrokerApplierTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesArtifactsBrokerApplierTest.java @@ -145,10 +145,7 @@ public void shouldAddBrokerConfigMapsToWorkspaceEnvironment() throws Exception { assertNotNull(workspaceConfigMap); assertFalse(workspaceConfigMap.getData().isEmpty()); assertTrue( - workspaceConfigMap - .getData() - .entrySet() - .stream() + workspaceConfigMap.getData().entrySet().stream() .allMatch(e -> brokerConfigMap.getData().get(e.getKey()).equals(e.getValue()))); } diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntimeTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntimeTest.java index 5d588113b9e..d33bfe40848 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntimeTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntimeTest.java @@ -1003,12 +1003,7 @@ public void testInjectablePodsMergedIntoRuntimePods() throws Exception { assertEquals(depls.size(), 1); Deployment deployedPod = depls.get(0); List containerNames = - deployedPod - .getSpec() - .getTemplate() - .getSpec() - .getContainers() - .stream() + deployedPod.getSpec().getTemplate().getSpec().getContainers().stream() .map(Container::getName) .collect(toList()); @@ -1060,12 +1055,7 @@ public void testMultipleMachinesRequiringSamePodInjectionResultInOnePodInjected( assertEquals(depls.size(), 1); Deployment deployedPod = depls.get(0); List containerNames = - deployedPod - .getSpec() - .getTemplate() - .getSpec() - .getContainers() - .stream() + deployedPod.getSpec().getTemplate().getSpec().getContainers().stream() .map(Container::getName) .collect(toList()); @@ -1155,12 +1145,7 @@ WORKSPACE_POD_NAME, mockDeployment(singletonList(mockContainer(CONTAINER_NAME_1) assertEquals(depls.size(), 1); Deployment deployedPod = depls.get(0); List containerNames = - deployedPod - .getSpec() - .getTemplate() - .getSpec() - .getContainers() - .stream() + deployedPod.getSpec().getTemplate().getSpec().getContainers().stream() .map(Container::getName) .collect(toList()); @@ -1528,9 +1513,7 @@ public void updateMachineStatus( @Override public Map getMachines(RuntimeIdentity runtimeIdentity) { - return machines - .entrySet() - .stream() + return machines.entrySet().stream() .filter(e -> e.getKey().getWorkspaceId().equals(runtimeIdentity.getWorkspaceId())) .collect(toMap(e -> e.getValue().getName(), Entry::getValue)); } diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/cache/tck/KubernetesMachinesCacheTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/cache/tck/KubernetesMachinesCacheTest.java index 3b5eb0c7f6c..29408c10f2c 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/cache/tck/KubernetesMachinesCacheTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/cache/tck/KubernetesMachinesCacheTest.java @@ -241,10 +241,7 @@ public void shouldUpdateMachineStatus() throws Exception { // then Optional machineOpt = - machineCache - .getMachines(runtimeId) - .entrySet() - .stream() + machineCache.getMachines(runtimeId).entrySet().stream() .filter(e -> e.getKey().equals(machineName)) .map(Map.Entry::getValue) .findAny(); diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearchTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearchTest.java index fc77fd986e3..4d57dab4a87 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearchTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearchTest.java @@ -355,8 +355,7 @@ public void shouldConsiderEmptySelectorAsNotPresent() { } private static void assertContainsContainer(Collection containers, String name) { - containers - .stream() + containers.stream() .filter(c -> name.equals(c.getName())) .findAny() .orElseThrow( diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplierTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplierTest.java index 532646602f3..a7b9cd0d580 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplierTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/KubernetesComponentToWorkspaceApplierTest.java @@ -262,9 +262,7 @@ public void shouldProvisionProjectVolumesIfSpecifiedIntoK8SList() throws Excepti } // Make sure volume is created assertTrue( - p.getSpec() - .getVolumes() - .stream() + p.getSpec().getVolumes().stream() .anyMatch( v -> v.getName().equals(PROJECTS_VOLUME_NAME) @@ -274,8 +272,7 @@ public void shouldProvisionProjectVolumesIfSpecifiedIntoK8SList() throws Excepti for (Container c : p.getSpec().getContainers()) { assertEquals(c.getImagePullPolicy(), "Always"); assertTrue( - c.getVolumeMounts() - .stream() + c.getVolumeMounts().stream() .anyMatch( vm -> vm.getName().equals(PROJECTS_VOLUME_NAME) @@ -308,18 +305,12 @@ public void shouldProvisionDevfileVolumesIfSpecifiedIntoMachineConfig() throws E for (MachineConfig config : configMaps.values()) { assertEquals(config.getVolumes().size(), 2); assertTrue( - config - .getVolumes() - .entrySet() - .stream() + config.getVolumes().entrySet().stream() .anyMatch( entry -> entry.getKey().equals("foo") && entry.getValue().getPath().equals("/foo1"))); assertTrue( - config - .getVolumes() - .entrySet() - .stream() + config.getVolumes().entrySet().stream() .anyMatch( entry -> entry.getKey().equals("bar") && entry.getValue().getPath().equals("/bar1"))); @@ -423,9 +414,7 @@ public void shouldProvisionMachinesMapWithComponentAttributePreSet() throws Exce verify(k8sEnvProvisioner).provision(any(), any(), any(), mapCaptor.capture()); Map machines = mapCaptor.getValue(); assertTrue( - machines - .values() - .stream() + machines.values().stream() .allMatch( config -> config @@ -809,8 +798,7 @@ private KubernetesList toK8SList(String content) { } private void replaceImagePullPolicy(KubernetesList list, String imagePullPolicy) { - list.getItems() - .stream() + list.getItems().stream() .filter(item -> item instanceof Pod) .map(item -> (Pod) item) .filter(pod -> pod.getSpec() != null) diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/KubernetesEnvironmentFactoryTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/KubernetesEnvironmentFactoryTest.java index 8b25667d420..08b864314f0 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/KubernetesEnvironmentFactoryTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/KubernetesEnvironmentFactoryTest.java @@ -360,10 +360,7 @@ public void shouldReconfigureServiceToMatchMergedDeployment() throws Exception { PodData mergedPodData = k8sEnv.getPodsData().get("merged"); assertEquals(mergedPodData.getMetadata().getLabels().get(DEPLOYMENT_NAME_LABEL), "merged"); assertTrue( - k8sEnv - .getServices() - .values() - .stream() + k8sEnv.getServices().values().stream() .allMatch( s -> ImmutableMap.of(DEPLOYMENT_NAME_LABEL, "merged") diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/PodMergerTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/PodMergerTest.java index a0220e39cbe..8c1f458ec04 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/PodMergerTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/environment/PodMergerTest.java @@ -277,8 +277,7 @@ public void shouldNotAddImagePullPolicyTwice() throws Exception { public void shouldBeAbleToMergeTerminationGracePeriodS( List terminationGracePeriods, Long expectedResultLong) throws ValidationException { List podData = - terminationGracePeriods - .stream() + terminationGracePeriods.stream() .map( p -> new PodData( diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespaceFactoryTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespaceFactoryTest.java index e09f22415d5..5e01b4bbf28 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespaceFactoryTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesNamespaceFactoryTest.java @@ -892,9 +892,7 @@ public void shouldBindToAllConfiguredClusterRoles() throws Exception { "exec")); RoleBindingList bindings = k8sClient.rbac().roleBindings().inNamespace("workspace123").list(); assertEquals( - bindings - .getItems() - .stream() + bindings.getItems().stream() .map(r -> r.getMetadata().getName()) .collect(Collectors.toSet()), Sets.newHashSet( @@ -941,13 +939,7 @@ public void shouldCreateAndBindCredentialsSecretRole() throws Exception { // then Optional roleOptional = - k8sClient - .rbac() - .roles() - .inNamespace("workspace123") - .list() - .getItems() - .stream() + k8sClient.rbac().roles().inNamespace("workspace123").list().getItems().stream() .filter(r -> r.getMetadata().getName().equals(SECRETS_ROLE_NAME)) .findAny(); assertTrue(roleOptional.isPresent()); @@ -957,13 +949,7 @@ public void shouldCreateAndBindCredentialsSecretRole() throws Exception { assertEquals(rule.getApiGroups(), singletonList("")); assertEquals(rule.getVerbs(), Arrays.asList("get", "patch")); assertTrue( - k8sClient - .rbac() - .roleBindings() - .inNamespace("workspace123") - .list() - .getItems() - .stream() + k8sClient.rbac().roleBindings().inNamespace("workspace123").list().getItems().stream() .anyMatch(rb -> rb.getMetadata().getName().equals("serviceAccount-secrets"))); } @@ -1024,9 +1010,7 @@ public void shouldCreateExecAndViewRolesAndBindings() throws Exception { RoleBindingList bindings = k8sClient.rbac().roleBindings().inNamespace("workspace123").list(); assertEquals( - bindings - .getItems() - .stream() + bindings.getItems().stream() .map(r -> r.getMetadata().getName()) .collect(Collectors.toSet()), Sets.newHashSet( diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesWorkspaceServiceAccountTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesWorkspaceServiceAccountTest.java index 47d1c4c215a..23c9916d5fa 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesWorkspaceServiceAccountTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/KubernetesWorkspaceServiceAccountTest.java @@ -115,8 +115,7 @@ public void shouldCreateMetricsRoleIfAPIEnabledOnServer() throws Exception { RoleBindingList rbl = k8sClient.rbac().roleBindings().inNamespace(NAMESPACE).list(); assertTrue( - rbl.getItems() - .stream() + rbl.getItems().stream() .anyMatch(rb -> rb.getMetadata().getName().equals(SA_NAME + "-metrics"))); } @@ -137,8 +136,7 @@ public void shouldNotCreateMetricsRoleIfAPINotEnabledOnServer() throws Exception RoleBindingList rbl = k8sClient.rbac().roleBindings().inNamespace(NAMESPACE).list(); assertTrue( - rbl.getItems() - .stream() + rbl.getItems().stream() .noneMatch(rb -> rb.getMetadata().getName().equals(SA_NAME + "-metrics"))); } @@ -153,8 +151,7 @@ public void shouldCreateCredentialsSecretRole() throws Exception { // then RoleList rl = k8sClient.rbac().roles().inNamespace(NAMESPACE).list(); Optional roleOptional = - rl.getItems() - .stream() + rl.getItems().stream() .filter(r -> r.getMetadata().getName().equals(SECRETS_ROLE_NAME)) .findFirst(); assertTrue(roleOptional.isPresent()); @@ -166,8 +163,7 @@ public void shouldCreateCredentialsSecretRole() throws Exception { RoleBindingList rbl = k8sClient.rbac().roleBindings().inNamespace(NAMESPACE).list(); assertTrue( - rbl.getItems() - .stream() + rbl.getItems().stream() .anyMatch(rb -> rb.getMetadata().getName().equals(SA_NAME + "-secrets"))); } @@ -182,8 +178,7 @@ public void shouldCreatePreferencesConfigmapRole() throws Exception { // then RoleList rl = k8sClient.rbac().roles().inNamespace(NAMESPACE).list(); Optional roleOptional = - rl.getItems() - .stream() + rl.getItems().stream() .filter(r -> r.getMetadata().getName().equals(CONFIGMAPS_ROLE_NAME)) .findFirst(); assertTrue(roleOptional.isPresent()); @@ -195,8 +190,7 @@ public void shouldCreatePreferencesConfigmapRole() throws Exception { RoleBindingList rbl = k8sClient.rbac().roleBindings().inNamespace(NAMESPACE).list(); assertTrue( - rbl.getItems() - .stream() + rbl.getItems().stream() .anyMatch(rb -> rb.getMetadata().getName().equals(SA_NAME + "-configmaps"))); } } diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/WorkspaceServiceAccountConfiguratorTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/WorkspaceServiceAccountConfiguratorTest.java index eaf57870af5..59888263eaa 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/WorkspaceServiceAccountConfiguratorTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/WorkspaceServiceAccountConfiguratorTest.java @@ -99,8 +99,7 @@ public void createWorkspaceServiceAccountWithBindings() assertEquals( roleBindings.size(), 6, - roleBindings - .stream() + roleBindings.stream() .map(r -> r.getMetadata().getName()) .collect(joining(", "))); // exec, secrets, configmaps, view bindings + cr1, cr2 } @@ -129,8 +128,7 @@ public void dontCreateBindingsWhenClusterRolesDontExists() throws Infrastructure assertEquals( roleBindings.size(), 4, - roleBindings - .stream() + roleBindings.stream() .map(r -> r.getMetadata().getName()) .collect(joining(", "))); // exec, secrets, configmaps, view bindings } diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisionerTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisionerTest.java index b4e16ca1e71..5e8dc37b002 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisionerTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/PVCProvisionerTest.java @@ -323,9 +323,7 @@ private static PersistentVolumeClaim newPVC(String name, Map lab private PersistentVolumeClaim findPvc( String volumeName, Map claims) { - return claims - .values() - .stream() + return claims.values().stream() .filter(c -> volumeName.equals(c.getMetadata().getLabels().get(CHE_VOLUME_NAME_LABEL))) .findAny() .orElse(null); diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/ProxySettingsProvisionerTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/ProxySettingsProvisionerTest.java index f96305d5a98..083fb392114 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/ProxySettingsProvisionerTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/ProxySettingsProvisionerTest.java @@ -68,10 +68,7 @@ public void shouldApplyProxySettingsToAllContainers() throws Exception { provisioner.provision(k8sEnv, runtimeId); assertTrue( - k8sEnv - .getPodsData() - .values() - .stream() + k8sEnv.getPodsData().values().stream() .flatMap(pod -> pod.getSpec().getContainers().stream()) .allMatch( container -> @@ -94,10 +91,7 @@ public void shouldNotApplyProxySettingsToJWTProxyContainer() throws Exception { provisioner.provision(k8sEnv, runtimeId); assertTrue( - k8sEnv - .getPodsData() - .values() - .stream() + k8sEnv.getPodsData().values().stream() .filter(pod -> pod.getMetadata().getName().equals(JWT_PROXY_POD_NAME)) .flatMap(pod -> pod.getSpec().getContainers().stream()) .noneMatch( @@ -122,10 +116,7 @@ public void shouldApplyProxySettingsToInitContainers() throws Exception { provisioner.provision(k8sEnv, runtimeId); assertTrue( - k8sEnv - .getPodsData() - .values() - .stream() + k8sEnv.getPodsData().values().stream() .flatMap( pod -> Stream.concat( diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/VcsSslCertificateProvisionerTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/VcsSslCertificateProvisionerTest.java index ac365c5cfce..af7e8bcfc24 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/VcsSslCertificateProvisionerTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/VcsSslCertificateProvisionerTest.java @@ -158,10 +158,7 @@ public void shouldNotAddVolumeButAddVolumeMountsToInjectablePods() throws Except } for (Pod pod : - k8sEnv - .getInjectablePodsCopy() - .values() - .stream() + k8sEnv.getInjectablePodsCopy().values().stream() .flatMap(v -> v.values().stream()) .toArray(Pod[]::new)) { assertTrue(pod.getSpec().getVolumes().isEmpty()); diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/KubernetesServerExposerTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/KubernetesServerExposerTest.java index 8334016c584..3e4dd4331f8 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/KubernetesServerExposerTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/KubernetesServerExposerTest.java @@ -514,10 +514,7 @@ private void assertThatExternalServersAreExposed( assertEquals(serviceAnnotations.machineName(), machineName); // check that we did not create servers for public endpoints assertFalse( - serviceAnnotations - .servers() - .keySet() - .stream() + serviceAnnotations.servers().keySet().stream() .anyMatch(key -> expectedServers.containsKey(key))); verify(externalServerExposer) @@ -547,10 +544,7 @@ private void assertThatSecureServerIsExposed( // ensure that no service port is exposed assertTrue( - service - .getSpec() - .getPorts() - .stream() + service.getSpec().getPorts().stream() .noneMatch(p -> p.getTargetPort().getIntVal().equals(port))); ServicePort servicePort = @@ -600,9 +594,7 @@ private void assertThatInternalServerIsExposed( private void assertThatContainerPortIsExposed(String portProtocol, Integer port) { assertTrue( - container - .getPorts() - .stream() + container.getPorts().stream() .anyMatch( p -> p.getContainerPort().equals(port) @@ -622,10 +614,7 @@ private Service findContainerRelatedService() { private ServicePort assertThatServicePortIsExposed(Integer port, Service service) { Optional servicePortOpt = - service - .getSpec() - .getPorts() - .stream() + service.getSpec().getPorts().stream() .filter(p -> p.getTargetPort().getIntVal().equals(port)) .findAny(); assertTrue(servicePortOpt.isPresent()); diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolverTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolverTest.java index 6833b7ea256..956cba77f76 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolverTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolverTest.java @@ -167,17 +167,13 @@ private static ResourceRequirements toK8sCPULimitRequestResources(String cpuLimi } private List toSidecarEnvVars(Map envVars) { - return envVars - .entrySet() - .stream() + return envVars.entrySet().stream() .map(entry -> new EnvVar().name(entry.getKey()).value(entry.getValue())) .collect(Collectors.toList()); } private List toK8sEnvVars(Map envVars) { - return envVars - .entrySet() - .stream() + return envVars.entrySet().stream() .map( entry -> new io.fabric8.kubernetes.api.model.EnvVar(entry.getKey(), entry.getValue(), null)) diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/KubernetesPluginsToolingApplierTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/KubernetesPluginsToolingApplierTest.java index db541738d3e..7622351bb31 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/KubernetesPluginsToolingApplierTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/KubernetesPluginsToolingApplierTest.java @@ -966,8 +966,7 @@ private void verifyNumberOfMachinesWithSpecificNumberOfVolumes( Collection machineConfigs, int numberOfMachines, int numberOfVolumes) { long numberOfMatchingMachines = - machineConfigs - .stream() + machineConfigs.stream() .filter(machineConfig -> machineConfig.getVolumes().size() == numberOfVolumes) .count(); assertEquals(numberOfMatchingMachines, numberOfMachines); @@ -1002,9 +1001,7 @@ private Collection getNonUserMachines( InternalEnvironment internalEnvironment) { Map machines = internalEnvironment.getMachines(); Map nonUserMachines = - machines - .entrySet() - .stream() + machines.entrySet().stream() .filter(entry -> !USER_MACHINE_NAME.equals(entry.getKey())) .collect(Collectors.toMap(Entry::getKey, Entry::getValue)); return nonUserMachines.values(); @@ -1019,9 +1016,7 @@ private InternalMachineConfig getOneAndOnlyNonUserMachine( private List getNonUserContainers(KubernetesEnvironment kubernetesEnvironment) { Pod pod = kubernetesEnvironment.getPodsCopy().values().iterator().next(); - return pod.getSpec() - .getContainers() - .stream() + return pod.getSpec().getContainers().stream() .filter(container -> userContainer != container) .collect(Collectors.toList()); } @@ -1057,8 +1052,7 @@ private void addPortToSingleContainerPlugin( .targetPort(port); plugin.getEndpoints().add(endpoint); List ports = plugin.getContainers().get(0).getPorts(); - if (ports - .stream() + if (ports.stream() .map(CheContainerPort::getExposedPort) .noneMatch(integer -> integer == port)) { ports.add(new CheContainerPort().exposedPort(port)); diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/SidecarServicesProvisionerTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/SidecarServicesProvisionerTest.java index 8b9706398f6..db40408d0df 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/SidecarServicesProvisionerTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/SidecarServicesProvisionerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -117,8 +117,7 @@ public void shouldNotDuplicateServicesWhenThereIsConflictingServiceInK8sEnv() th } private Map toK8sServices(List endpoints) { - return endpoints - .stream() + return endpoints.stream() .map(this::createService) .collect(toMap(s -> s.getMetadata().getName(), Function.identity())); } diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/brokerphases/BrokerEnvironmentFactoryTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/brokerphases/BrokerEnvironmentFactoryTest.java index b0c9715539e..234307ecc9d 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/brokerphases/BrokerEnvironmentFactoryTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/brokerphases/BrokerEnvironmentFactoryTest.java @@ -118,10 +118,7 @@ public void testMetadataBrokerSelfSignedCertificate() throws Exception { BrokersConfigs brokersConfigs = captor.getValue(); List containers = - brokersConfigs - .pods - .values() - .stream() + brokersConfigs.pods.values().stream() .flatMap(p -> p.getSpec().getContainers().stream()) .collect(Collectors.toList()); assertEquals(containers.size(), 1); @@ -160,10 +157,7 @@ public void testArtifactsBrokerSelfSignedCertificate() throws Exception { BrokersConfigs brokersConfigs = captor.getValue(); List containers = - brokersConfigs - .pods - .values() - .stream() + brokersConfigs.pods.values().stream() .flatMap(p -> p.getSpec().getContainers().stream()) .collect(Collectors.toList()); assertEquals(containers.size(), 1); @@ -200,10 +194,7 @@ public void testAddsMergeArgToArtifactsBroker() throws Exception { BrokersConfigs brokersConfigs = captor.getValue(); List containers = - brokersConfigs - .pods - .values() - .stream() + brokersConfigs.pods.values().stream() .flatMap(p -> p.getSpec().getContainers().stream()) .collect(Collectors.toList()); assertEquals(containers.size(), 1); @@ -225,10 +216,7 @@ public void testAddsMergeArgToMetadataBroker() throws Exception { BrokersConfigs brokersConfigs = captor.getValue(); List containers = - brokersConfigs - .pods - .values() - .stream() + brokersConfigs.pods.values().stream() .flatMap(p -> p.getSpec().getContainers().stream()) .collect(Collectors.toList()); assertEquals(containers.size(), 1); @@ -394,10 +382,7 @@ public void testQuotasBroker() throws Exception { BrokersConfigs brokersConfigs = captor.getValue(); List containers = - brokersConfigs - .pods - .values() - .stream() + brokersConfigs.pods.values().stream() .flatMap(p -> p.getSpec().getContainers().stream()) .collect(Collectors.toList()); assertEquals(containers.size(), 1); diff --git a/infrastructures/openshift/pom.xml b/infrastructures/openshift/pom.xml index da3a88a203f..82c575d8b62 100644 --- a/infrastructures/openshift/pom.xml +++ b/infrastructures/openshift/pom.xml @@ -17,7 +17,7 @@ che-infrastructures-parent org.eclipse.che.infrastructure - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT infrastructure-openshift Infrastructure :: OpenShift diff --git a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/environment/OpenShiftEnvironmentValidator.java b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/environment/OpenShiftEnvironmentValidator.java index 7bf2519f40f..815339d46c6 100644 --- a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/environment/OpenShiftEnvironmentValidator.java +++ b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/environment/OpenShiftEnvironmentValidator.java @@ -40,9 +40,7 @@ public void validate(OpenShiftEnvironment env) throws ValidationException { private void validateRoutesMatchServices(OpenShiftEnvironment env) throws ValidationException { Set recipeServices = - env.getServices() - .values() - .stream() + env.getServices().values().stream() .map(s -> s.getMetadata().getName()) .collect(Collectors.toSet()); for (Route route : env.getRoutes().values()) { diff --git a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/project/OpenShiftProjectFactory.java b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/project/OpenShiftProjectFactory.java index 673ccb3b815..494c23e95c8 100644 --- a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/project/OpenShiftProjectFactory.java +++ b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/project/OpenShiftProjectFactory.java @@ -193,8 +193,7 @@ protected List findPreparedNamespaces( clientFactory.createOC().projects().withLabels(namespaceLabels).list().getItems(); if (!workspaceProjects.isEmpty()) { Map evaluatedAnnotations = evaluateAnnotationPlaceholders(namespaceCtx); - return workspaceProjects - .stream() + return workspaceProjects.stream() .filter(p -> matchesAnnotations(p, evaluatedAnnotations)) .map(this::asNamespaceMeta) .collect(Collectors.toList()); diff --git a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/server/RouteServerResolver.java b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/server/RouteServerResolver.java index 5f7afc88ba8..22749bbf280 100644 --- a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/server/RouteServerResolver.java +++ b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/server/RouteServerResolver.java @@ -52,9 +52,7 @@ public RouteServerResolver(List services, List routes) { @Override public Map resolveExternalServers(String machineName) { - return routes - .get(machineName) - .stream() + return routes.get(machineName).stream() .map(r -> resolveRouteServers(machineName, r)) .flatMap(m -> m.entrySet().stream()) .collect(Collectors.toMap(Entry::getKey, Entry::getValue, (v1, v2) -> v2)); diff --git a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/environment/OpenShiftEnvironmentFactoryTest.java b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/environment/OpenShiftEnvironmentFactoryTest.java index bb39e144835..019c2a6888a 100644 --- a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/environment/OpenShiftEnvironmentFactoryTest.java +++ b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/environment/OpenShiftEnvironmentFactoryTest.java @@ -360,10 +360,7 @@ public void shouldReconfigureServiceToMatchMergedDeployment() throws Exception { PodData mergedPodData = k8sEnv.getPodsData().get("merged"); assertEquals(mergedPodData.getMetadata().getLabels().get(DEPLOYMENT_NAME_LABEL), "merged"); assertTrue( - k8sEnv - .getServices() - .values() - .stream() + k8sEnv.getServices().values().stream() .allMatch( s -> ImmutableMap.of(DEPLOYMENT_NAME_LABEL, "merged") diff --git a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/provision/OpenshiftTrustedCAProvisionerTest.java b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/provision/OpenshiftTrustedCAProvisionerTest.java index 9cfcca97bc6..3f63a13a766 100644 --- a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/provision/OpenshiftTrustedCAProvisionerTest.java +++ b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/provision/OpenshiftTrustedCAProvisionerTest.java @@ -166,9 +166,7 @@ public void shouldProvisionTrustStoreMapAndMountIt() throws Exception { assertEquals(podSpec.getVolumes().size(), 1); assertEquals(podSpec.getVolumes().get(0).getConfigMap().getName(), CONFIGMAP_NAME); assertTrue( - podSpec - .getContainers() - .stream() + podSpec.getContainers().stream() .allMatch( c -> c.getVolumeMounts().get(0).getMountPath().equals(CERTIFICATE_MOUNT_PATH))); } diff --git a/infrastructures/pom.xml b/infrastructures/pom.xml index f5623b67c84..b5fce906b10 100644 --- a/infrastructures/pom.xml +++ b/infrastructures/pom.xml @@ -17,7 +17,7 @@ che-server org.eclipse.che - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT ../pom.xml org.eclipse.che.infrastructure diff --git a/multiuser/api/che-multiuser-api-authentication-commons/pom.xml b/multiuser/api/che-multiuser-api-authentication-commons/pom.xml index 3c92a107d28..ef6c2af81d0 100644 --- a/multiuser/api/che-multiuser-api-authentication-commons/pom.xml +++ b/multiuser/api/che-multiuser-api-authentication-commons/pom.xml @@ -17,7 +17,7 @@ che-multiuser-api org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-api-authentication-commons jar diff --git a/multiuser/api/che-multiuser-api-authorization-impl/pom.xml b/multiuser/api/che-multiuser-api-authorization-impl/pom.xml index cc66c98fbe9..ddb3c97d52a 100644 --- a/multiuser/api/che-multiuser-api-authorization-impl/pom.xml +++ b/multiuser/api/che-multiuser-api-authorization-impl/pom.xml @@ -17,7 +17,7 @@ che-multiuser-api org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-api-authorization-impl jar diff --git a/multiuser/api/che-multiuser-api-authorization/pom.xml b/multiuser/api/che-multiuser-api-authorization/pom.xml index 1d2403caaee..2c3abc9b04c 100644 --- a/multiuser/api/che-multiuser-api-authorization/pom.xml +++ b/multiuser/api/che-multiuser-api-authorization/pom.xml @@ -17,7 +17,7 @@ che-multiuser-api org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-api-authorization jar diff --git a/multiuser/api/che-multiuser-api-organization-shared/pom.xml b/multiuser/api/che-multiuser-api-organization-shared/pom.xml index 64cd9827ddd..1a81903a323 100644 --- a/multiuser/api/che-multiuser-api-organization-shared/pom.xml +++ b/multiuser/api/che-multiuser-api-organization-shared/pom.xml @@ -17,7 +17,7 @@ che-multiuser-api org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.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 b6ba77d4d96..a53e7a97575 100644 --- a/multiuser/api/che-multiuser-api-organization/pom.xml +++ b/multiuser/api/che-multiuser-api-organization/pom.xml @@ -17,7 +17,7 @@ che-multiuser-api org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-api-organization jar diff --git a/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/DtoConverter.java b/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/DtoConverter.java index 9703f76b4dc..212f9d31956 100644 --- a/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/DtoConverter.java +++ b/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/DtoConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -50,9 +50,7 @@ public static OrganizationDistributedResourcesDto asDto( return newDto(OrganizationDistributedResourcesDto.class) .withOrganizationId(distributedResources.getOrganizationId()) .withResourcesCap( - distributedResources - .getResourcesCap() - .stream() + distributedResources.getResourcesCap().stream() .map(org.eclipse.che.multiuser.resource.api.DtoConverter::asDto) .collect(Collectors.toList())); } diff --git a/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributionService.java b/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributionService.java index 55f20db4956..e9e8c0effc0 100644 --- a/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributionService.java +++ b/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributionService.java @@ -134,9 +134,7 @@ public List getResourcesCap( @Parameter(description = "Suborganization id") @PathParam("suborganizationId") String suborganization) throws NotFoundException, ConflictException, ServerException { - return resourcesDistributor - .getResourcesCaps(suborganization) - .stream() + return resourcesDistributor.getResourcesCaps(suborganization).stream() .map(org.eclipse.che.multiuser.resource.api.DtoConverter::asDto) .collect(toList()); } diff --git a/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributor.java b/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributor.java index b3c63305b4c..5d70790e266 100644 --- a/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributor.java +++ b/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -182,9 +182,7 @@ void checkResourcesAvailability( String suborganizationId, List newResourcesCap) throws NotFoundException, ConflictException, ServerException { Map usedResources = - resourceManager - .getUsedResources(suborganizationId) - .stream() + resourceManager.getUsedResources(suborganizationId).stream() .collect(Collectors.toMap(Resource::getType, Function.identity())); for (Resource resourceToCheck : newResourcesCap) { Resource usedResource = usedResources.get(resourceToCheck.getType()); diff --git a/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationalAccountAvailableResourcesProvider.java b/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationalAccountAvailableResourcesProvider.java index 746cfc31392..31d095c34d9 100644 --- a/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationalAccountAvailableResourcesProvider.java +++ b/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationalAccountAvailableResourcesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -136,8 +136,7 @@ List getUsedResourcesBySuborganizations(String parentQualifiedName) /** Returns formatted string for list of resources. */ private static String format(Collection resources) { return '[' - + resources - .stream() + + resources.stream() .map( resource -> resource.getAmount() + resource.getUnit() + " of " + resource.getType()) .collect(Collectors.joining(", ")) diff --git a/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/SuborganizationResourcesProvider.java b/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/SuborganizationResourcesProvider.java index 8e5104922a1..bea5ed73548 100644 --- a/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/SuborganizationResourcesProvider.java +++ b/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/api/resource/SuborganizationResourcesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -106,8 +106,7 @@ private List cap( Collection source, List caps) { final Map resourcesCaps = caps.stream().collect(toMap(Resource::getType, Function.identity())); - return source - .stream() + return source.stream() .map( resource -> { Resource resourceCap = resourcesCaps.get(resource.getType()); diff --git a/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/spi/jpa/JpaOrganizationDistributedResourcesDao.java b/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/spi/jpa/JpaOrganizationDistributedResourcesDao.java index a53a4137123..ac89d937e78 100644 --- a/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/spi/jpa/JpaOrganizationDistributedResourcesDao.java +++ b/multiuser/api/che-multiuser-api-organization/src/main/java/org/eclipse/che/multiuser/organization/spi/jpa/JpaOrganizationDistributedResourcesDao.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -93,8 +93,7 @@ public Page getByParent( .setParameter("parent", organizationId) .getSingleResult(); return new Page<>( - distributedResources - .stream() + distributedResources.stream() .map(OrganizationDistributedResourcesImpl::new) .collect(Collectors.toList()), skipCount, diff --git a/multiuser/api/che-multiuser-api-permission-shared/pom.xml b/multiuser/api/che-multiuser-api-permission-shared/pom.xml index d85e0f1e9eb..1f2c5644da6 100644 --- a/multiuser/api/che-multiuser-api-permission-shared/pom.xml +++ b/multiuser/api/che-multiuser-api-permission-shared/pom.xml @@ -17,7 +17,7 @@ che-multiuser-api org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.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 1da92c03e7e..016eac368f2 100644 --- a/multiuser/api/che-multiuser-api-permission/pom.xml +++ b/multiuser/api/che-multiuser-api-permission/pom.xml @@ -17,7 +17,7 @@ che-multiuser-api org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-api-permission jar diff --git a/multiuser/api/che-multiuser-api-permission/src/main/java/org/eclipse/che/multiuser/api/permission/server/PermissionsManager.java b/multiuser/api/che-multiuser-api-permission/src/main/java/org/eclipse/che/multiuser/api/permission/server/PermissionsManager.java index 964863b6211..f70334f356a 100644 --- a/multiuser/api/che-multiuser-api-permission/src/main/java/org/eclipse/che/multiuser/api/permission/server/PermissionsManager.java +++ b/multiuser/api/che-multiuser-api-permission/src/main/java/org/eclipse/che/multiuser/api/permission/server/PermissionsManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -244,8 +244,7 @@ private void checkActionsSupporting(AbstractPermissionsDomain domain, List allowedActions = new HashSet<>(domain.getAllowedActions()); final Set unsupportedActions = - actions - .stream() + actions.stream() .filter(action -> !allowedActions.contains(action)) .collect(Collectors.toSet()); if (!unsupportedActions.isEmpty()) { diff --git a/multiuser/api/che-multiuser-api-resource-shared/pom.xml b/multiuser/api/che-multiuser-api-resource-shared/pom.xml index 5d89b55f752..3ece8301ad6 100644 --- a/multiuser/api/che-multiuser-api-resource-shared/pom.xml +++ b/multiuser/api/che-multiuser-api-resource-shared/pom.xml @@ -17,7 +17,7 @@ che-multiuser-api org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.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 bb44e78e791..bc53e84d7ac 100644 --- a/multiuser/api/che-multiuser-api-resource/pom.xml +++ b/multiuser/api/che-multiuser-api-resource/pom.xml @@ -17,7 +17,7 @@ che-multiuser-api org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-api-resource jar diff --git a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/DtoConverter.java b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/DtoConverter.java index c26fc31bc3c..c1749b100d4 100644 --- a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/DtoConverter.java +++ b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/DtoConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -48,15 +48,11 @@ public static ResourcesDetailsDto asDto(ResourcesDetails resourcesDetails) { return DtoFactory.newDto(ResourcesDetailsDto.class) .withAccountId(resourcesDetails.getAccountId()) .withTotalResources( - resourcesDetails - .getTotalResources() - .stream() + resourcesDetails.getTotalResources().stream() .map(DtoConverter::asDto) .collect(Collectors.toList())) .withProvidedResources( - resourcesDetails - .getProvidedResources() - .stream() + resourcesDetails.getProvidedResources().stream() .map(DtoConverter::asDto) .collect(Collectors.toList())); } @@ -69,9 +65,7 @@ private static ProvidedResourcesDto asDto(ProvidedResources providedResources) { .withEndTime(providedResources.getEndTime()) .withProviderId(providedResources.getProviderId()) .withResources( - providedResources - .getResources() - .stream() + providedResources.getResources().stream() .map(DtoConverter::asDto) .collect(Collectors.toList())); } diff --git a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/exception/NoEnoughResourcesException.java b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/exception/NoEnoughResourcesException.java index 20d1dc785d8..6ed40f3e0a8 100644 --- a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/exception/NoEnoughResourcesException.java +++ b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/exception/NoEnoughResourcesException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -78,8 +78,7 @@ public List getMissingResources() { private String resourcesToString(List resources) { return '[' - + resources - .stream() + + resources.stream() .map(resource -> resource.getAmount() + resource.getUnit() + " " + resource.getType()) .collect(Collectors.joining(", ")) + ']'; diff --git a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/free/FreeResourcesProvider.java b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/free/FreeResourcesProvider.java index 3cd2318bd50..b639109d3f3 100644 --- a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/free/FreeResourcesProvider.java +++ b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/free/FreeResourcesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -61,8 +61,7 @@ public FreeResourcesProvider( this.freeResourcesLimitManager = freeResourcesLimitManager; this.accountManager = accountManager; this.defaultResourcesProviders = - defaultResourcesProviders - .stream() + defaultResourcesProviders.stream() .collect(toMap(DefaultResourcesProvider::getAccountType, Function.identity())); } diff --git a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/free/ResourceValidator.java b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/free/ResourceValidator.java index 375a162855d..1067b7cc3eb 100644 --- a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/free/ResourceValidator.java +++ b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/free/ResourceValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -36,12 +36,10 @@ public class ResourceValidator { @Inject public ResourceValidator(Set supportedResources) { this.resourcesTypesToUnits = - supportedResources - .stream() + supportedResources.stream() .collect(toMap(ResourceType::getId, ResourceType::getSupportedUnits)); this.resourcesTypesToDefaultUnit = - supportedResources - .stream() + supportedResources.stream() .collect(toMap(ResourceType::getId, ResourceType::getDefaultUnit)); } diff --git a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/DefaultAvailableResourcesProvider.java b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/DefaultAvailableResourcesProvider.java index 88ba450a97f..b4308351a78 100644 --- a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/DefaultAvailableResourcesProvider.java +++ b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/DefaultAvailableResourcesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -73,8 +73,7 @@ public List getAvailableResources(String accountId) /** Returns formatted string for list of resources. */ private static String format(Collection resources) { return '[' - + resources - .stream() + + resources.stream() .map( resource -> resource.getAmount() + resource.getUnit() + " of " + resource.getType()) .collect(Collectors.joining(", ")) diff --git a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/ResourceManager.java b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/ResourceManager.java index a8817a8b16d..caa4fa84cf9 100644 --- a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/ResourceManager.java +++ b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/ResourceManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -147,8 +147,7 @@ public ResourcesDetails getResourceDetails(String accountId) } final List allResources = - resources - .stream() + resources.stream() .flatMap(providedResources -> providedResources.getResources().stream()) .collect(Collectors.toList()); diff --git a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/ResourceService.java b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/ResourceService.java index c4ac47e72aa..cbdeb4d9bbd 100644 --- a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/ResourceService.java +++ b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/ResourceService.java @@ -70,9 +70,7 @@ public ResourceService(ResourceManager resourceManager) { public List getTotalResources( @Parameter(description = "Account id") @PathParam("accountId") String accountId) throws NotFoundException, ServerException, ConflictException { - return resourceManager - .getTotalResources(accountId) - .stream() + return resourceManager.getTotalResources(accountId).stream() .map(DtoConverter::asDto) .collect(Collectors.toList()); } @@ -94,9 +92,7 @@ public List getTotalResources( }) public List getAvailableResources(@PathParam("accountId") String accountId) throws NotFoundException, ServerException { - return resourceManager - .getAvailableResources(accountId) - .stream() + return resourceManager.getAvailableResources(accountId).stream() .map(DtoConverter::asDto) .collect(Collectors.toList()); } @@ -118,9 +114,7 @@ public List getAvailableResources(@PathParam("accountId") String ac }) public List getUsedResources(@PathParam("accountId") String accountId) throws NotFoundException, ServerException { - return resourceManager - .getUsedResources(accountId) - .stream() + return resourceManager.getUsedResources(accountId).stream() .map(DtoConverter::asDto) .collect(Collectors.toList()); } diff --git a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/ResourcesLocks.java b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/ResourcesLocks.java index 0193b576c3b..e0e670d3522 100644 --- a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/ResourcesLocks.java +++ b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/ResourcesLocks.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -52,8 +52,7 @@ public ResourcesLocks( this.accountManager = accountManager; this.stripedLocks = new StripedLocks(16); this.accountTypeToLockProvider = - resourceLockKeyProviders - .stream() + resourceLockKeyProviders.stream() .collect( Collectors.toMap(ResourceLockKeyProvider::getAccountType, Function.identity())); } diff --git a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculator.java b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculator.java index a0cfca4c7ed..83d6a1a7e27 100644 --- a/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculator.java +++ b/multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -52,10 +52,7 @@ public long calculate(@Nullable Environment environment) throws ServerException return 0; } try { - return getInternalEnvironment(environment) - .getMachines() - .values() - .stream() + return getInternalEnvironment(environment).getMachines().values().stream() .mapToLong( m -> parseMemoryAttributeValue(m.getAttributes().get(MEMORY_LIMIT_ATTRIBUTE))) .sum() @@ -71,10 +68,7 @@ public long calculate(@Nullable Environment environment) throws ServerException * @return summary RAM of all machines in runtime in megabytes */ public long calculate(Runtime runtime) { - return runtime - .getMachines() - .values() - .stream() + return runtime.getMachines().values().stream() .mapToLong( m -> parseMemoryAttributeValue(m.getAttributes().get(MEMORY_LIMIT_ATTRIBUTE))) .sum() diff --git a/multiuser/api/che-multiuser-api-workspace-activity/pom.xml b/multiuser/api/che-multiuser-api-workspace-activity/pom.xml index 43d06102621..ef84aa0be14 100644 --- a/multiuser/api/che-multiuser-api-workspace-activity/pom.xml +++ b/multiuser/api/che-multiuser-api-workspace-activity/pom.xml @@ -17,7 +17,7 @@ che-multiuser-api org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-api-workspace-activity jar diff --git a/multiuser/api/che-multiuser-api-workspace-activity/src/main/java/org/eclipse/che/multiuser/api/workspace/activity/MultiUserWorkspaceActivityManager.java b/multiuser/api/che-multiuser-api-workspace-activity/src/main/java/org/eclipse/che/multiuser/api/workspace/activity/MultiUserWorkspaceActivityManager.java index 19efb56bf0e..7ae6ab18bcb 100644 --- a/multiuser/api/che-multiuser-api-workspace-activity/src/main/java/org/eclipse/che/multiuser/api/workspace/activity/MultiUserWorkspaceActivityManager.java +++ b/multiuser/api/che-multiuser-api-workspace-activity/src/main/java/org/eclipse/che/multiuser/api/workspace/activity/MultiUserWorkspaceActivityManager.java @@ -77,8 +77,7 @@ protected long getIdleTimeout(String wsId) { return defaultTimeout; } Optional timeoutOpt = - availableResources - .stream() + availableResources.stream() .filter(resource -> TimeoutResourceType.ID.equals(resource.getType())) .findAny(); diff --git a/multiuser/api/pom.xml b/multiuser/api/pom.xml index 91c6b72b424..31617a08b89 100644 --- a/multiuser/api/pom.xml +++ b/multiuser/api/pom.xml @@ -17,7 +17,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.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 9490f3dc616..527b12bd11a 100644 --- a/multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml +++ b/multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml @@ -17,7 +17,7 @@ che-multiuser-integration-tests org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-cascade-removal jar diff --git a/multiuser/integration-tests/che-multiuser-mysql-tck/pom.xml b/multiuser/integration-tests/che-multiuser-mysql-tck/pom.xml index fceae221b99..12d79fc4bf2 100644 --- a/multiuser/integration-tests/che-multiuser-mysql-tck/pom.xml +++ b/multiuser/integration-tests/che-multiuser-mysql-tck/pom.xml @@ -17,7 +17,7 @@ che-multiuser-integration-tests org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-mysql-tck jar diff --git a/multiuser/integration-tests/che-multiuser-mysql-tck/src/test/java/MultiuserMySqlTckModule.java b/multiuser/integration-tests/che-multiuser-mysql-tck/src/test/java/MultiuserMySqlTckModule.java index bbc476568ca..f1c8da1139c 100644 --- a/multiuser/integration-tests/che-multiuser-mysql-tck/src/test/java/MultiuserMySqlTckModule.java +++ b/multiuser/integration-tests/che-multiuser-mysql-tck/src/test/java/MultiuserMySqlTckModule.java @@ -224,8 +224,7 @@ public static class UserJpaTckRepository implements TckRepository { @Override public void createAll(Collection entities) throws TckRepositoryException { final EntityManager manager = managerProvider.get(); - entities - .stream() + entities.stream() .map( user -> new UserImpl( diff --git a/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml b/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml index 797e55cae2b..119cb79411f 100644 --- a/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml +++ b/multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml @@ -17,7 +17,7 @@ che-multiuser-integration-tests org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-postgresql-tck jar diff --git a/multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/java/MultiuserPostgresqlTckModule.java b/multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/java/MultiuserPostgresqlTckModule.java index 6ec32622505..3de763e947c 100644 --- a/multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/java/MultiuserPostgresqlTckModule.java +++ b/multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/java/MultiuserPostgresqlTckModule.java @@ -223,8 +223,7 @@ public static class UserJpaTckRepository implements TckRepository { @Override public void createAll(Collection entities) throws TckRepositoryException { final EntityManager manager = managerProvider.get(); - entities - .stream() + entities.stream() .map( user -> new UserImpl( diff --git a/multiuser/integration-tests/pom.xml b/multiuser/integration-tests/pom.xml index 2d6fe680eaa..0bccb1c7d17 100644 --- a/multiuser/integration-tests/pom.xml +++ b/multiuser/integration-tests/pom.xml @@ -17,7 +17,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-integration-tests pom diff --git a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml index 9190b1a81eb..402e3373afc 100644 --- a/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml +++ b/multiuser/keycloak/che-multiuser-keycloak-server/pom.xml @@ -17,7 +17,7 @@ che-multiuser-keycloak org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.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 39dc41c2e84..aa64f2e4472 100644 --- a/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml +++ b/multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml @@ -17,7 +17,7 @@ che-multiuser-keycloak org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.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 daba5592c14..3cca5cb61b4 100644 --- a/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml +++ b/multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml @@ -17,7 +17,7 @@ che-multiuser-keycloak org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-keycloak-token-provider Che Multiuser :: Keycloak Token Provider diff --git a/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml b/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml index b98d282ecac..f0b24e800b8 100644 --- a/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml +++ b/multiuser/keycloak/che-multiuser-keycloak-user-remover/pom.xml @@ -17,7 +17,7 @@ che-multiuser-keycloak org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-keycloak-user-remover jar diff --git a/multiuser/keycloak/pom.xml b/multiuser/keycloak/pom.xml index a418624ad90..a79a3e5a7e4 100644 --- a/multiuser/keycloak/pom.xml +++ b/multiuser/keycloak/pom.xml @@ -17,7 +17,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT ../pom.xml che-multiuser-keycloak 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 dff6f1148d8..e5cd473f445 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml +++ b/multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml @@ -17,7 +17,7 @@ che-multiuser-machine-auth org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.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 4d11c530862..9d675c401a3 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml +++ b/multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml @@ -17,7 +17,7 @@ che-multiuser-machine-auth org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-machine-authentication jar diff --git a/multiuser/machine-auth/pom.xml b/multiuser/machine-auth/pom.xml index c0c07482d76..15b49b6b034 100644 --- a/multiuser/machine-auth/pom.xml +++ b/multiuser/machine-auth/pom.xml @@ -17,7 +17,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT ../pom.xml che-multiuser-machine-auth diff --git a/multiuser/oidc/pom.xml b/multiuser/oidc/pom.xml index 14f3f54c683..e1c7a08de77 100644 --- a/multiuser/oidc/pom.xml +++ b/multiuser/oidc/pom.xml @@ -17,7 +17,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-oidc jar diff --git a/multiuser/permission/che-multiuser-permission-devfile/pom.xml b/multiuser/permission/che-multiuser-permission-devfile/pom.xml index 061149d8915..3466b766844 100644 --- a/multiuser/permission/che-multiuser-permission-devfile/pom.xml +++ b/multiuser/permission/che-multiuser-permission-devfile/pom.xml @@ -17,7 +17,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-permission-devfile Che Multiuser :: Devfile Permissions diff --git a/multiuser/permission/che-multiuser-permission-devfile/src/main/java/org/eclipse/che/multiuser/permission/devfile/server/spi/jpa/JpaUserDevfilePermissionDao.java b/multiuser/permission/che-multiuser-permission-devfile/src/main/java/org/eclipse/che/multiuser/permission/devfile/server/spi/jpa/JpaUserDevfilePermissionDao.java index 84e6e45887f..bda5bf2f3a6 100644 --- a/multiuser/permission/che-multiuser-permission-devfile/src/main/java/org/eclipse/che/multiuser/permission/devfile/server/spi/jpa/JpaUserDevfilePermissionDao.java +++ b/multiuser/permission/che-multiuser-permission-devfile/src/main/java/org/eclipse/che/multiuser/permission/devfile/server/spi/jpa/JpaUserDevfilePermissionDao.java @@ -65,8 +65,7 @@ public UserDevfilePermissionImpl get(String userId, String instanceId) @Override public List getByUser(String userId) throws ServerException { requireNonNull(userId, "User identifier required"); - return doGetByUser(wildcardToNull(userId)) - .stream() + return doGetByUser(wildcardToNull(userId)).stream() .map(UserDevfilePermissionImpl::new) .collect(toList()); } diff --git a/multiuser/permission/che-multiuser-permission-logger/pom.xml b/multiuser/permission/che-multiuser-permission-logger/pom.xml index 6aac4f732c0..42a4ae2af89 100644 --- a/multiuser/permission/che-multiuser-permission-logger/pom.xml +++ b/multiuser/permission/che-multiuser-permission-logger/pom.xml @@ -17,7 +17,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-permission-logger Che Multiuser :: Logger Permissions diff --git a/multiuser/permission/che-multiuser-permission-resource/pom.xml b/multiuser/permission/che-multiuser-permission-resource/pom.xml index 5d666e0ab3b..0ea2611051e 100644 --- a/multiuser/permission/che-multiuser-permission-resource/pom.xml +++ b/multiuser/permission/che-multiuser-permission-resource/pom.xml @@ -17,7 +17,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-permission-resource Che Multiuser :: Resource :: Permissions diff --git a/multiuser/permission/che-multiuser-permission-resource/src/main/java/org/eclipse/che/multiuser/permission/resource/filters/ResourceServicePermissionsFilter.java b/multiuser/permission/che-multiuser-permission-resource/src/main/java/org/eclipse/che/multiuser/permission/resource/filters/ResourceServicePermissionsFilter.java index 644ef720fed..1e5f7703be1 100644 --- a/multiuser/permission/che-multiuser-permission-resource/src/main/java/org/eclipse/che/multiuser/permission/resource/filters/ResourceServicePermissionsFilter.java +++ b/multiuser/permission/che-multiuser-permission-resource/src/main/java/org/eclipse/che/multiuser/permission/resource/filters/ResourceServicePermissionsFilter.java @@ -56,8 +56,7 @@ public ResourceServicePermissionsFilter( AccountManager accountManager, Set permissionsCheckers) { this.accountManager = accountManager; this.permissionsCheckers = - permissionsCheckers - .stream() + permissionsCheckers.stream() .collect(toMap(AccountPermissionsChecker::getAccountType, identity())); } diff --git a/multiuser/permission/che-multiuser-permission-system/pom.xml b/multiuser/permission/che-multiuser-permission-system/pom.xml index 408b5e1350d..fbfd07735be 100644 --- a/multiuser/permission/che-multiuser-permission-system/pom.xml +++ b/multiuser/permission/che-multiuser-permission-system/pom.xml @@ -17,7 +17,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.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 f90c37e5621..42777d080fb 100644 --- a/multiuser/permission/che-multiuser-permission-user/pom.xml +++ b/multiuser/permission/che-multiuser-permission-user/pom.xml @@ -17,7 +17,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-permission-user Che Multiuser :: User Permissions diff --git a/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml b/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml index 51ce4223eba..1303a33aa9c 100644 --- a/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml +++ b/multiuser/permission/che-multiuser-permission-workspace-activity/pom.xml @@ -17,7 +17,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-permission-workspace-activity Che Multiuser :: Workspace Activity Permissions diff --git a/multiuser/permission/che-multiuser-permission-workspace/pom.xml b/multiuser/permission/che-multiuser-permission-workspace/pom.xml index a33505a1144..0369b09e329 100644 --- a/multiuser/permission/che-multiuser-permission-workspace/pom.xml +++ b/multiuser/permission/che-multiuser-permission-workspace/pom.xml @@ -17,7 +17,7 @@ che-multiuser-permission org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-permission-workspace Che Multiuser :: Workspace Permissions diff --git a/multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilter.java b/multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilter.java index 145e6e120fa..8667a9b0f49 100644 --- a/multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilter.java +++ b/multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilter.java @@ -65,8 +65,7 @@ public WorkspacePermissionsFilter( this.workspaceManager = workspaceManager; this.accountManager = accountManager; this.accountTypeToPermissionsChecker = - accountPermissionsCheckers - .stream() + accountPermissionsCheckers.stream() .collect(toMap(AccountPermissionsChecker::getAccountType, identity())); this.superPrivilegesChecker = superPrivilegesChecker; } diff --git a/multiuser/permission/pom.xml b/multiuser/permission/pom.xml index 6c5b72761cf..300e752fb0a 100644 --- a/multiuser/permission/pom.xml +++ b/multiuser/permission/pom.xml @@ -17,7 +17,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT ../pom.xml che-multiuser-permission diff --git a/multiuser/personal-account/pom.xml b/multiuser/personal-account/pom.xml index 4e5b427e1c4..774363622af 100644 --- a/multiuser/personal-account/pom.xml +++ b/multiuser/personal-account/pom.xml @@ -17,7 +17,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-multiuser-personal-account jar diff --git a/multiuser/pom.xml b/multiuser/pom.xml index 23f6e74f262..568104d9aa0 100644 --- a/multiuser/pom.xml +++ b/multiuser/pom.xml @@ -17,7 +17,7 @@ che-server org.eclipse.che - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT ../pom.xml org.eclipse.che.multiuser diff --git a/multiuser/sql-schema/pom.xml b/multiuser/sql-schema/pom.xml index 5dc31a1212e..805dc8512fc 100644 --- a/multiuser/sql-schema/pom.xml +++ b/multiuser/sql-schema/pom.xml @@ -17,7 +17,7 @@ che-multiuser-parent org.eclipse.che.multiuser - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT ../pom.xml che-multiuser-sql-schema diff --git a/pom.xml b/pom.xml index 9f128f1bf12..2caf75321fd 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 4.0.0 org.eclipse.che che-server - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT pom Che Server Eclipse Che Server @@ -48,8 +48,8 @@ 1.0 - 1.2.8 - 0.19.0 + 1.2.9 + 0.20.0 2.11.2 1.7.1 2.31.0 @@ -63,7 +63,6 @@ 0.1.55 3.12.12 1.15.0 - 1.11 1.3.3 2.11.0 2.6 @@ -82,13 +81,13 @@ 0.2.15 0.1.8 0.33.0 - 0.4.0 + 0.4.1 0.7.0 4.4.0 - 2.1.10 + 2.1.11 2.0.1 2.0.0 - 1.0.3 + 1.0.5 2.0.0 2.0.1 5.0.0 @@ -100,7 +99,7 @@ Red Hat, Inc. - initial API and implementation ${project.version} - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT 1.0-beta2 Red Hat, Inc. @@ -108,7 +107,7 @@ 3.0.0 3.3.0 3.2.0 - 1.4 + 3.0.0 3.1.0 3.8.1 3.1.2 @@ -116,11 +115,11 @@ 3.0.0 0.37.0 3.0.0-M5 - 2.5.1 + 2.13 3.0.0-M1 0.8.7 3.2.0 - 3.0 + 4.1 3.6.1 3.2.0 3.9.0.2155 @@ -129,18 +128,18 @@ [3.6.2,) 3.0.0-M5 3.3.2 - 8.0.16 + 8.0.27 4.1.0 - 4.0.7 + 4.3.1 3.12.0 4.5.13 - 4.4.14 + 4.4.15 3.3.0 - 3.2 - 3.3.3 + 3.6.2 + 3.8.4 10.0.14 - 3.0.20 - 2.7.9 + 3.4.1 + 2.7.10 2.2.3 0.3.5 1.15.0 @@ -297,11 +296,6 @@ - - commons-codec - commons-codec - ${commons-codec.version} - commons-io commons-io @@ -515,11 +509,6 @@ mysql-connector-java ${mysql.connector.version} - - net.java.dev.jna - jna - ${net.java.dev.jna.version} - net.logstash.logback logstash-logback-encoder @@ -1812,7 +1801,7 @@ buildNumber no_revision true - {0, date,yyyyMMdd} + yyyyMMdd diff --git a/typescript-dto/dto-pom.xml b/typescript-dto/dto-pom.xml index f55dc05ccd6..b9987403d1e 100644 --- a/typescript-dto/dto-pom.xml +++ b/typescript-dto/dto-pom.xml @@ -23,7 +23,7 @@ pom Che TypeScript DTO - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT diff --git a/wsmaster/che-core-api-account/pom.xml b/wsmaster/che-core-api-account/pom.xml index 650a9f70b05..e50c9a5c5e2 100644 --- a/wsmaster/che-core-api-account/pom.xml +++ b/wsmaster/che-core-api-account/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-account Che Core :: API :: Account diff --git a/wsmaster/che-core-api-auth-bitbucket/pom.xml b/wsmaster/che-core-api-auth-bitbucket/pom.xml index 25703b10d69..974a278217e 100644 --- a/wsmaster/che-core-api-auth-bitbucket/pom.xml +++ b/wsmaster/che-core-api-auth-bitbucket/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-auth-bitbucket jar diff --git a/wsmaster/che-core-api-auth-github/pom.xml b/wsmaster/che-core-api-auth-github/pom.xml index 96423ffbe95..0a4386534cb 100644 --- a/wsmaster/che-core-api-auth-github/pom.xml +++ b/wsmaster/che-core-api-auth-github/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-auth-github jar diff --git a/wsmaster/che-core-api-auth-openshift/pom.xml b/wsmaster/che-core-api-auth-openshift/pom.xml index 7808b2798fa..3ea21324927 100644 --- a/wsmaster/che-core-api-auth-openshift/pom.xml +++ b/wsmaster/che-core-api-auth-openshift/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-auth-openshift jar diff --git a/wsmaster/che-core-api-auth-shared/pom.xml b/wsmaster/che-core-api-auth-shared/pom.xml index 747286451e7..41448243dda 100644 --- a/wsmaster/che-core-api-auth-shared/pom.xml +++ b/wsmaster/che-core-api-auth-shared/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 9124808a6de..661f3eaf18a 100644 --- a/wsmaster/che-core-api-auth/pom.xml +++ b/wsmaster/che-core-api-auth/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-auth jar diff --git a/wsmaster/che-core-api-devfile-shared/pom.xml b/wsmaster/che-core-api-devfile-shared/pom.xml index 8c96bc9d94f..e19e3c4b918 100644 --- a/wsmaster/che-core-api-devfile-shared/pom.xml +++ b/wsmaster/che-core-api-devfile-shared/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-devfile-shared jar diff --git a/wsmaster/che-core-api-devfile/pom.xml b/wsmaster/che-core-api-devfile/pom.xml index 60c8d12eddb..5401915c200 100644 --- a/wsmaster/che-core-api-devfile/pom.xml +++ b/wsmaster/che-core-api-devfile/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-devfile jar diff --git a/wsmaster/che-core-api-devfile/src/main/java/org/eclipse/che/api/devfile/server/DevfileService.java b/wsmaster/che-core-api-devfile/src/main/java/org/eclipse/che/api/devfile/server/DevfileService.java index a02550b4385..c474e42d8c7 100644 --- a/wsmaster/che-core-api-devfile/src/main/java/org/eclipse/che/api/devfile/server/DevfileService.java +++ b/wsmaster/che-core-api-devfile/src/main/java/org/eclipse/che/api/devfile/server/DevfileService.java @@ -254,9 +254,7 @@ public Response getUserDevfiles( final Set skip = ImmutableSet.of("token", "skipCount", "maxItems", "order"); Map> queryParams = URLEncodedUtils.parse(uriInfo.getRequestUri()); final List> query = - queryParams - .entrySet() - .stream() + queryParams.entrySet().stream() .filter(param -> !param.getValue().isEmpty()) .filter(param -> !skip.contains(param.getKey())) .map(entry -> Pair.of(entry.getKey(), entry.getValue().iterator().next())) @@ -282,9 +280,7 @@ public Response getUserDevfiles( userDevfileManager.getUserDevfiles(maxItems, skipCount, query, searchOrder); List list = - userDevfilesPage - .getItems() - .stream() + userDevfilesPage.getItems().stream() .map(DtoConverter::asDto) .map(dto -> linksInjector.injectLinks(asDto(dto), getServiceContext())) .collect(toList()); diff --git a/wsmaster/che-core-api-devfile/src/main/java/org/eclipse/che/api/devfile/server/jpa/JpaUserDevfileDao.java b/wsmaster/che-core-api-devfile/src/main/java/org/eclipse/che/api/devfile/server/jpa/JpaUserDevfileDao.java index e15977af3eb..c2215ae47df 100644 --- a/wsmaster/che-core-api-devfile/src/main/java/org/eclipse/che/api/devfile/server/jpa/JpaUserDevfileDao.java +++ b/wsmaster/che-core-api-devfile/src/main/java/org/eclipse/che/api/devfile/server/jpa/JpaUserDevfileDao.java @@ -198,8 +198,7 @@ protected Page doGetDevfiles( throws ServerException { if (filter != null && !filter.isEmpty()) { List> invalidFilter = - filter - .stream() + filter.stream() .filter(p -> !VALID_SEARCH_FIELDS.contains(p.first.toLowerCase())) .collect(toList()); if (!invalidFilter.isEmpty()) { @@ -210,8 +209,7 @@ protected Page doGetDevfiles( List> effectiveOrder = DEFAULT_ORDER; if (order != null && !order.isEmpty()) { List> invalidOrder = - order - .stream() + order.stream() .filter(p -> !VALID_ORDER_FIELDS.contains(p.first.toLowerCase())) .collect(toList()); if (!invalidOrder.isEmpty()) { @@ -220,8 +218,7 @@ protected Page doGetDevfiles( } List> invalidSortOrder = - order - .stream() + order.stream() .filter(p -> !p.second.equalsIgnoreCase("asc") && !p.second.equalsIgnoreCase("desc")) .collect(Collectors.toList()); if (!invalidSortOrder.isEmpty()) { diff --git a/wsmaster/che-core-api-factory-bitbucket-server/pom.xml b/wsmaster/che-core-api-factory-bitbucket-server/pom.xml index 382a49d28b3..015578b21cf 100644 --- a/wsmaster/che-core-api-factory-bitbucket-server/pom.xml +++ b/wsmaster/che-core-api-factory-bitbucket-server/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-factory-bitbucket-server jar diff --git a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java index 831468e4b9d..8d91ac00111 100644 --- a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java +++ b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java @@ -75,9 +75,7 @@ public PersonalAccessToken fetchPersonalAccessToken(Subject cheUser, String scmS LOG.debug("Current bitbucket user {} ", user); // cleanup existed List existingTokens = - bitbucketServerApiClient - .getPersonalAccessTokens(user.getSlug()) - .stream() + bitbucketServerApiClient.getPersonalAccessTokens(user.getSlug()).stream() .filter(p -> p.getName().equals(tokenName)) .collect(Collectors.toList()); for (BitbucketPersonalAccessToken existedToken : existingTokens) { diff --git a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketURLParser.java b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketURLParser.java index 207e10d19cf..f278fb58d9e 100644 --- a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketURLParser.java +++ b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketURLParser.java @@ -72,8 +72,7 @@ public BitbucketUrl parse(String url) { } Matcher matcher = - bitbucketUrlPatterns - .stream() + bitbucketUrlPatterns.stream() .map(pattern -> pattern.matcher(url)) .filter(Matcher::matches) .findFirst() diff --git a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/server/HttpBitbucketServerApiClient.java b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/server/HttpBitbucketServerApiClient.java index 4435f37f190..c2faed7efe3 100644 --- a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/server/HttpBitbucketServerApiClient.java +++ b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/server/HttpBitbucketServerApiClient.java @@ -101,8 +101,7 @@ public BitbucketUser getUser(Subject cheUser) // entity) Che's user username. At the second step, we will search against all visible(to the // current Che's user) bitbucket users that are not included in the first list. Set usersByName = - getUsers(cheUser.getUserName()) - .stream() + getUsers(cheUser.getUserName()).stream() .map(BitbucketUser::getSlug) .collect(Collectors.toSet()); @@ -111,8 +110,7 @@ public BitbucketUser getUser(Subject cheUser) return currentUser.get(); } Set usersAllExceptByName = - getUsers() - .stream() + getUsers().stream() .map(BitbucketUser::getSlug) .filter(s -> !usersByName.contains(s)) .collect(Collectors.toSet()); diff --git a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/security/oauth1/BitbucketServerApiProvider.java b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/security/oauth1/BitbucketServerApiProvider.java index ebac5847988..68bcd56b215 100644 --- a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/security/oauth1/BitbucketServerApiProvider.java +++ b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/security/oauth1/BitbucketServerApiProvider.java @@ -74,8 +74,7 @@ private static BitbucketServerApiClient doGet( + "` value"); } else { Optional authenticator = - authenticators - .stream() + authenticators.stream() .filter( a -> a.getOAuthProvider() @@ -92,9 +91,7 @@ private static BitbucketServerApiClient doGet( } private static List sanitizedEndpoints(String rawBitbucketEndpoints) { - return Splitter.on(",") - .splitToList(rawBitbucketEndpoints) - .stream() + return Splitter.on(",").splitToList(rawBitbucketEndpoints).stream() .map(s -> StringUtils.trimEnd(s, '/')) .collect(Collectors.toList()); } diff --git a/wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/HttpBitbucketServerApiClientTest.java b/wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/HttpBitbucketServerApiClientTest.java index 4fdbf3d272f..6a8276c1989 100644 --- a/wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/HttpBitbucketServerApiClientTest.java +++ b/wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/HttpBitbucketServerApiClientTest.java @@ -140,9 +140,7 @@ public void testGetUsers() .withBodyFile("bitbucket/rest/api/1.0/users/response_s9_l25.json"))); List page = - bitbucketServer - .getUsers() - .stream() + bitbucketServer.getUsers().stream() .map(BitbucketUser::getSlug) .collect(Collectors.toList()); assertEquals( @@ -174,9 +172,7 @@ public void testGetUsersFiltered() .withBodyFile("bitbucket/rest/api/1.0/users/filtered/response.json"))); List page = - bitbucketServer - .getUsers("ksmster") - .stream() + bitbucketServer.getUsers("ksmster").stream() .map(BitbucketUser::getSlug) .collect(Collectors.toList()); assertEquals(page, ImmutableList.of("admin", "ksmster")); @@ -197,9 +193,7 @@ public void testGetPersonalAccessTokens() .withBodyFile("bitbucket/rest/access-tokens/1.0/users/ksmster/response.json"))); List page = - bitbucketServer - .getPersonalAccessTokens("ksmster") - .stream() + bitbucketServer.getPersonalAccessTokens("ksmster").stream() .map(BitbucketPersonalAccessToken::getName) .collect(Collectors.toList()); assertEquals(page, ImmutableList.of("che", "t2")); diff --git a/wsmaster/che-core-api-factory-github/pom.xml b/wsmaster/che-core-api-factory-github/pom.xml index d0c9deb2215..1ad44c7d04b 100644 --- a/wsmaster/che-core-api-factory-github/pom.xml +++ b/wsmaster/che-core-api-factory-github/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-factory-github jar diff --git a/wsmaster/che-core-api-factory-gitlab/pom.xml b/wsmaster/che-core-api-factory-gitlab/pom.xml index b7877d6544b..98648981fa0 100644 --- a/wsmaster/che-core-api-factory-gitlab/pom.xml +++ b/wsmaster/che-core-api-factory-gitlab/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-factory-gitlab jar diff --git a/wsmaster/che-core-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabUrlParser.java b/wsmaster/che-core-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabUrlParser.java index 5a1bd43fd1f..0e371171980 100644 --- a/wsmaster/che-core-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabUrlParser.java +++ b/wsmaster/che-core-api-factory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabUrlParser.java @@ -75,8 +75,7 @@ public GitlabUrl parse(String url) { } Matcher matcher = - gitlabUrlPatterns - .stream() + gitlabUrlPatterns.stream() .map(pattern -> pattern.matcher(url)) .filter(Matcher::matches) .findFirst() diff --git a/wsmaster/che-core-api-factory-shared/pom.xml b/wsmaster/che-core-api-factory-shared/pom.xml index b84b281b849..7ac719b05e7 100644 --- a/wsmaster/che-core-api-factory-shared/pom.xml +++ b/wsmaster/che-core-api-factory-shared/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 eeda2e44748..dafddc3dbc6 100644 --- a/wsmaster/che-core-api-factory/pom.xml +++ b/wsmaster/che-core-api-factory/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-factory jar diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/DefaultFactoryParameterResolver.java b/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/DefaultFactoryParameterResolver.java index 002fce1c736..bda8073e354 100644 --- a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/DefaultFactoryParameterResolver.java +++ b/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/DefaultFactoryParameterResolver.java @@ -100,9 +100,7 @@ public FactoryMetaDto createFactory(@NotNull final Map factoryPa * @return filtered devfile values override map */ protected Map extractOverrideParams(Map factoryParameters) { - return factoryParameters - .entrySet() - .stream() + return factoryParameters.entrySet().stream() .filter(e -> e.getKey().startsWith(OVERRIDE_PREFIX)) .collect(toMap(e -> e.getKey().substring(OVERRIDE_PREFIX.length()), Entry::getValue)); } diff --git a/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/FactoryLinksHelperTest.java b/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/FactoryLinksHelperTest.java index 8102d1a8f24..68446c578de 100644 --- a/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/FactoryLinksHelperTest.java +++ b/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/FactoryLinksHelperTest.java @@ -59,8 +59,7 @@ public void shouldContainDevfileLinkIfSourceIsPresent() { "user1", testRepo); assertTrue( - links - .stream() + links.stream() .anyMatch( l -> l.getMethod().equals("GET") @@ -84,8 +83,7 @@ public void shouldContainFilesLinksIfScmInfoIsPresent() { "user1", TEST_REPO); assertTrue( - links - .stream() + links.stream() .anyMatch( l -> l.getMethod().equals("GET") @@ -109,8 +107,7 @@ public void shouldNotContainFilesLinksIfNoScmInfoIsPresent() { "user1", testRepo); assertTrue( - links - .stream() + links.stream() .noneMatch( l -> l.getMethod().equals("GET") && l.getRel().equals("myfile.ext content"))); } diff --git a/wsmaster/che-core-api-infraproxy/pom.xml b/wsmaster/che-core-api-infraproxy/pom.xml index cbd4be3f43a..7952a3b5904 100644 --- a/wsmaster/che-core-api-infraproxy/pom.xml +++ b/wsmaster/che-core-api-infraproxy/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-infraproxy jar diff --git a/wsmaster/che-core-api-logger-shared/pom.xml b/wsmaster/che-core-api-logger-shared/pom.xml index e3c1c6840ed..ba51dd28559 100644 --- a/wsmaster/che-core-api-logger-shared/pom.xml +++ b/wsmaster/che-core-api-logger-shared/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-logger-shared jar diff --git a/wsmaster/che-core-api-logger/pom.xml b/wsmaster/che-core-api-logger/pom.xml index c431488d80c..7cd86048b17 100644 --- a/wsmaster/che-core-api-logger/pom.xml +++ b/wsmaster/che-core-api-logger/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-logger jar diff --git a/wsmaster/che-core-api-logger/src/main/java/org/eclipse/che/api/logger/LoggerService.java b/wsmaster/che-core-api-logger/src/main/java/org/eclipse/che/api/logger/LoggerService.java index 197d3b2d5e3..40c65f2425d 100644 --- a/wsmaster/che-core-api-logger/src/main/java/org/eclipse/che/api/logger/LoggerService.java +++ b/wsmaster/che-core-api-logger/src/main/java/org/eclipse/che/api/logger/LoggerService.java @@ -91,9 +91,7 @@ public List getLoggers( Integer maxItems) { LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory(); - return loggerContext - .getLoggerList() - .stream() + return loggerContext.getLoggerList().stream() .filter(log -> log.getLevel() != null || log.iteratorForAppenders().hasNext()) .skip(skipCount) .limit(maxItems) diff --git a/wsmaster/che-core-api-metrics/pom.xml b/wsmaster/che-core-api-metrics/pom.xml index 8b6c965d188..efca4298c3c 100644 --- a/wsmaster/che-core-api-metrics/pom.xml +++ b/wsmaster/che-core-api-metrics/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-metrics jar diff --git a/wsmaster/che-core-api-metrics/src/test/java/org/eclipse/che/api/metrics/WorkspaceFailureMeterBinderTest.java b/wsmaster/che-core-api-metrics/src/test/java/org/eclipse/che/api/metrics/WorkspaceFailureMeterBinderTest.java index 76ed00911be..dce621b141b 100644 --- a/wsmaster/che-core-api-metrics/src/test/java/org/eclipse/che/api/metrics/WorkspaceFailureMeterBinderTest.java +++ b/wsmaster/che-core-api-metrics/src/test/java/org/eclipse/che/api/metrics/WorkspaceFailureMeterBinderTest.java @@ -72,8 +72,7 @@ public void shouldCollectFailureCountsPerStatus(WorkspaceStatus failureStatus) { List restOfCounters = new ArrayList<>(failureCounters); Counter counter = - failureCounters - .stream() + failureCounters.stream() .filter(c -> failureStatus.name().equals(c.getId().getTag("while"))) .findAny() .orElseThrow( diff --git a/wsmaster/che-core-api-ssh-shared/pom.xml b/wsmaster/che-core-api-ssh-shared/pom.xml index 1ff568001be..4185eb0797f 100644 --- a/wsmaster/che-core-api-ssh-shared/pom.xml +++ b/wsmaster/che-core-api-ssh-shared/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 ff7c3bcf8a5..885bb7ea466 100644 --- a/wsmaster/che-core-api-ssh/pom.xml +++ b/wsmaster/che-core-api-ssh/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-ssh jar diff --git a/wsmaster/che-core-api-ssh/src/main/java/org/eclipse/che/api/ssh/server/SshService.java b/wsmaster/che-core-api-ssh/src/main/java/org/eclipse/che/api/ssh/server/SshService.java index bee97eae52a..9a9106a486b 100644 --- a/wsmaster/che-core-api-ssh/src/main/java/org/eclipse/che/api/ssh/server/SshService.java +++ b/wsmaster/che-core-api-ssh/src/main/java/org/eclipse/che/api/ssh/server/SshService.java @@ -251,9 +251,7 @@ public void removePair( public List getPairs( @Parameter(description = "Name of service") @PathParam("service") String service) throws ServerException { - return sshManager - .getPairs(getCurrentUserId(), service) - .stream() + return sshManager.getPairs(getCurrentUserId(), service).stream() .map(sshPair -> injectLinks(asDto(sshPair))) .collect(Collectors.toList()); } diff --git a/wsmaster/che-core-api-system-shared/pom.xml b/wsmaster/che-core-api-system-shared/pom.xml index 9a5e87dd517..a522f0f0d6e 100644 --- a/wsmaster/che-core-api-system-shared/pom.xml +++ b/wsmaster/che-core-api-system-shared/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 491d227a895..b8159186f4f 100644 --- a/wsmaster/che-core-api-system/pom.xml +++ b/wsmaster/che-core-api-system/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-system jar diff --git a/wsmaster/che-core-api-system/src/main/java/org/eclipse/che/api/system/server/ServiceTerminator.java b/wsmaster/che-core-api-system/src/main/java/org/eclipse/che/api/system/server/ServiceTerminator.java index d882bba6079..e3823ab236f 100644 --- a/wsmaster/che-core-api-system/src/main/java/org/eclipse/che/api/system/server/ServiceTerminator.java +++ b/wsmaster/che-core-api-system/src/main/java/org/eclipse/che/api/system/server/ServiceTerminator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -126,8 +126,7 @@ public static class ServiceTerminationComparator implements Comparator terminations) { this.dependencies = - terminations - .stream() + terminations.stream() .collect( Collectors.toMap( ServiceTermination::getServiceName, ServiceTermination::getDependencies)); diff --git a/wsmaster/che-core-api-user-shared/pom.xml b/wsmaster/che-core-api-user-shared/pom.xml index 09eed911f42..6ed3e4277f8 100644 --- a/wsmaster/che-core-api-user-shared/pom.xml +++ b/wsmaster/che-core-api-user-shared/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 ba6bad5e9be..3093550a52a 100644 --- a/wsmaster/che-core-api-user/pom.xml +++ b/wsmaster/che-core-api-user/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-user Che Core :: API :: User diff --git a/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/jpa/JpaPreferenceDao.java b/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/jpa/JpaPreferenceDao.java index 73d4f7ee2b3..7839269fe50 100644 --- a/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/jpa/JpaPreferenceDao.java +++ b/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/jpa/JpaPreferenceDao.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -79,9 +79,7 @@ public Map getPreferences(String userId, String filter) throws S final Map preferences = prefs.getPreferences(); if (!filter.isEmpty()) { final Pattern pattern = Pattern.compile(filter); - return preferences - .entrySet() - .stream() + return preferences.entrySet().stream() .filter(preference -> pattern.matcher(preference.getKey()).matches()) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); } else { diff --git a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/ProfileLinksInjectorTest.java b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/ProfileLinksInjectorTest.java index 49f016b1113..60ae8ba836d 100644 --- a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/ProfileLinksInjectorTest.java +++ b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/ProfileLinksInjectorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -61,9 +61,7 @@ public void shouldInjectProfileLinks() throws Exception { // [rel, method] pairs links final Set> links = - profileDto - .getLinks() - .stream() + profileDto.getLinks().stream() .map(link -> Pair.of(link.getMethod(), link.getRel())) .collect(Collectors.toSet()); final Set> expectedLinks = diff --git a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserLinksInjectorTest.java b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserLinksInjectorTest.java index 5f54040c80d..946a7d076f4 100644 --- a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserLinksInjectorTest.java +++ b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserLinksInjectorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -64,9 +64,7 @@ public void shouldInjectLinks() throws Exception { // [rel, method] pairs links final Set> links = - userDto - .getLinks() - .stream() + userDto.getLinks().stream() .map(link -> Pair.of(link.getMethod(), link.getRel())) .collect(Collectors.toSet()); final Set> expectedLinks = diff --git a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/jpa/UserJpaTckRepository.java b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/jpa/UserJpaTckRepository.java index 9ebf49a228f..4ae880ca4ff 100644 --- a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/jpa/UserJpaTckRepository.java +++ b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/jpa/UserJpaTckRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -31,8 +31,7 @@ public class UserJpaTckRepository implements TckRepository { @Override public void createAll(Collection entities) throws TckRepositoryException { final EntityManager manager = managerProvider.get(); - entities - .stream() + entities.stream() .map( user -> new UserImpl( diff --git a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/spi/tck/UserDaoTest.java b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/spi/tck/UserDaoTest.java index 52cdab7ff5f..cc336bc16f5 100644 --- a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/spi/tck/UserDaoTest.java +++ b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/spi/tck/UserDaoTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -429,10 +429,7 @@ public void shouldReturnUserWithNullPasswordWhenGetUserByAliasAndPassword() thro @Test(dependsOnMethods = "getAllShouldReturnAllUsersWithinSingleResponse") public void shouldReturnUserWithNullPasswordWhenGetAllUser() throws Exception { assertEquals( - userDao - .getAll(users.length, 0) - .getItems() - .stream() + userDao.getAll(users.length, 0).getItems().stream() .filter(u -> u.getPassword() == null) .count(), users.length); diff --git a/wsmaster/che-core-api-workspace-activity/pom.xml b/wsmaster/che-core-api-workspace-activity/pom.xml index 2b85b580e95..effbf8eef43 100644 --- a/wsmaster/che-core-api-workspace-activity/pom.xml +++ b/wsmaster/che-core-api-workspace-activity/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-workspace-activity jar diff --git a/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/InmemoryWorkspaceActivityDao.java b/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/InmemoryWorkspaceActivityDao.java index cc1a141328a..863d5822ebf 100644 --- a/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/InmemoryWorkspaceActivityDao.java +++ b/wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/InmemoryWorkspaceActivityDao.java @@ -54,9 +54,7 @@ public void removeExpiration(String workspaceId) { */ @Override public List findExpiredRunTimeout(long timestamp, long runTimeout) { - return workspaceActivities - .values() - .stream() + return workspaceActivities.values().stream() .filter( a -> (a.getExpiration() != null && a.getExpiration() < timestamp) @@ -69,9 +67,7 @@ public List findExpiredRunTimeout(long timestamp, long runTimeout) { @Override public List findExpiredIdle(long timestamp) { - return workspaceActivities - .values() - .stream() + return workspaceActivities.values().stream() .filter(a -> a.getExpiration() != null && a.getExpiration() < timestamp) .map(WorkspaceActivity::getWorkspaceId) .collect(toList()); @@ -113,9 +109,7 @@ public void setStatusChangeTime(String workspaceId, WorkspaceStatus status, long public Page findInStatusSince( long timestamp, WorkspaceStatus status, int maxItems, long skipCount) { List all = - workspaceActivities - .values() - .stream() + workspaceActivities.values().stream() .filter(a -> a.getStatus() == status && isGreater(a.getLastStopped(), timestamp)) .map(WorkspaceActivity::getWorkspaceId) .collect(toList()); diff --git a/wsmaster/che-core-api-workspace-shared/pom.xml b/wsmaster/che-core-api-workspace-shared/pom.xml index 23ff1064b05..d096cdeace5 100644 --- a/wsmaster/che-core-api-workspace-shared/pom.xml +++ b/wsmaster/che-core-api-workspace-shared/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 bc0c1d1fdec..8a620825d98 100644 --- a/wsmaster/che-core-api-workspace/pom.xml +++ b/wsmaster/che-core-api-workspace/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT che-core-api-workspace jar diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/DtoConverter.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/DtoConverter.java index 36a5512f511..617ea62d53b 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/DtoConverter.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/DtoConverter.java @@ -238,10 +238,7 @@ public static WorkspaceConfigDto asDto(WorkspaceConfig workspace) { List projects = workspace.getProjects().stream().map(DtoConverter::asDto).collect(toList()); Map environments = - workspace - .getEnvironments() - .entrySet() - .stream() + workspace.getEnvironments().entrySet().stream() .collect(toMap(Map.Entry::getKey, entry -> asDto(entry.getValue()))); return newDto(WorkspaceConfigDto.class) @@ -289,9 +286,7 @@ public static EnvironmentDto asDto(Environment env) { final EnvironmentDto envDto = newDto(EnvironmentDto.class); if (env.getMachines() != null) { envDto.withMachines( - env.getMachines() - .entrySet() - .stream() + env.getMachines().entrySet().stream() .collect(toMap(Map.Entry::getKey, entry -> asDto(entry.getValue())))); } if (env.getRecipe() != null) { @@ -310,10 +305,7 @@ public static MachineConfigDto asDto(MachineConfig machine) { MachineConfigDto machineDto = newDto(MachineConfigDto.class); if (machine.getServers() != null) { machineDto.setServers( - machine - .getServers() - .entrySet() - .stream() + machine.getServers().entrySet().stream() .collect(toMap(Map.Entry::getKey, entry -> asDto(entry.getValue())))); } if (machine.getAttributes() != null) { @@ -321,10 +313,7 @@ public static MachineConfigDto asDto(MachineConfig machine) { } if (machine.getVolumes() != null) { machineDto.setVolumes( - machine - .getVolumes() - .entrySet() - .stream() + machine.getVolumes().entrySet().stream() .collect(toMap(Map.Entry::getKey, entry -> asDto(entry.getValue())))); } if (machine.getEnv() != null) { @@ -350,10 +339,7 @@ public static RuntimeDto asDto(Runtime runtime) { RuntimeDto runtimeDto = newDto(RuntimeDto.class).withActiveEnv(runtime.getActiveEnv()); if (runtime.getMachines() != null) { runtimeDto.setMachines( - runtime - .getMachines() - .entrySet() - .stream() + runtime.getMachines().entrySet().stream() .collect(toMap(Map.Entry::getKey, entry -> asDto(entry.getValue())))); } if (runtime.getWarnings() != null) { @@ -402,10 +388,7 @@ public static MachineDto asDto(Machine machine) { .withStatus(machine.getStatus()); if (machine.getServers() != null) { machineDto.withServers( - machine - .getServers() - .entrySet() - .stream() + machine.getServers().entrySet().stream() .collect(toMap(Map.Entry::getKey, entry -> asDto(entry.getValue())))); } return machineDto; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimes.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimes.java index 0fece0ddccd..4d0ba93e7c9 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimes.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimes.java @@ -364,9 +364,7 @@ public InternalRuntime getInternalRuntime(String workspaceId) if (runtime == null) { try { final Optional runtimeIdentity = - infrastructure - .getIdentities() - .stream() + infrastructure.getIdentities().stream() .filter(id -> id.getWorkspaceId().equals(workspaceId)) .findAny(); @@ -573,10 +571,7 @@ public boolean refuseStart() { /** Returns workspace ids which has {@link WorkspaceStatus#RUNNING} runtimes. */ public Set getRunning() { - return statuses - .asMap() - .entrySet() - .stream() + return statuses.asMap().entrySet().stream() .filter(e -> RUNNING == e.getValue()) .map(Entry::getKey) .collect(toSet()); @@ -628,10 +623,7 @@ public boolean isAnyActive() { * status is {@link WorkspaceStatus#STARTING} or {@link WorkspaceStatus#STOPPING}) */ public Set getInProgress() { - return statuses - .asMap() - .entrySet() - .stream() + return statuses.asMap().entrySet().stream() .filter(e -> STARTING == e.getValue() || STOPPING == e.getValue()) .map(Entry::getKey) .filter(this::containsThisRuntimesId) @@ -660,10 +652,7 @@ public Set getInProgress(String owner) throws ServerException, Infrastru * {@link WorkspaceStatus#STARTING} or {@link WorkspaceStatus#STOPPING}), otherwise returns false. */ public boolean isAnyInProgress() { - return statuses - .asMap() - .entrySet() - .stream() + return statuses.asMap().entrySet().stream() .filter(e -> STARTING == e.getValue() || STOPPING == e.getValue()) .map(Entry::getKey) .anyMatch(this::containsThisRuntimesId); diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceService.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceService.java index 639045bcb8a..95baf6e9c95 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceService.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceService.java @@ -303,9 +303,7 @@ public Response getWorkspaces( EnvironmentContext.getCurrent().getSubject().getUserId(), false, maxItems, skipCount); return Response.ok() .entity( - workspacesPage - .getItems() - .stream() + workspacesPage.getItems().stream() .filter(ws -> status == null || status.equalsIgnoreCase(ws.getStatus().toString())) .map(DtoConverter::asDto) .collect(toList())) diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/DevfileParser.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/DevfileParser.java index 4d9b6cf02e6..f131ad1b4a8 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/DevfileParser.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/DevfileParser.java @@ -176,9 +176,7 @@ public DevfileImpl parseJson(String devfileContent) throws DevfileFormatExceptio public void resolveReference(DevfileImpl devfile, FileContentProvider fileContentProvider) throws DevfileException { List toResolve = - devfile - .getComponents() - .stream() + devfile.getComponents().stream() .filter( c -> c.getType().equals(KUBERNETES_COMPONENT_TYPE) diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/convert/component/ComponentToWorkspaceApplier.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/convert/component/ComponentToWorkspaceApplier.java index 75a52adb2fc..0333321b35c 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/convert/component/ComponentToWorkspaceApplier.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/convert/component/ComponentToWorkspaceApplier.java @@ -50,8 +50,7 @@ void apply( static Map convertEndpointsIntoServers( List endpoints, boolean requireSubdomain) { - return endpoints - .stream() + return endpoints.stream() .collect( Collectors.toMap( Endpoint::getName, diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/convert/component/editor/EditorComponentToWorkspaceApplier.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/convert/component/editor/EditorComponentToWorkspaceApplier.java index da8ba087424..f687902403b 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/convert/component/editor/EditorComponentToWorkspaceApplier.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/convert/component/editor/EditorComponentToWorkspaceApplier.java @@ -80,9 +80,7 @@ public void apply( componentFQNParser.getCompositeId(registryUrl, editorId)); } - workspaceConfig - .getCommands() - .stream() + workspaceConfig.getCommands().stream() .filter( c -> editorComponentAlias != null diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/validator/DevfileIntegrityValidator.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/validator/DevfileIntegrityValidator.java index 0e2d0ed8f60..9d9a6f69fe1 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/validator/DevfileIntegrityValidator.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/devfile/validator/DevfileIntegrityValidator.java @@ -115,9 +115,7 @@ private Set validateComponents(Devfile devfile) throws DevfileFormatExce format("Duplicate component alias found:'%s'", component.getAlias())); } Optional> duplicatedEndpoint = - component - .getEndpoints() - .stream() + component.getEndpoints().stream() .map(Endpoint::getName) .collect(Collectors.groupingBy(Function.identity(), Collectors.counting())) .entrySet() diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/hc/ServersChecker.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/hc/ServersChecker.java index e14818f728b..223f6562b02 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/hc/ServersChecker.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/hc/ServersChecker.java @@ -96,8 +96,7 @@ public CompletableFuture startAsync(Consumer serverReadinessHandler) // should be completed with an exception if a server considered unavailable CompletableFuture firstNonAvailable = new CompletableFuture<>(); CompletableFuture[] checkTasks = - serverCheckers - .stream() + serverCheckers.stream() .map(ServerChecker::getReportCompFuture) .map( compFut -> diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java index 2594a8928b5..00458c9ebed 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -59,9 +59,7 @@ public EnvironmentImpl(Recipe recipe, Map machi } if (machines != null) { this.machines = - machines - .entrySet() - .stream() + machines.entrySet().stream() .collect( Collectors.toMap( Map.Entry::getKey, entry -> new MachineConfigImpl(entry.getValue()))); diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/MachineConfigImpl.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/MachineConfigImpl.java index df0df3cb280..4b5270ee75a 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/MachineConfigImpl.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/MachineConfigImpl.java @@ -76,9 +76,7 @@ public MachineConfigImpl( Map volumes) { if (servers != null) { this.servers = - servers - .entrySet() - .stream() + servers.entrySet().stream() .collect( Collectors.toMap( Map.Entry::getKey, entry -> new ServerConfigImpl(entry.getValue()))); @@ -91,9 +89,7 @@ public MachineConfigImpl( } if (volumes != null) { this.volumes = - volumes - .entrySet() - .stream() + volumes.entrySet().stream() .collect( Collectors.toMap(Map.Entry::getKey, entry -> new VolumeImpl(entry.getValue()))); } diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/MachineImpl.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/MachineImpl.java index 309b65bab00..e41dd37fc4e 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/MachineImpl.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/MachineImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -43,9 +43,7 @@ public MachineImpl( public MachineImpl(Map servers) { if (servers != null) { this.servers = - servers - .entrySet() - .stream() + servers.entrySet().stream() .collect( HashMap::new, (map, entry) -> map.put(entry.getKey(), new ServerImpl(entry.getValue())), diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/ProjectConfigImpl.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/ProjectConfigImpl.java index 21964fde303..8a5e096bd1c 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/ProjectConfigImpl.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/ProjectConfigImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -101,10 +101,7 @@ public ProjectConfigImpl(ProjectConfig projectConfig) { type = projectConfig.getType(); mixins = new ArrayList<>(projectConfig.getMixins()); attributes = - projectConfig - .getAttributes() - .entrySet() - .stream() + projectConfig.getAttributes().entrySet().stream() .collect(toMap(Map.Entry::getKey, e -> new ArrayList<>(e.getValue()))); SourceStorage sourceStorage = projectConfig.getSource(); @@ -116,9 +113,7 @@ public ProjectConfigImpl(ProjectConfig projectConfig) { } if (projectConfig.getProblems() != null) { problems = - projectConfig - .getProblems() - .stream() + projectConfig.getProblems().stream() .map(problem -> new ProjectProblemImpl(problem.getCode(), problem.getMessage())) .collect(Collectors.toList()); } else { diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/RuntimeImpl.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/RuntimeImpl.java index 38312a68646..c10d562a53d 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/RuntimeImpl.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/RuntimeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2021 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -58,10 +58,7 @@ public RuntimeImpl( public RuntimeImpl(Runtime runtime) { this.activeEnv = runtime.getActiveEnv(); this.machines = - runtime - .getMachines() - .entrySet() - .stream() + runtime.getMachines().entrySet().stream() .collect(Collectors.toMap(Map.Entry::getKey, e -> new MachineImpl(e.getValue()))); this.owner = runtime.getOwner(); this.warnings = diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/WorkspaceConfigImpl.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/WorkspaceConfigImpl.java index d0793b11b22..75115cf3a5c 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/WorkspaceConfigImpl.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/WorkspaceConfigImpl.java @@ -121,9 +121,7 @@ public WorkspaceConfigImpl( this.description = description; if (environments != null) { this.environments = - environments - .entrySet() - .stream() + environments.entrySet().stream() .collect(toMap(Map.Entry::getKey, entry -> new EnvironmentImpl(entry.getValue()))); } if (commands != null) { diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/InternalRuntime.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/InternalRuntime.java index 1c76c8643dc..d8ca446e414 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/InternalRuntime.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/InternalRuntime.java @@ -87,9 +87,7 @@ public List getWarnings() { * @throws InfrastructureException when any error occurs */ public Map getMachines() throws InfrastructureException { - return getInternalMachines() - .entrySet() - .stream() + return getInternalMachines().entrySet().stream() .collect( toMap( Map.Entry::getKey, diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/environment/InternalEnvironmentFactory.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/environment/InternalEnvironmentFactory.java index 25fb52426e2..8b8bfe0a3d9 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/environment/InternalEnvironmentFactory.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/environment/InternalEnvironmentFactory.java @@ -133,9 +133,7 @@ protected abstract T doCreate( @VisibleForTesting Map normalizeServers(Map servers) { - return servers - .entrySet() - .stream() + return servers.entrySet().stream() .collect(Collectors.toMap(Entry::getKey, e -> normalizeServer(e.getValue()))); } diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/wsplugins/PluginFQNParser.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/wsplugins/PluginFQNParser.java index 0c193cc6cc1..0f1ce29090b 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/wsplugins/PluginFQNParser.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/wsplugins/PluginFQNParser.java @@ -113,8 +113,7 @@ private Collection parsePluginFQNs(String attribute) throws Infrastru PluginFQN pFQN = parsePluginFQN(plugin); String pluginKey = firstNonNull(pFQN.getReference(), pFQN.getId()); - if (collectedFQNs - .stream() + if (collectedFQNs.stream() .anyMatch(p -> pluginKey.equals(p.getId()) || pluginKey.equals(p.getReference()))) { throw new InfrastructureException( format( diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/PreviewUrlLinksVariableGeneratorTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/PreviewUrlLinksVariableGeneratorTest.java index 6503dce05a3..94d209d89ac 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/PreviewUrlLinksVariableGeneratorTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/PreviewUrlLinksVariableGeneratorTest.java @@ -92,9 +92,7 @@ public void shouldUpdateCommandAndReturnLinkMapWhenPreviewUrlFound() { assertTrue(varKey.startsWith("previewurl/")); Command aCommand = - w.getRuntime() - .getCommands() - .stream() + w.getRuntime().getCommands().stream() .filter(c -> c.getName().equals("a")) .findFirst() .get(); diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTest.java index fa3c44e937f..dcb3a6f6418 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTest.java @@ -606,8 +606,7 @@ public void shouldGetWorkspaces() throws Exception { assertEquals(response.getStatusCode(), 200); assertNotNull(response.getHeader("Link")); assertEquals( - unwrapDtoList(response, WorkspaceDto.class) - .stream() + unwrapDtoList(response, WorkspaceDto.class).stream() .map(ws -> new WorkspaceImpl(ws, TEST_ACCOUNT)) .collect(toList()), asList(workspace1, workspace2)); @@ -629,8 +628,7 @@ public void shouldGetWorkspacesByNamespace() throws Exception { assertEquals(response.getStatusCode(), 200); assertEquals( - unwrapDtoList(response, WorkspaceDto.class) - .stream() + unwrapDtoList(response, WorkspaceDto.class).stream() .map(ws -> new WorkspaceImpl(ws, TEST_ACCOUNT)) .collect(toList()), asList(workspace1, workspace2)); @@ -652,8 +650,7 @@ public void shouldGetWorkspacesByStatus() throws Exception { assertEquals(response.getStatusCode(), 200); assertEquals( - unwrapDtoList(response, WorkspaceDto.class) - .stream() + unwrapDtoList(response, WorkspaceDto.class).stream() .map(ws -> new WorkspaceImpl(ws, TEST_ACCOUNT)) .collect(toList()), singletonList(workspace2)); diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/devfile/convert/DefaultEditorProvisionerTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/devfile/convert/DefaultEditorProvisionerTest.java index c8338802d1f..bf2a58d4724 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/devfile/convert/DefaultEditorProvisionerTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/devfile/convert/DefaultEditorProvisionerTest.java @@ -464,8 +464,7 @@ public void shouldProvisionAsyncStoragePluginsIfWorkspaceHasBothAttributes() thr } private ComponentImpl findById(List components, String id) { - return components - .stream() + return components.stream() .filter(c -> c.getId() != null && c.getId().startsWith(id + ':')) .findAny() .orElse(null); diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/WorkspaceDaoTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/WorkspaceDaoTest.java index 4c57180f97b..0cc1503ca4c 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/WorkspaceDaoTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/WorkspaceDaoTest.java @@ -522,11 +522,7 @@ public void shouldUpdateWorkspaceWithConfig() throws Exception { // Remove an existing environment final Optional nonDefaultEnv = - workspace - .getConfig() - .getEnvironments() - .keySet() - .stream() + workspace.getConfig().getEnvironments().keySet().stream() .filter(key -> !key.equals(workspace.getConfig().getDefaultEnv())) .findAny(); assertTrue(nonDefaultEnv.isPresent()); diff --git a/wsmaster/che-core-sql-schema/pom.xml b/wsmaster/che-core-sql-schema/pom.xml index 52315a71932..2d1b4508604 100644 --- a/wsmaster/che-core-sql-schema/pom.xml +++ b/wsmaster/che-core-sql-schema/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 c5841e9e996..046c687f982 100644 --- a/wsmaster/integration-tests/cascade-removal/pom.xml +++ b/wsmaster/integration-tests/cascade-removal/pom.xml @@ -17,7 +17,7 @@ integration-tests-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT cascade-removal Integration Tests :: Cascade Removal diff --git a/wsmaster/integration-tests/mysql-tck/pom.xml b/wsmaster/integration-tests/mysql-tck/pom.xml index 435c7b2d40e..7200bd2bcda 100644 --- a/wsmaster/integration-tests/mysql-tck/pom.xml +++ b/wsmaster/integration-tests/mysql-tck/pom.xml @@ -17,7 +17,7 @@ integration-tests-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT mysql-tck jar diff --git a/wsmaster/integration-tests/mysql-tck/src/test/java/MySqlTckModule.java b/wsmaster/integration-tests/mysql-tck/src/test/java/MySqlTckModule.java index 5f657d4fb4a..23dd04c590e 100644 --- a/wsmaster/integration-tests/mysql-tck/src/test/java/MySqlTckModule.java +++ b/wsmaster/integration-tests/mysql-tck/src/test/java/MySqlTckModule.java @@ -278,8 +278,7 @@ static class UserRepo implements TckRepository { @Override public void createAll(Collection entities) throws TckRepositoryException { final EntityManager manager = managerProvider.get(); - entities - .stream() + entities.stream() .map( user -> new UserImpl( diff --git a/wsmaster/integration-tests/pom.xml b/wsmaster/integration-tests/pom.xml index bfad60887d9..0522649af8f 100644 --- a/wsmaster/integration-tests/pom.xml +++ b/wsmaster/integration-tests/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.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 9f226f83dda..f58b9513a10 100644 --- a/wsmaster/integration-tests/postgresql-tck/pom.xml +++ b/wsmaster/integration-tests/postgresql-tck/pom.xml @@ -17,7 +17,7 @@ integration-tests-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT postgresql-tck jar diff --git a/wsmaster/integration-tests/postgresql-tck/src/test/java/PostgreSqlTckModule.java b/wsmaster/integration-tests/postgresql-tck/src/test/java/PostgreSqlTckModule.java index b1e640b014c..31cfed8d4cd 100644 --- a/wsmaster/integration-tests/postgresql-tck/src/test/java/PostgreSqlTckModule.java +++ b/wsmaster/integration-tests/postgresql-tck/src/test/java/PostgreSqlTckModule.java @@ -267,8 +267,7 @@ static class UserRepo implements TckRepository { @Override public void createAll(Collection entities) throws TckRepositoryException { final EntityManager manager = managerProvider.get(); - entities - .stream() + entities.stream() .map( user -> new UserImpl( diff --git a/wsmaster/pom.xml b/wsmaster/pom.xml index 6ee0931f2c3..ae44e8d6674 100644 --- a/wsmaster/pom.xml +++ b/wsmaster/pom.xml @@ -17,7 +17,7 @@ che-core-parent org.eclipse.che.core - 7.41.0-SNAPSHOT + 7.42.0-SNAPSHOT ../core/pom.xml che-master-parent