From ce7c300eb9f6a041355efdcb80242f488f5b4e52 Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Thu, 23 Dec 2021 14:54:46 +0200 Subject: [PATCH] build: Upgrade of maven plugins (#222) * build: Upgrade of maven plugins Signed-off-by: Sergii Kabashniuk --- .../IntegrityConfigurationTest.java | 20 +++-------- ...erverSideRequestProcessorConfigurator.java | 3 +- .../RemoteSubscriptionManager.java | 6 ++-- .../che/api/core/rest/ApiInfoService.java | 4 +-- .../core/rest/DefaultHttpJsonResponse.java | 6 ++-- .../core/util/JsonRpcEndpointIdsHolder.java | 6 ++-- .../JsonRpcEndpointToMachineNameHolder.java | 6 ++-- .../eclipse/che/api/core/util/PagingUtil.java | 3 +- .../impl/WebSocketSessionRegistry.java | 8 ++--- .../flyway/CustomSqlMigrationResolver.java | 4 +-- .../dto/TypeScriptDtoGenerator.java | 5 ++- .../plugin/typescript/dto/model/DtoModel.java | 9 ++--- .../org/eclipse/che/inject/CheBootstrap.java | 8 ++--- .../org/eclipse/che/commons/lang/IoUtil.java | 3 +- .../schedule/executor/CronExpression.java | 6 ++-- .../KubernetesPersonalAccessTokenManager.java | 4 +-- .../kubernetes/KubernetesInternalRuntime.java | 12 ++----- .../kubernetes/devfile/ContainerSearch.java | 8 +---- ...ockerimageComponentToWorkspaceApplier.java | 8 ++--- ...KubernetesComponentToWorkspaceApplier.java | 33 +++++-------------- .../KubernetesEnvironmentProvisioner.java | 3 +- .../environment/KubernetesRecipeParser.java | 3 +- .../model/KubernetesMachineImpl.java | 4 +-- .../namespace/KubernetesDeployments.java | 4 +-- .../namespace/KubernetesNamespaceFactory.java | 9 ++--- .../configurator/SshKeysConfigurator.java | 3 +- .../namespace/pvc/CommonPVCStrategy.java | 5 +-- .../pvc/EphemeralWorkspaceAdapter.java | 4 +-- .../namespace/pvc/PVCProvisioner.java | 4 +-- .../provision/CertificateProvisioner.java | 8 ++--- .../KubernetesTrustedCAProvisioner.java | 8 ++--- .../PreviewUrlCommandProvisioner.java | 3 +- .../provision/ProxySettingsProvisioner.java | 5 +-- .../provision/SshKeysProvisioner.java | 6 ++-- .../provision/UniqueNamesProvisioner.java | 11 ++----- .../VcsSslCertificateProvisioner.java | 8 ++--- .../provision/env/EnvVarsConverter.java | 5 +-- .../provision/secret/FileSecretApplier.java | 10 ++---- .../secret/KubernetesSecretApplier.java | 4 +-- .../server/KubernetesServerExposer.java | 8 ++--- .../kubernetes/server/PreviewUrlExposer.java | 3 +- .../CombinedSingleHostServerExposer.java | 8 ++--- .../resolver/AbstractServerResolver.java | 4 +-- .../resolver/ConfigMapServerResolver.java | 4 +-- .../resolver/IngressServerResolver.java | 4 +-- .../kubernetes/util/Services.java | 5 +-- .../UnrecoverablePodEventListenerFactory.java | 5 +-- .../wsplugins/ChePluginsVolumeApplier.java | 8 ++--- .../wsplugins/K8sContainerResolver.java | 3 +- .../K8sContainerResolverBuilder.java | 3 +- .../KubernetesPluginsToolingApplier.java | 17 +++------- .../KubernetesArtifactsBrokerApplierTest.java | 5 +-- .../KubernetesInternalRuntimeTest.java | 25 +++----------- .../tck/KubernetesMachinesCacheTest.java | 5 +-- .../devfile/ContainerSearchTest.java | 3 +- ...rnetesComponentToWorkspaceApplierTest.java | 24 ++++---------- .../KubernetesEnvironmentFactoryTest.java | 5 +-- .../kubernetes/environment/PodMergerTest.java | 3 +- .../KubernetesNamespaceFactoryTest.java | 24 +++----------- ...KubernetesWorkspaceServiceAccountTest.java | 18 ++++------ ...rkspaceServiceAccountConfiguratorTest.java | 6 ++-- .../namespace/pvc/PVCProvisionerTest.java | 4 +-- .../ProxySettingsProvisionerTest.java | 15 ++------- .../VcsSslCertificateProvisionerTest.java | 5 +-- .../server/KubernetesServerExposerTest.java | 19 +++-------- .../wsplugins/K8sContainerResolverTest.java | 8 ++--- .../KubernetesPluginsToolingApplierTest.java | 14 +++----- .../SidecarServicesProvisionerTest.java | 5 ++- .../BrokerEnvironmentFactoryTest.java | 25 +++----------- .../OpenShiftEnvironmentValidator.java | 4 +-- .../project/OpenShiftProjectFactory.java | 3 +- .../openshift/server/RouteServerResolver.java | 4 +-- .../OpenShiftEnvironmentFactoryTest.java | 5 +-- .../OpenshiftTrustedCAProvisionerTest.java | 4 +-- .../organization/api/DtoConverter.java | 6 ++-- ...anizationResourcesDistributionService.java | 4 +-- .../OrganizationResourcesDistributor.java | 6 ++-- ...onalAccountAvailableResourcesProvider.java | 5 ++- .../SuborganizationResourcesProvider.java | 5 ++- ...paOrganizationDistributedResourcesDao.java | 5 ++- .../permission/server/PermissionsManager.java | 5 ++- .../multiuser/resource/api/DtoConverter.java | 14 +++----- .../exception/NoEnoughResourcesException.java | 5 ++- .../api/free/FreeResourcesProvider.java | 5 ++- .../resource/api/free/ResourceValidator.java | 8 ++--- .../DefaultAvailableResourcesProvider.java | 5 ++- .../resource/api/usage/ResourceManager.java | 5 ++- .../resource/api/usage/ResourceService.java | 12 ++----- .../resource/api/usage/ResourcesLocks.java | 5 ++- .../tracker/EnvironmentRamCalculator.java | 12 ++----- .../MultiUserWorkspaceActivityManager.java | 3 +- .../test/java/MultiuserMySqlTckModule.java | 3 +- .../java/MultiuserPostgresqlTckModule.java | 3 +- .../spi/jpa/JpaUserDevfilePermissionDao.java | 3 +- .../ResourceServicePermissionsFilter.java | 3 +- .../filters/WorkspacePermissionsFilter.java | 3 +- pom.xml | 10 +++--- .../api/devfile/server/DevfileService.java | 8 ++--- .../devfile/server/jpa/JpaUserDevfileDao.java | 9 ++--- ...ucketServerPersonalAccessTokenFetcher.java | 4 +-- .../server/bitbucket/BitbucketURLParser.java | 3 +- .../server/HttpBitbucketServerApiClient.java | 6 ++-- .../oauth1/BitbucketServerApiProvider.java | 7 ++-- .../HttpBitbucketServerApiClientTest.java | 12 ++----- .../server/gitlab/GitlabUrlParser.java | 3 +- .../DefaultFactoryParameterResolver.java | 4 +-- .../server/FactoryLinksHelperTest.java | 9 ++--- .../eclipse/che/api/logger/LoggerService.java | 4 +-- .../WorkspaceFailureMeterBinderTest.java | 3 +- .../che/api/ssh/server/SshService.java | 4 +-- .../api/system/server/ServiceTerminator.java | 5 ++- .../api/user/server/jpa/JpaPreferenceDao.java | 6 ++-- .../user/server/ProfileLinksInjectorTest.java | 6 ++-- .../user/server/UserLinksInjectorTest.java | 6 ++-- .../user/server/jpa/UserJpaTckRepository.java | 5 ++- .../api/user/server/spi/tck/UserDaoTest.java | 7 ++-- .../InmemoryWorkspaceActivityDao.java | 12 ++----- .../api/workspace/server/DtoConverter.java | 29 ++++------------ .../workspace/server/WorkspaceRuntimes.java | 19 +++-------- .../workspace/server/WorkspaceService.java | 4 +-- .../server/devfile/DevfileParser.java | 4 +-- .../ComponentToWorkspaceApplier.java | 3 +- .../EditorComponentToWorkspaceApplier.java | 4 +-- .../validator/DevfileIntegrityValidator.java | 4 +-- .../workspace/server/hc/ServersChecker.java | 3 +- .../server/model/impl/EnvironmentImpl.java | 6 ++-- .../server/model/impl/MachineConfigImpl.java | 8 ++--- .../server/model/impl/MachineImpl.java | 6 ++-- .../server/model/impl/ProjectConfigImpl.java | 11 ++----- .../server/model/impl/RuntimeImpl.java | 7 ++-- .../model/impl/WorkspaceConfigImpl.java | 4 +-- .../workspace/server/spi/InternalRuntime.java | 4 +-- .../InternalEnvironmentFactory.java | 4 +-- .../server/wsplugins/PluginFQNParser.java | 3 +- .../PreviewUrlLinksVariableGeneratorTest.java | 4 +-- .../server/WorkspaceServiceTest.java | 9 ++--- .../convert/DefaultEditorProvisionerTest.java | 3 +- .../server/spi/tck/WorkspaceDaoTest.java | 6 +--- .../src/test/java/MySqlTckModule.java | 3 +- .../src/test/java/PostgreSqlTckModule.java | 3 +- 140 files changed, 271 insertions(+), 712 deletions(-) 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 25a687a4b6..f60f01e591 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 class IntegrityConfigurationTest { 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/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 656772741e..23d351bde9 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 2a2439a163..f486b4cf1e 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 class RemoteSubscriptionManager { 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 0efddec7ea..88b670442d 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 class ApiInfoService { 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 edf36e2f3d..cc8a3ebd03 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 @@ public class DefaultHttpJsonResponse implements HttpJsonResponse { 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/JsonRpcEndpointIdsHolder.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/util/JsonRpcEndpointIdsHolder.java index 9b3ed3cfd8..7581869f04 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 @@ public class JsonRpcEndpointIdsHolder { } 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 3c4f0747d1..a857f4896a 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 @@ public class JsonRpcEndpointToMachineNameHolder { } 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 a3cb682dfa..1777ef2cc9 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 final class PagingUtil { 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/websocket/impl/WebSocketSessionRegistry.java b/core/che-core-api-core/src/main/java/org/eclipse/che/api/core/websocket/impl/WebSocketSessionRegistry.java index 8330c9eb5f..61053db867 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 class WebSocketSessionRegistry { } 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-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 5656aae46e..e1abaaac7d 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 @@ public class CustomSqlMigrationResolver extends BaseMigrationResolver { 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-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 9f41e15968..f8d33ab928 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 @@ public class TypeScriptDtoGenerator { 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 5198555cdb..ccc4fc1535 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 class DtoModel { /** 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 @@ public class DtoModel { }); // now convert map into list - fieldAttributes - .entrySet() - .stream() + fieldAttributes.entrySet().stream() .forEach( field -> fieldAttributeModels.add( 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 e1b1724eca..347b21d537 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 @@ public class CheBootstrap extends EverrestGuiceContextListener { @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 @@ public class CheBootstrap extends EverrestGuiceContextListener { @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-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 7385e8679d..7102b082f4 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 class IoUtil { 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-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 e0751c4c2f..4c479a51f7 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 @@ public final class CronExpression implements Serializable, Cloneable { } 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/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 27bceadd76..b145d36391 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 class KubernetesPersonalAccessTokenManager implements PersonalAccessToken private String getFirstNamespace() throws UnsatisfiedScmPreconditionException, ScmConfigurationPersistenceException { try { - return namespaceFactory - .list() - .stream() + return namespaceFactory.list().stream() .map(KubernetesNamespaceMeta::getName) .findFirst() .orElseThrow( 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 85f6b86119..a23077f74d 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 @@ public class KubernetesInternalRuntime 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 @@ public class KubernetesInternalRuntime 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 @@ public class KubernetesInternalRuntime */ 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 535caa5e9d..18c9aa70f4 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 @@ public class ContainerSearch { 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 a476e8f1dc..0a5bf5d338 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 class DockerimageComponentToWorkspaceApplier implements ComponentToWorksp componentObjects, ImmutableMap.of(machineName, machineConfig)); - workspaceConfig - .getCommands() - .stream() + workspaceConfig.getCommands().stream() .filter( c -> componentAlias != null @@ -177,9 +175,7 @@ public class DockerimageComponentToWorkspaceApplier implements ComponentToWorksp 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 ad41536877..0acfdeac8a 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 class KubernetesComponentToWorkspaceApplier implements ComponentToWorkspa prepareComponentObjects(k8sComponent, componentContent); List podsData = getPodDatas(componentObjects); - podsData - .stream() + podsData.stream() .flatMap( e -> Stream.concat( @@ -205,8 +204,7 @@ public class KubernetesComponentToWorkspaceApplier implements ComponentToWorkspa } private void applyProjectsVolumes(List podsData, List componentObjects) { - if (componentObjects - .stream() + if (componentObjects.stream() .noneMatch( hasMeta -> hasMeta instanceof PersistentVolumeClaim @@ -221,18 +219,13 @@ public class KubernetesComponentToWorkspaceApplier implements ComponentToWorkspa } 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 @@ public class KubernetesComponentToWorkspaceApplier implements ComponentToWorkspa 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 @@ public class KubernetesComponentToWorkspaceApplier implements ComponentToWorkspa 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 @@ public class KubernetesComponentToWorkspaceApplier implements ComponentToWorkspa 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 @@ public class KubernetesComponentToWorkspaceApplier implements ComponentToWorkspa 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 bbbe74a3d9..55e0317d89 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 @@ public class KubernetesEnvironmentProvisioner { 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 b37c885162..4c60dc1c73 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 class KubernetesRecipeParser { 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 a8b2534f6f..529c470d16 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 class KubernetesMachineImpl implements Machine { 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 618e435fa0..df86d5715d 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 @@ public class KubernetesDeployments { 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 01402f7b42..a480aafe62 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 class 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 @@ public class KubernetesNamespaceFactory { List labeledNamespaces = findPreparedNamespaces(resolutionCtx); if (!labeledNamespaces.isEmpty()) { String foundNamespace = - labeledNamespaces - .stream() + labeledNamespaces.stream() .findFirst() .map(KubernetesNamespaceMeta::getName) .orElseThrow( @@ -542,8 +540,7 @@ public class KubernetesNamespaceFactory { 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 a946715992..0393da5221 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 class SshKeysConfigurator implements NamespaceConfigurator { 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 5810300a16..f086c7a021 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 @@ public class CommonPVCStrategy implements WorkspaceVolumesStrategy { } 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 9784e24517..11516f403c 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 class EphemeralWorkspaceAdapter { 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 5da0a49766..b43ebbf709 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 @@ public class PVCProvisioner { 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 7d63d4fda0..d40b9ec836 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 class CertificateProvisioner implements ConfigurationProvisioner v.getName().equals(CHE_SELF_SIGNED_CERT_VOLUME))) { pod.getSpec().getVolumes().add(buildCertSecretVolume(selfSignedCertSecretName)); } @@ -102,9 +100,7 @@ public class CertificateProvisioner implements ConfigurationProvisioner 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 7febebb9f3..5de2726f07 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 class KubernetesTrustedCAProvisioner implements TrustedCAProvisioner { 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 class KubernetesTrustedCAProvisioner implements TrustedCAProvisioner { } 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 8f1ab59b52..847f2bd47b 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 @@ public abstract class PreviewUrlCommandProvisioner< 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 2b74ddca2f..427fcf96a8 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 class ProxySettingsProvisioner implements ConfigurationProvisioner { 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 91e65dd8d1..ebdb317841 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 class SshKeysProvisioner implements ConfigurationProvisioner invalidSshKeyNames = - allSshPairs - .stream() + allSshPairs.stream() .filter(keyPair -> !isValidSshKeyPair(keyPair)) .map(SshPairImpl::getName) .collect(toList()); @@ -220,8 +219,7 @@ public class SshKeysProvisioner implements ConfigurationProvisioner 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 03d87a0a05..0cc1126915 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 @@ public class UniqueNamesProvisioner 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 @@ public class UniqueNamesProvisioner } 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 @@ public class UniqueNamesProvisioner // 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 f8c2951518..5147c579f6 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 class VcsSslCertificateProvisioner 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 class VcsSslCertificateProvisioner } 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 8621ff23a0..e3637d0e2e 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 class EnvVarsConverter implements ConfigurationProvisioner { // 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 1ad3e2cea4..834733685e 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 class FileSecretApplier extends KubernetesSecretApplier v.getName().equals(volumeFromSecret.getName()))) { volumeFromSecret.setName(volumeFromSecret.getName() + "_" + NameGenerator.generate("", 6)); } @@ -135,10 +132,7 @@ public class FileSecretApplier extends KubernetesSecretApplier 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 287592d8f8..4e60d58344 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 @@ public abstract class KubernetesSecretApplier { 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 7e519d03e1..f0b3e7e636 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 @@ public class KubernetesServerExposer { 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 @@ public class KubernetesServerExposer { } 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 aff7c12db8..e4da8de4ff 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 @@ public class PreviewUrlExposer { 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 04ada93e24..7bc500951a 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 class CombinedSingleHostServerExposer @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 class CombinedSingleHostServerExposer @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 6e0a76c505..492021ff3e 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 abstract class AbstractServerResolver implements ServerResolver { } 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 6d59d24b8a..c0100a9368 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 class ConfigMapServerResolver extends AbstractServerResolver { 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 20ff7381b8..540690c9e7 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 class IngressServerResolver extends AbstractServerResolver { @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 de8ba5da0e..ec6883fedd 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 class Services { 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 c67ad591e5..4f5937b6e1 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 class UnrecoverablePodEventListenerFactory { } 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 3fbc07c65e..ffe6696347 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 @@ public class ChePluginsVolumeApplier { PodSpec podSpec = pod.getSpec(); Optional volumeOpt = - podSpec - .getVolumes() - .stream() + podSpec.getVolumes().stream() .filter( vm -> vm.getPersistentVolumeClaim() != null @@ -101,9 +99,7 @@ public class ChePluginsVolumeApplier { } 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 e8be56bf91..70a52d752d 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 @@ public class K8sContainerResolver { } 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 d45ee9261a..6573a08819 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 @@ public class K8sContainerResolverBuilder { 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 35f52190e5..835c31a38d 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 class KubernetesPluginsToolingApplier implements ChePluginsApplier { 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 @@ public class KubernetesPluginsToolingApplier implements ChePluginsApplier { 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 @@ public class KubernetesPluginsToolingApplier implements ChePluginsApplier { 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 @@ public class KubernetesPluginsToolingApplier implements ChePluginsApplier { 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 5338af452b..bed701e2a3 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 class KubernetesArtifactsBrokerApplierTest { 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 5d588113b9..d33bfe4084 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 class KubernetesInternalRuntimeTest { 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 class KubernetesInternalRuntimeTest { 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 @@ public class KubernetesInternalRuntimeTest { 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 class KubernetesInternalRuntimeTest { @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 3b5eb0c7f6..29408c10f2 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 class KubernetesMachinesCacheTest { // 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 fc77fd986e..4d57dab4a8 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 class ContainerSearchTest { } 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 532646602f..a7b9cd0d58 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 class KubernetesComponentToWorkspaceApplierTest { } // 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 class KubernetesComponentToWorkspaceApplierTest { 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 class KubernetesComponentToWorkspaceApplierTest { 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 class KubernetesComponentToWorkspaceApplierTest { 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 @@ public class KubernetesComponentToWorkspaceApplierTest { } 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 8b25667d42..08b864314f 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 class KubernetesEnvironmentFactoryTest { 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 a0220e39cb..8c1f458ec0 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 class PodMergerTest { 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 e09f22415d..5e01b4bbf2 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 class KubernetesNamespaceFactoryTest { "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 class KubernetesNamespaceFactoryTest { // 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 class KubernetesNamespaceFactoryTest { 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 class KubernetesNamespaceFactoryTest { 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 47d1c4c215..23c9916d5f 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 class KubernetesWorkspaceServiceAccountTest { 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 class KubernetesWorkspaceServiceAccountTest { 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 class KubernetesWorkspaceServiceAccountTest { // 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 class KubernetesWorkspaceServiceAccountTest { 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 class KubernetesWorkspaceServiceAccountTest { // 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 class KubernetesWorkspaceServiceAccountTest { 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 eaf57870af..59888263ea 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 class WorkspaceServiceAccountConfiguratorTest { 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 class WorkspaceServiceAccountConfiguratorTest { 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 b4e16ca1e7..5e8dc37b00 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 @@ public class PVCProvisionerTest { 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 f96305d5a9..083fb39211 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 class ProxySettingsProvisionerTest { 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 class ProxySettingsProvisionerTest { 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 class ProxySettingsProvisionerTest { 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 ac365c5cfc..af7e8bcfc2 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 class VcsSslCertificateProvisionerTest { } 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 8334016c58..3e4dd4331f 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 @@ public class KubernetesServerExposerTest { 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 @@ public class KubernetesServerExposerTest { // 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 @@ public class KubernetesServerExposerTest { private void assertThatContainerPortIsExposed(String portProtocol, Integer port) { assertTrue( - container - .getPorts() - .stream() + container.getPorts().stream() .anyMatch( p -> p.getContainerPort().equals(port) @@ -622,10 +614,7 @@ public class KubernetesServerExposerTest { 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 6833b7ea25..956cba77f7 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 @@ public class K8sContainerResolverTest { } 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 db541738d3..7622351bb3 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 @@ public class KubernetesPluginsToolingApplierTest { 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 @@ public class KubernetesPluginsToolingApplierTest { 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 @@ public class KubernetesPluginsToolingApplierTest { 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 @@ public class KubernetesPluginsToolingApplierTest { .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 8b9706398f..db40408d0d 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 class SidecarServicesProvisionerTest { } 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 b0c9715539..234307ecc9 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 class BrokerEnvironmentFactoryTest { 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 class BrokerEnvironmentFactoryTest { 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 class BrokerEnvironmentFactoryTest { 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 class BrokerEnvironmentFactoryTest { 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 class BrokerEnvironmentFactoryTest { 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/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 7bf2519f40..815339d46c 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 class OpenShiftEnvironmentValidator extends KubernetesEnvironmentValidato 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 673ccb3b81..494c23e95c 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 @@ public class OpenShiftProjectFactory extends KubernetesNamespaceFactory { 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 5f7afc88ba..22749bbf28 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 class RouteServerResolver extends AbstractServerResolver { @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 bb39e14483..019c2a6888 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 class OpenShiftEnvironmentFactoryTest { 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 9cfcca97bc..3f63a13a76 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 class OpenshiftTrustedCAProvisionerTest { 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/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 9703f76b4d..212f9d3195 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 final class DtoConverter { 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 55f20db495..e9e8c0effc 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 class OrganizationResourcesDistributionService extends Service { @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 b3c63305b4..5d70790e26 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 @@ public class OrganizationResourcesDistributor { 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 746cfc3139..31d095c34d 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 @@ public class OrganizationalAccountAvailableResourcesProvider implements Availabl /** 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 8e5104922a..bea5ed7354 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 @@ public class SuborganizationResourcesProvider implements ResourcesProvider { 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 a53a413712..ac89d937e7 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 class JpaOrganizationDistributedResourcesDao implements OrganizationDistr .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/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 964863b621..f70334f356 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 @@ public class PermissionsManager { throws ConflictException { final Set 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/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 c26fc31bc3..c1749b100d 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 final class DtoConverter { 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 @@ public final class DtoConverter { .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 20d1dc785d..6ed40f3e0a 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 class NoEnoughResourcesException extends Exception { 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 3cd2318bd5..b639109d3f 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 class FreeResourcesProvider implements ResourcesProvider { 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 375a162855..1067b7cc3e 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 88ba450a97..b4308351a7 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 class DefaultAvailableResourcesProvider implements AvailableResourcesProv /** 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 a8817a8b16..caa4fa84cf 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 class ResourceManager { } 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 c4ac47e72a..cbdeb4d9bb 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 class ResourceService extends Service { 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 class ResourceService extends Service { }) 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 class ResourceService extends Service { }) 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 0193b576c3..e0e670d352 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 class 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 a0cfca4c7e..83d6a1a7e2 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 class EnvironmentRamCalculator { 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 class EnvironmentRamCalculator { * @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/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 19efb56bf0..7ae6ab18bc 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 @@ public class MultiUserWorkspaceActivityManager extends WorkspaceActivityManager return defaultTimeout; } Optional timeoutOpt = - availableResources - .stream() + availableResources.stream() .filter(resource -> TimeoutResourceType.ID.equals(resource.getType())) .findAny(); 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 bbc476568c..f1c8da1139 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 class MultiuserMySqlTckModule extends TckModule { @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/src/test/java/MultiuserPostgresqlTckModule.java b/multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/java/MultiuserPostgresqlTckModule.java index 6ec3262250..3de763e947 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 class MultiuserPostgresqlTckModule extends TckModule { @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/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 84e6e45887..bda5bf2f3a 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 class JpaUserDevfilePermissionDao @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-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 644ef720fe..1e5f7703be 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 class ResourceServicePermissionsFilter extends CheMethodInvokerFilter { 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-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 145e6e120f..8667a9b0f4 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 class WorkspacePermissionsFilter extends CheMethodInvokerFilter { this.workspaceManager = workspaceManager; this.accountManager = accountManager; this.accountTypeToPermissionsChecker = - accountPermissionsCheckers - .stream() + accountPermissionsCheckers.stream() .collect(toMap(AccountPermissionsChecker::getAccountType, identity())); this.superPrivilegesChecker = superPrivilegesChecker; } diff --git a/pom.xml b/pom.xml index be0ffa3b8c..a210975803 100644 --- a/pom.xml +++ b/pom.xml @@ -107,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 @@ -115,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 @@ -135,7 +135,7 @@ 4.5.13 4.4.15 3.3.0 - 3.2 + 3.6.2 3.8.4 10.0.14 3.4.1 @@ -1801,7 +1801,7 @@ buildNumber no_revision true - {0, date,yyyyMMdd} + yyyyMMdd 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 a02550b438..c474e42d8c 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 class DevfileService extends Service { 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 class DevfileService extends Service { 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 e15977af3e..c2215ae47d 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 @@ public class JpaUserDevfileDao implements UserDevfileDao { 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 @@ public class JpaUserDevfileDao implements UserDevfileDao { 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 @@ public class JpaUserDevfileDao implements UserDevfileDao { } 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/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 831468e4b9..8d91ac0011 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 class BitbucketServerPersonalAccessTokenFetcher implements PersonalAccess 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 207e10d19c..f278fb58d9 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 class BitbucketURLParser { } 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 4435f37f19..c2faed7efe 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 class HttpBitbucketServerApiClient implements BitbucketServerApiClient { // 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 class HttpBitbucketServerApiClient implements BitbucketServerApiClient { 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 ebac584798..68bcd56b21 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 @@ public class BitbucketServerApiProvider implements Provider authenticator = - authenticators - .stream() + authenticators.stream() .filter( a -> a.getOAuthProvider() @@ -92,9 +91,7 @@ public class BitbucketServerApiProvider implements Provider 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 4fdbf3d272..6a8276c198 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 class HttpBitbucketServerApiClientTest { .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 class HttpBitbucketServerApiClientTest { .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 class HttpBitbucketServerApiClientTest { .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-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 5a1bd43fd1..0e37117198 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 class GitlabUrlParser { } Matcher matcher = - gitlabUrlPatterns - .stream() + gitlabUrlPatterns.stream() .map(pattern -> pattern.matcher(url)) .filter(Matcher::matches) .findFirst() 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 002fce1c73..bda8073e35 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 class DefaultFactoryParameterResolver implements FactoryParametersResolve * @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 8102d1a8f2..68446c578d 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 class FactoryLinksHelperTest { "user1", testRepo); assertTrue( - links - .stream() + links.stream() .anyMatch( l -> l.getMethod().equals("GET") @@ -84,8 +83,7 @@ public class FactoryLinksHelperTest { "user1", TEST_REPO); assertTrue( - links - .stream() + links.stream() .anyMatch( l -> l.getMethod().equals("GET") @@ -109,8 +107,7 @@ public class FactoryLinksHelperTest { "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-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 197d3b2d5e..40c65f2425 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 class LoggerService extends Service { 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/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 76ed00911b..dce621b141 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 class WorkspaceFailureMeterBinderTest { 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/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 bee97eae52..9a9106a486 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 class SshService extends Service { 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/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 d882bba607..e3823ab236 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 @@ class ServiceTerminator { public ServiceTerminationComparator(Set terminations) { this.dependencies = - terminations - .stream() + terminations.stream() .collect( Collectors.toMap( ServiceTermination::getServiceName, ServiceTermination::getDependencies)); 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 73d4f7ee2b..7839269fe5 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 class JpaPreferenceDao implements PreferenceDao { 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 49f016b111..60ae8ba836 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 class ProfileLinksInjectorTest { // [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 5f54040c80..946a7d076f 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 class UserLinksInjectorTest { // [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 9ebf49a228..4ae880ca4f 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 52cdab7ff5..cc336bc16f 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 class UserDaoTest { @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/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 cc1a141328..863d5822eb 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 class InmemoryWorkspaceActivityDao implements WorkspaceActivityDao { */ @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 class InmemoryWorkspaceActivityDao implements WorkspaceActivityDao { @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 class InmemoryWorkspaceActivityDao implements WorkspaceActivityDao { 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/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 36a5512f51..617ea62d53 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 final class DtoConverter { 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 final class DtoConverter { 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 final class DtoConverter { 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 final class DtoConverter { } 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 final class DtoConverter { 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 final class DtoConverter { .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 0fece0ddcc..4d0ba93e7c 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 class WorkspaceRuntimes { 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 class WorkspaceRuntimes { /** 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 class WorkspaceRuntimes { * 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 class WorkspaceRuntimes { * {@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 639045bcb8..95baf6e9c9 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 class WorkspaceService extends Service { 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 4d9b6cf02e..f131ad1b4a 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 class DevfileParser { 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 75a52adb2f..0333321b35 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 @@ public interface ComponentToWorkspaceApplier { 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 da8ba08742..f687902403 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 class EditorComponentToWorkspaceApplier implements ComponentToWorkspaceAp 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 0e2d0ed8f6..9d9a6f69fe 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 @@ public class DevfileIntegrityValidator { 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 e14818f728..223f6562b0 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 class ServersChecker { // 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 2594a8928b..00458c9ebe 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 class EnvironmentImpl implements Environment { } 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 df0df3cb28..4b5270ee75 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 class MachineConfigImpl implements MachineConfig { 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 class MachineConfigImpl implements MachineConfig { } 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 309b65bab0..e41dd37fc4 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 class MachineImpl implements Machine { 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 21964fde30..8a5e096bd1 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 class ProjectConfigImpl implements 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 class ProjectConfigImpl implements 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 38312a6864..c10d562a53 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 class RuntimeImpl implements Runtime { 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 d0793b11b2..75115cf3a5 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 class WorkspaceConfigImpl implements WorkspaceConfig { 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 1c76c8643d..d8ca446e41 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 abstract class InternalRuntime { * @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 25fb52426e..8b8bfe0a3d 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 @@ public abstract class InternalEnvironmentFactory @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 0c193cc6cc..0f1ce29090 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 @@ public class PluginFQNParser { 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 6503dce05a..94d209d89a 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 class PreviewUrlLinksVariableGeneratorTest { 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 fa3c44e937..dcb3a6f641 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 class WorkspaceServiceTest { 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 class WorkspaceServiceTest { 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 class WorkspaceServiceTest { 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 c8338802d1..bf2a58d472 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 class DefaultEditorProvisionerTest { } 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 4c57180f97..0cc1503ca4 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 class WorkspaceDaoTest { // 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/integration-tests/mysql-tck/src/test/java/MySqlTckModule.java b/wsmaster/integration-tests/mysql-tck/src/test/java/MySqlTckModule.java index 5f657d4fb4..23dd04c590 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 @@ public class MySqlTckModule extends TckModule { @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/postgresql-tck/src/test/java/PostgreSqlTckModule.java b/wsmaster/integration-tests/postgresql-tck/src/test/java/PostgreSqlTckModule.java index b1e640b014..31cfed8d4c 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 @@ public class PostgreSqlTckModule extends TckModule { @Override public void createAll(Collection entities) throws TckRepositoryException { final EntityManager manager = managerProvider.get(); - entities - .stream() + entities.stream() .map( user -> new UserImpl(