From 801d12f40a88d4a3ff5660502dafa3614165081b Mon Sep 17 00:00:00 2001 From: Can Bulut Bayburt Date: Mon, 27 Jan 2025 14:37:35 +0100 Subject: [PATCH] Selectively revert "simplify stream toList" This partly reverts commit 547fe1514be0b409810d0f7693f359979a5768aa. --- .../rhn/common/finder/CompositeFinder.java | 3 +- .../redhat/rhn/common/util/ServletUtils.java | 2 +- .../rhn/domain/action/ActionFactory.java | 2 +- .../domain/action/test/ActionFactoryTest.java | 3 +- .../domain/channel/AccessTokenFactory.java | 2 +- .../rhn/domain/channel/ChannelFactory.java | 3 +- .../domain/contentmgmt/ContentProject.java | 5 +- .../contentmgmt/ContentProjectFactory.java | 5 +- .../contentmgmt/modulemd/ModulemdApi.java | 2 +- .../validation/ContentProjectValidator.java | 3 +- .../ModularDependencyValidator.java | 2 +- .../credentials/CredentialsFactory.java | 3 +- .../rhn/domain/errata/ErrataFactory.java | 9 ++-- .../domain/errata/test/ErrataFactoryTest.java | 2 +- .../rhn/domain/formula/FormulaFactory.java | 6 +-- .../domain/kickstart/KickstartFactory.java | 3 +- .../domain/product/SUSEProductFactory.java | 6 +-- .../product/test/SUSEProductTestUtils.java | 3 +- .../rhn/domain/reactor/SaltEventFactory.java | 3 +- .../reactor/test/SaltEventFactoryTest.java | 6 +-- .../GroupRecurringAction.java | 3 +- .../recurringactions/OrgRecurringAction.java | 3 +- .../RecurringActionFactory.java | 3 +- .../rhn/domain/scc/SCCCachingFactory.java | 2 +- .../scc/test/SCCCachingFactoryTest.java | 2 +- .../domain/server/MinionServerFactory.java | 2 +- .../com/redhat/rhn/domain/server/Server.java | 7 ++- .../rhn/domain/server/ServerFactory.java | 8 ++-- .../rhn/domain/server/ServerGroupFactory.java | 2 +- .../rhn/domain/server/ServerSnapshot.java | 4 +- .../domain/server/test/ServerFactoryTest.java | 3 +- .../frontend/action/CSVDownloadAction.java | 3 +- .../manage/ChannelPackagesBaseAction.java | 3 +- .../manage/DistChannelMapEditAction.java | 5 +- .../channel/ssm/BaseSubscribeAction.java | 3 +- .../configuration/sdc/RankChannelsAction.java | 3 +- .../configuration/ssm/SubscribeConfirm.java | 3 +- .../action/rhnpackage/LockPackageAction.java | 3 +- .../rhnpackage/PackageDetailsAction.java | 3 +- .../action/ssm/ErrataListConfirmAction.java | 3 +- .../action/systems/SPMigrationAction.java | 4 +- .../systems/sdc/SystemOverviewAction.java | 3 +- .../token/groups/ListRemoveGroupsAction.java | 3 +- .../rhn/frontend/dto/PackageOverview.java | 3 +- .../frontend/dto/SetupWizardProductDto.java | 3 +- .../events/ScheduleRepoSyncAction.java | 3 +- .../rhn/frontend/servlets/OvalServlet.java | 5 +- .../frontend/struts/ActionChainHelper.java | 3 +- .../activationkey/ActivationKeyHandler.java | 6 +-- .../AdminConfigurationHandler.java | 11 +++-- .../xmlrpc/chain/ActionChainHandler.java | 5 +- .../software/ChannelSoftwareHandler.java | 5 +- .../configchannel/ConfigChannelHandler.java | 3 +- .../test/ConfigChannelHandlerTest.java | 3 +- .../xmlrpc/errata/test/ErrataHandlerTest.java | 4 +- .../xmlrpc/formula/FormulaHandler.java | 5 +- .../xmlrpc/image/ImageInfoHandler.java | 2 +- .../xmlrpc/image/store/ImageStoreHandler.java | 3 +- .../xmlrpc/packages/PackageHelper.java | 3 +- .../RecurringCustomStateHandler.java | 3 +- .../serializer/RecurringActionSerializer.java | 3 +- .../sync/content/ContentSyncHandler.java | 4 +- .../frontend/xmlrpc/system/SystemHandler.java | 47 ++++++++++--------- .../xmlrpc/system/XmlRpcSystemHelper.java | 5 +- .../appstreams/SystemAppStreamHandler.java | 3 +- .../system/config/ServerConfigHandler.java | 3 +- .../config/test/ServerConfigHandlerTest.java | 5 +- .../monitoring/SystemMonitoringHandler.java | 3 +- .../systemgroup/ServerGroupHandler.java | 7 +-- .../rhn/frontend/xmlrpc/user/UserHandler.java | 2 +- .../xmlrpc/user/UserNotificationsHandler.java | 3 +- .../manager/action/ActionChainManager.java | 8 ++-- .../action/test/ActionManagerTest.java | 2 +- .../rhn/manager/audit/CVEAuditManager.java | 8 ++-- .../manager/audit/CVEAuditManagerOVAL.java | 2 +- .../audit/test/CVEAuditManagerOVALTest.java | 23 ++++----- .../configuration/ConfigurationManager.java | 3 +- .../manager/content/ContentSyncManager.java | 24 +++++----- .../ContentSyncManagerNonRegressionTest.java | 2 +- .../content/test/ContentSyncManagerTest.java | 20 ++++---- .../content/ubuntu/UbuntuErrataManager.java | 6 +-- .../contentmgmt/DependencyResolver.java | 9 ++-- .../ContentManagerChannelAlignmentTest.java | 3 +- .../contentmgmt/test/MockModulemdApi.java | 4 +- .../distupgrade/DistUpgradeManager.java | 2 +- .../rhn/manager/errata/ErrataManager.java | 20 ++++---- .../rhn/manager/formula/FormulaManager.java | 6 +-- .../kickstart/KickstartLocaleCommand.java | 3 +- .../rhn/manager/satellite/UpgradeCommand.java | 6 +-- .../setup/MirrorCredentialsManager.java | 2 +- .../rhn/manager/setup/ProductSyncManager.java | 6 +-- .../redhat/rhn/manager/ssm/SsmManager.java | 4 +- .../CancelKickstartSessionOperation.java | 3 +- .../manager/system/ServerGroupManager.java | 2 +- .../rhn/manager/system/SystemManager.java | 15 +++--- .../manager/user/test/UserManagerTest.java | 3 +- .../redhat/rhn/taskomatic/TaskomaticApi.java | 2 +- .../rhn/taskomatic/task/AutoErrataTask.java | 4 +- .../task/HubReportDbUpdateWorker.java | 3 +- .../task/MinionActionChainExecutor.java | 6 +-- .../rhn/taskomatic/task/MinionCheckin.java | 3 +- .../taskomatic/task/ModularDataCleanup.java | 2 +- .../taskomatic/task/RecurringActionJob.java | 3 +- .../rhn/taskomatic/task/ReportDBHelper.java | 2 +- .../rhn/taskomatic/task/TokenCleanup.java | 2 +- .../task/payg/PaygUpdateAuthTask.java | 3 +- .../task/repomd/DebRepositoryWriter.java | 3 +- .../task/test/ReportDbUpdateTaskTest.java | 7 +-- .../com/suse/manager/api/RouteFactory.java | 2 +- .../suse/manager/api/test/TestHandler.java | 7 +-- .../maintenance/MaintenanceManager.java | 2 +- .../CancelRescheduleStrategy.java | 3 +- .../maintenance/test/IcalUtilsTest.java | 17 +++---- .../test/MaintenanceManagerTest.java | 7 +-- .../suse/manager/matcher/MatcherJsonIO.java | 10 ++-- .../test/AttestationFactoryTest.java | 3 +- .../suse/manager/reactor/PGEventStream.java | 7 +-- .../reactor/hardware/HardwareMapper.java | 2 +- .../JobReturnEventMessageAction.java | 10 ++-- .../com/suse/manager/saltboot/PXEEvent.java | 3 +- .../suse/manager/saltboot/SaltbootUtils.java | 3 +- .../manager/utils/PagedSqlQueryBuilder.java | 3 +- .../src/com/suse/manager/utils/SaltUtils.java | 6 +-- .../webui/controllers/AnsibleController.java | 7 +-- .../webui/controllers/CVEAuditController.java | 6 +-- .../ConfidentialComputingController.java | 3 +- .../webui/controllers/FormulaController.java | 5 +- .../controllers/ImageBuildController.java | 5 +- .../controllers/ImageProfileController.java | 4 +- .../controllers/ImageStoreController.java | 5 +- .../webui/controllers/MinionController.java | 22 ++++----- .../manager/webui/controllers/MinionsAPI.java | 4 +- .../NotificationMessageController.java | 5 +- .../webui/controllers/PackageController.java | 7 +-- .../webui/controllers/ProductsController.java | 4 +- .../RecurringActionController.java | 7 +-- .../webui/controllers/SsmController.java | 9 ++-- .../manager/webui/controllers/StatesAPI.java | 10 ++-- .../webui/controllers/SystemsController.java | 8 ++-- .../VirtualHostManagerController.java | 8 ++-- .../ActivationKeysController.java | 3 +- .../ActivationKeysViewsController.java | 3 +- .../admin/mappers/PaygResponseMappers.java | 3 +- .../appstreams/AppStreamsController.java | 5 +- .../bootstrap/AbstractMinionBootstrapper.java | 2 +- .../bootstrap/BootstrapResult.java | 3 +- .../channels/ChannelsApiController.java | 2 +- .../handlers/LivePatchingApiController.java | 3 +- .../handlers/ValidationUtils.java | 4 +- .../mappers/ResponseMappers.java | 21 +++++---- .../MaintenanceCalendarController.java | 6 +-- .../maintenance/MaintenanceController.java | 3 +- .../MaintenanceScheduleController.java | 4 +- .../SaltActionChainGeneratorService.java | 6 +-- .../services/SaltServerActionService.java | 35 +++++++------- .../services/SaltStateGeneratorService.java | 5 +- .../webui/services/StateSourceService.java | 2 +- .../webui/services/impl/SaltSSHService.java | 6 +-- .../webui/services/impl/SaltService.java | 2 +- .../test/SaltServerActionServiceTest.java | 12 ++--- .../webui/utils/DownloadTokenBuilder.java | 5 +- .../webui/utils/MinionActionUtils.java | 3 +- .../webui/utils/SparkApplicationHelper.java | 3 +- .../webui/utils/gson/ChannelsJson.java | 5 +- .../utils/gson/CoCoAttestationReportJson.java | 3 +- .../webui/utils/gson/ConfigChannelJson.java | 3 +- .../webui/utils/gson/ImageInfoJson.java | 6 +-- .../webui/utils/gson/PackageActionJson.java | 3 +- .../webui/utils/gson/SaltMinionJson.java | 3 +- .../webui/websocket/RemoteMinionCommands.java | 5 +- .../maintenance/MaintenanceHandler.java | 2 +- .../RescheduleResultSerializer.java | 3 +- .../src/com/suse/oval/OVALCachingFactory.java | 3 +- java/code/src/com/suse/oval/OVALCleaner.java | 5 +- .../CriteriaTreeBasedExtractor.java | 3 +- ...eExtractorFromVulnerabilityDefinition.java | 3 +- .../src/com/suse/scc/client/SCCWebClient.java | 2 +- .../scc/model/SCCVirtualizationHostJson.java | 3 +- ...SystemRegistrationCreateUpdateSystems.java | 3 +- ...ystemRegistrationSystemDataAcquisitor.java | 2 +- .../SCCSystemRegistrationManagerTest.java | 21 +++++---- .../scc/test/SCCSystemRegistrationTest.java | 7 +-- .../AbstractSCCSystemRegistrationTest.java | 3 +- ...emRegistrationCreateUpdateSystemsTest.java | 3 +- ...stemRegistrationUpdateCachedItemsTest.java | 3 +- ....changes.cbbayburt.immutability-issues-fix | 1 + 186 files changed, 538 insertions(+), 434 deletions(-) create mode 100644 java/spacewalk-java.changes.cbbayburt.immutability-issues-fix diff --git a/java/code/src/com/redhat/rhn/common/finder/CompositeFinder.java b/java/code/src/com/redhat/rhn/common/finder/CompositeFinder.java index 4b0dc566c69b..6acd8c5e570d 100644 --- a/java/code/src/com/redhat/rhn/common/finder/CompositeFinder.java +++ b/java/code/src/com/redhat/rhn/common/finder/CompositeFinder.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.stream.Collectors; /** * A Finder implementation that uses multiple finders to search @@ -34,6 +35,6 @@ class CompositeFinder implements Finder { public List findExcluding(String[] excluding, String endStr) { return this.finderList.stream() .flatMap(finder -> finder.findExcluding(excluding, endStr).stream()) - .toList(); + .collect(Collectors.toList()); } } diff --git a/java/code/src/com/redhat/rhn/common/util/ServletUtils.java b/java/code/src/com/redhat/rhn/common/util/ServletUtils.java index b3c00ffcbeb7..a38cd96ad3dc 100644 --- a/java/code/src/com/redhat/rhn/common/util/ServletUtils.java +++ b/java/code/src/com/redhat/rhn/common/util/ServletUtils.java @@ -101,7 +101,7 @@ else if (me.getValue() instanceof List) { List allValues = values.stream() .map(v -> StringUtil.urlEncode(me.getKey()) + "=" + v) - .toList(); + .collect(Collectors.toList()); if (!allValues.isEmpty()) { if (firstPass) { diff --git a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java index 3fe83119932f..c334972b33ec 100644 --- a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java +++ b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java @@ -647,7 +647,7 @@ public static Stream lookupDependentActions(Action parentAction) { List results = findDependentActions.list(); returnSet.addAll(results); // Reset list of actions for the next hierarchy level: - actionsAtHierarchyLevel = results.stream().map(a -> a.getId()).toList(); + actionsAtHierarchyLevel = results.stream().map(a -> a.getId()).collect(Collectors.toList()); } while (!actionsAtHierarchyLevel.isEmpty()); diff --git a/java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java b/java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java index a07f411134f9..05e09f689902 100644 --- a/java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java @@ -72,6 +72,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -412,7 +413,7 @@ public void rejectScheduledActionsMarkPendingServerActionsAsFailed() { TestUtils.saveAndReload(a1); TestUtils.saveAndReload(a2); - List actionIds = Stream.of(a1, a2).map(Action::getId).toList(); + List actionIds = Stream.of(a1, a2).map(Action::getId).collect(Collectors.toList()); ActionFactory.rejectScheduledActions(actionIds, "Test Rejection Reason"); sa1 = HibernateFactory.reload(sa1); diff --git a/java/code/src/com/redhat/rhn/domain/channel/AccessTokenFactory.java b/java/code/src/com/redhat/rhn/domain/channel/AccessTokenFactory.java index 236d93f92dcb..f790478ab206 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/AccessTokenFactory.java +++ b/java/code/src/com/redhat/rhn/domain/channel/AccessTokenFactory.java @@ -127,7 +127,7 @@ public static List unneededTokens(MinionServer minion, Collection newToken.getChannels().containsAll(token.getChannels())); - }).toList(); + }).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java index cde44589eeeb..5576b00d6e10 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java @@ -47,6 +47,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; import javax.persistence.NoResultException; import javax.persistence.TypedQuery; @@ -957,7 +958,7 @@ public static List findChildChannelsByParentInSSM(User user, long .stream() .map(Arrays::asList) .map(r -> new SsmChannelDto((long)r.get(0), (String)r.get(1), r.get(2) != null)) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/contentmgmt/ContentProject.java b/java/code/src/com/redhat/rhn/domain/contentmgmt/ContentProject.java index ffaa8684bb1f..0ef4ee0c3c66 100644 --- a/java/code/src/com/redhat/rhn/domain/contentmgmt/ContentProject.java +++ b/java/code/src/com/redhat/rhn/domain/contentmgmt/ContentProject.java @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -228,7 +229,7 @@ public List getSources() { public List getActiveSources() { return sources.stream() .filter(s -> !ProjectSource.State.DETACHED.equals(s.getState())) - .toList(); + .collect(Collectors.toList()); } /** @@ -321,7 +322,7 @@ public List getActiveFilters() { return getProjectFilters().stream() .filter(f -> f.getState() != ContentProjectFilter.State.DETACHED) .map(ContentProjectFilter::getFilter) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/contentmgmt/ContentProjectFactory.java b/java/code/src/com/redhat/rhn/domain/contentmgmt/ContentProjectFactory.java index 6173494680cc..9cfa5b067193 100644 --- a/java/code/src/com/redhat/rhn/domain/contentmgmt/ContentProjectFactory.java +++ b/java/code/src/com/redhat/rhn/domain/contentmgmt/ContentProjectFactory.java @@ -35,6 +35,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; import java.util.stream.Stream; import javax.persistence.criteria.CriteriaBuilder; @@ -248,7 +249,7 @@ public static void removeEnvironment(ContentEnvironment toRemove) { channels.stream().filter(Channel::isBaseChannel).findAny().ifPresent(bc -> { List rogueChannels = ChannelFactory.listAllChildrenForChannel(bc).stream() .filter(b -> !childChannels.contains(b)) - .map(Channel::getName).toList(); + .map(Channel::getName).collect(Collectors.toList()); if (!rogueChannels.isEmpty()) { throw new ContentManagementException(LocalizationService.getInstance().getMessage( "contentmanagement.non_environment_channels_found", rogueChannels)); @@ -499,7 +500,7 @@ public static List lookupClonesInProject(Channel channel, Content .setParameter("project", project) .setParameter("channel", channel) .stream(); - return clones.flatMap(c -> c.asCloned().stream()).toList(); + return clones.flatMap(c -> c.asCloned().stream()).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/contentmgmt/modulemd/ModulemdApi.java b/java/code/src/com/redhat/rhn/domain/contentmgmt/modulemd/ModulemdApi.java index 89e28bdd5571..ac65a8433d87 100644 --- a/java/code/src/com/redhat/rhn/domain/contentmgmt/modulemd/ModulemdApi.java +++ b/java/code/src/com/redhat/rhn/domain/contentmgmt/modulemd/ModulemdApi.java @@ -100,7 +100,7 @@ public ModulePackagesResponse getPackagesForModules(List sources, List< * @throws RepositoryNotModularException if a source channel is not modular */ private static List getMetadataPaths(List sources) throws RepositoryNotModularException { - return sources.stream().map(ModulemdApi::getMetadataPath).toList(); + return sources.stream().map(ModulemdApi::getMetadataPath).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/contentmgmt/validation/ContentProjectValidator.java b/java/code/src/com/redhat/rhn/domain/contentmgmt/validation/ContentProjectValidator.java index 7cfee559ba9d..19053cd42e3b 100644 --- a/java/code/src/com/redhat/rhn/domain/contentmgmt/validation/ContentProjectValidator.java +++ b/java/code/src/com/redhat/rhn/domain/contentmgmt/validation/ContentProjectValidator.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * Validates a content project instance using a specified list of validators @@ -60,6 +61,6 @@ public ContentProjectValidator(ContentProject projectIn, List public List validate() { return validators.stream() .flatMap(v -> v.validate(project).stream()) - .toList(); + .collect(Collectors.toList()); } } diff --git a/java/code/src/com/redhat/rhn/domain/contentmgmt/validation/ModularDependencyValidator.java b/java/code/src/com/redhat/rhn/domain/contentmgmt/validation/ModularDependencyValidator.java index c6b4f16a535b..f4f1e16b4acc 100644 --- a/java/code/src/com/redhat/rhn/domain/contentmgmt/validation/ModularDependencyValidator.java +++ b/java/code/src/com/redhat/rhn/domain/contentmgmt/validation/ModularDependencyValidator.java @@ -99,7 +99,7 @@ public List validate(ContentProject project) { .map(m -> ContentValidationMessage.contentFiltersMessage( loc.getMessage("contentmanagement.validation.modulenotfound", m.getFullName()), TYPE_ERROR)) - .toList(); + .collect(Collectors.toList()); } else if (e.getCause() instanceof ConflictingStreamsException cause) { Module module = cause.getModule(); diff --git a/java/code/src/com/redhat/rhn/domain/credentials/CredentialsFactory.java b/java/code/src/com/redhat/rhn/domain/credentials/CredentialsFactory.java index 9cf5fafc6f6f..4cb68c58ad3b 100644 --- a/java/code/src/com/redhat/rhn/domain/credentials/CredentialsFactory.java +++ b/java/code/src/com/redhat/rhn/domain/credentials/CredentialsFactory.java @@ -23,6 +23,7 @@ import java.util.Date; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; @@ -156,7 +157,7 @@ public static List listCredentials() { .createQuery(query) .stream() .map(Credentials.class::cast) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java index b0f12c776aa5..9fa774f99f06 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java +++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java @@ -63,6 +63,7 @@ import java.util.Optional; import java.util.Set; import java.util.StringTokenizer; +import java.util.stream.Collectors; /** * ErrataFactory - the singleton class used to fetch and store @@ -105,7 +106,7 @@ public static List listErrataChannelPackages(Long cid, Long eid) { DataResult dr = executeSelectMode( "ErrataCache_queries", "package_associated_to_errata_and_channel", params); - return dr.stream().map(file -> file.getPackageId()).toList(); + return dr.stream().map(file -> file.getPackageId()).collect(Collectors.toList()); } @@ -541,7 +542,7 @@ public static List lookupByCVE(String cve) { Session session = HibernateFactory.getSession(); return result.stream() .map(row -> session.load(Errata.class, (Long) row.get("id"))) - .toList(); + .collect(Collectors.toList()); } /** @@ -751,7 +752,7 @@ public static Optional lookupErrataFile(Long errataId, String filena public static List> retractedPackages(List pids, List sids) { List results = singleton.listObjectsByNamedQuery("Errata.retractedPackages", Map.of("pids", pids, "sids", sids)); - return results.stream().map(r -> new Tuple2<>((long)r[0], (long)r[1])).toList(); + return results.stream().map(r -> new Tuple2<>((long)r[0], (long)r[1])).collect(Collectors.toList()); } /** @@ -769,7 +770,7 @@ public static List> retractedPackagesByNevra(List nev } List results = singleton.listObjectsByNamedQuery("Errata.retractedPackagesByNevra", Map.of("nevras", nevras, "sids", sids)); - return results.stream().map(r -> new Tuple2<>((long)r[0], (long)r[1])).toList(); + return results.stream().map(r -> new Tuple2<>((long)r[0], (long)r[1])).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java index 80e10b02a7ac..89b4de403023 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java @@ -549,7 +549,7 @@ public void testRetractedPackagesByNevra() throws Exception { p.getPackageName().getName() + "-" + p.getPackageEvr().toUniversalEvrString() + "." + p.getPackageArch().getLabel() - ).toList(), + ).collect(Collectors.toList()), List.of(testMinionServer.getId()) ); diff --git a/java/code/src/com/redhat/rhn/domain/formula/FormulaFactory.java b/java/code/src/com/redhat/rhn/domain/formula/FormulaFactory.java index 1813b2d9a69d..9437fd6a8eaa 100644 --- a/java/code/src/com/redhat/rhn/domain/formula/FormulaFactory.java +++ b/java/code/src/com/redhat/rhn/domain/formula/FormulaFactory.java @@ -278,7 +278,7 @@ public static List getFormulasByGroup(ServerGroup group) { List formulas = group.getPillars().stream() .filter(pillar -> pillar.getCategory().startsWith(PREFIX)) .map(pillar -> pillar.getCategory().substring(PREFIX.length())) - .toList(); + .collect(Collectors.toList()); return orderFormulas(formulas); } @@ -292,7 +292,7 @@ public static List getFormulasByMinion(MinionServer minion) { List formulas = orderFormulas(minion.getPillars().stream() .filter(pillar -> pillar.getCategory().startsWith(PREFIX)) .map(pillar -> pillar.getCategory().substring(PREFIX.length())) - .toList()); + .collect(Collectors.toList())); return orderFormulas(formulas); } @@ -788,7 +788,7 @@ public static List getEndpointsFromFormulaData(FormulaData formula proxyEnabled ? exporterConfig.getProxyModuleOrFallback() : null, proxyPath, tlsEnabled)) - .toList(); + .collect(Collectors.toList()); } else { return new ArrayList<>(); diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java index 58f3d2867fce..3a4f892ec1f5 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java @@ -49,6 +49,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; @@ -295,7 +296,7 @@ private static List lookupKickstartCommandNames(boolean on // Filter out the unsupported Commands for the passed in profile return names.stream() .filter(cn -> !cn.getName().equals("lilocheck") && !cn.getName().equals("langsupport")) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/product/SUSEProductFactory.java b/java/code/src/com/redhat/rhn/domain/product/SUSEProductFactory.java index e5caf88dd8e3..09d4e4fc0d43 100644 --- a/java/code/src/com/redhat/rhn/domain/product/SUSEProductFactory.java +++ b/java/code/src/com/redhat/rhn/domain/product/SUSEProductFactory.java @@ -136,7 +136,7 @@ public static List lookupChannelTemplateByChannelLabel(String c .stream() .sorted((a, b) -> RPM_VERSION_COMPARATOR.compare(b.getProduct().getVersion(), a.getProduct().getVersion())) - .toList(); + .collect(Collectors.toList()); } /** @@ -162,7 +162,7 @@ public static void remove(SUSEProduct product) { @SuppressWarnings("unchecked") public static void removeAllExcept(Collection products) { if (!products.isEmpty()) { - List ids = products.stream().map(SUSEProduct::getId).toList(); + List ids = products.stream().map(SUSEProduct::getId).collect(Collectors.toList()); List productIds = getSession().createNativeQuery(""" SELECT * from suseProducts @@ -186,7 +186,7 @@ WHERE id NOT IN (:ids) public static List lookupSyncedProductChannelsByLabel(String channelLabel) { return Optional.ofNullable(ChannelFactory.lookupByLabel(channelLabel)) .map(channel -> channel.getSuseProductChannels().stream()) - .orElseGet(Stream::empty).toList(); + .orElseGet(Stream::empty).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/product/test/SUSEProductTestUtils.java b/java/code/src/com/redhat/rhn/domain/product/test/SUSEProductTestUtils.java index bd5a4646d00c..6f5781499573 100644 --- a/java/code/src/com/redhat/rhn/domain/product/test/SUSEProductTestUtils.java +++ b/java/code/src/com/redhat/rhn/domain/product/test/SUSEProductTestUtils.java @@ -71,6 +71,7 @@ import java.util.List; import java.util.Random; import java.util.Set; +import java.util.stream.Collectors; /** * Utility methods for creating SUSE related test data. @@ -564,7 +565,7 @@ else if (!testDataPath.endsWith("/")) { inputStreamReader7, new TypeToken>() { }.getType()); products.addAll(addProducts); addRepos.addAll(ContentSyncManager.collectRepos( - ContentSyncManager.flattenProducts(addProducts).toList())); + ContentSyncManager.flattenProducts(addProducts).collect(Collectors.toList()))); } repositories.addAll(addRepos); diff --git a/java/code/src/com/redhat/rhn/domain/reactor/SaltEventFactory.java b/java/code/src/com/redhat/rhn/domain/reactor/SaltEventFactory.java index cee3a6bdb7c8..43f12d536d72 100644 --- a/java/code/src/com/redhat/rhn/domain/reactor/SaltEventFactory.java +++ b/java/code/src/com/redhat/rhn/domain/reactor/SaltEventFactory.java @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; @@ -55,7 +56,7 @@ public static List countSaltEvents(int queuesCount) { .filter(c -> c[0].equals(i)) .map(c -> (Long) c[1]) .findFirst() - .orElse(0L)).boxed().toList(); + .orElse(0L)).boxed().collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/reactor/test/SaltEventFactoryTest.java b/java/code/src/com/redhat/rhn/domain/reactor/test/SaltEventFactoryTest.java index 0d8e9cec3d04..46307987c5c2 100644 --- a/java/code/src/com/redhat/rhn/domain/reactor/test/SaltEventFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/reactor/test/SaltEventFactoryTest.java @@ -89,7 +89,7 @@ public void testPopSaltEvents() { assertEquals(Arrays.asList(0L, 0L, 0L, 0L), saltEventsCount); // try to pop a salt event when there are none - List popedSaltEvents = SaltEventFactory.popSaltEvents(1, 0).toList(); + List popedSaltEvents = SaltEventFactory.popSaltEvents(1, 0).collect(Collectors.toList()); assertEquals(0, popedSaltEvents.size()); // create and pop 1 salt event @@ -172,7 +172,7 @@ public void testDeleteSaltEvents() { saltEvents.add(saltEvent3); assertEquals(Arrays.asList(1L, 1L, 1L, 0L), saltEventsCount); - List saltEventIds = saltEvents.stream().map(SaltEvent::getId).toList(); + List saltEventIds = saltEvents.stream().map(SaltEvent::getId).collect(Collectors.toList()); deletedEventIds = SaltEventFactory.deleteSaltEvents(saltEventIds); assertEquals(saltEvents.size(), deletedEventIds.size()); assertTrue(deletedEventIds.stream().allMatch(did -> saltEventIds.stream().anyMatch(id -> id.equals(did)))); @@ -209,7 +209,7 @@ public void testFixQueueNumbers() { assertEquals(Arrays.asList(0L, 3L, 1L, 0L, 0L), saltEventsCount); // pop the events - List popedSaltEvents = SaltEventFactory.popSaltEvents(3, 1).toList(); + List popedSaltEvents = SaltEventFactory.popSaltEvents(3, 1).collect(Collectors.toList()); assertEquals(popedSaltEvents.size(), 3); popedSaltEvents = SaltEventFactory.popSaltEvents(1, 2).toList(); assertEquals(popedSaltEvents.size(), 1); diff --git a/java/code/src/com/redhat/rhn/domain/recurringactions/GroupRecurringAction.java b/java/code/src/com/redhat/rhn/domain/recurringactions/GroupRecurringAction.java index 6d7f6c511ead..112a2305f522 100644 --- a/java/code/src/com/redhat/rhn/domain/recurringactions/GroupRecurringAction.java +++ b/java/code/src/com/redhat/rhn/domain/recurringactions/GroupRecurringAction.java @@ -31,6 +31,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder; import java.util.List; +import java.util.stream.Collectors; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; @@ -76,7 +77,7 @@ public GroupRecurringAction(RecurringActionType actionType, boolean active, Serv @Override public List computeMinions() { return MinionServerUtils.filterSaltMinions(ServerGroupFactory.listServers(group)) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/recurringactions/OrgRecurringAction.java b/java/code/src/com/redhat/rhn/domain/recurringactions/OrgRecurringAction.java index f6a1b5955ba3..ff8cbba5ae1b 100644 --- a/java/code/src/com/redhat/rhn/domain/recurringactions/OrgRecurringAction.java +++ b/java/code/src/com/redhat/rhn/domain/recurringactions/OrgRecurringAction.java @@ -28,6 +28,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder; import java.util.List; +import java.util.stream.Collectors; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; @@ -72,7 +73,7 @@ public OrgRecurringAction(RecurringActionType actionType, boolean active, Org or @Override public List computeMinions() { return MinionServerUtils.filterSaltMinions(ServerFactory.listOrgSystems(organization.getId())) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/recurringactions/RecurringActionFactory.java b/java/code/src/com/redhat/rhn/domain/recurringactions/RecurringActionFactory.java index e9dcec32552c..848d27e3cab4 100644 --- a/java/code/src/com/redhat/rhn/domain/recurringactions/RecurringActionFactory.java +++ b/java/code/src/com/redhat/rhn/domain/recurringactions/RecurringActionFactory.java @@ -38,6 +38,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.Function; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -147,7 +148,7 @@ public static DataResult listAllRecurringActions( "left join web_customer org on org.id = ra.org_id" + ") ra "; List orgs = user.hasRole(RoleFactory.SAT_ADMIN) ? OrgFactory.lookupAllOrgs() : List.of(user.getOrg()); - Map params = Map.of("orgsIds", orgs.stream().map(Org::getId).toList()); + Map params = Map.of("orgsIds", orgs.stream().map(Org::getId).collect(Collectors.toList())); return new PagedSqlQueryBuilder("ra.recurring_action_id") .select("ra.*") diff --git a/java/code/src/com/redhat/rhn/domain/scc/SCCCachingFactory.java b/java/code/src/com/redhat/rhn/domain/scc/SCCCachingFactory.java index 3de9978727b1..97f11a09d0b4 100644 --- a/java/code/src/com/redhat/rhn/domain/scc/SCCCachingFactory.java +++ b/java/code/src/com/redhat/rhn/domain/scc/SCCCachingFactory.java @@ -448,7 +448,7 @@ public static List lookupRepositoryAuthWithContentSource() { public static List lookupRepositoryIdsWithAuth() { List resultList = getSession().getNamedNativeQuery("SCCRepositoryAuth.lookupRepoIdWithAuth").getResultList(); - return resultList.stream().map(BigDecimal::longValue).toList(); + return resultList.stream().map(BigDecimal::longValue).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/scc/test/SCCCachingFactoryTest.java b/java/code/src/com/redhat/rhn/domain/scc/test/SCCCachingFactoryTest.java index 975291b20c59..01a1a312b2a9 100644 --- a/java/code/src/com/redhat/rhn/domain/scc/test/SCCCachingFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/scc/test/SCCCachingFactoryTest.java @@ -121,7 +121,7 @@ public void testListReposForRootProduct() throws Exception { Set repos = SCCCachingFactory.lookupRepositoriesByRootProductNameVersionArchForPayg( "sles", "12", "x86_64").collect(Collectors.toSet()); - List repoNames = repos.stream().map(SCCRepository::getName).toList(); + List repoNames = repos.stream().map(SCCRepository::getName).collect(Collectors.toList()); assertContains(repoNames, "SUSE-PackageHub-12-Pool"); assertContains(repoNames, "SLE-Module-Web-Scripting12-Pool"); assertContains(repoNames, "SLES12-Updates"); diff --git a/java/code/src/com/redhat/rhn/domain/server/MinionServerFactory.java b/java/code/src/com/redhat/rhn/domain/server/MinionServerFactory.java index c002f9628d50..c55371008705 100644 --- a/java/code/src/com/redhat/rhn/domain/server/MinionServerFactory.java +++ b/java/code/src/com/redhat/rhn/domain/server/MinionServerFactory.java @@ -382,6 +382,6 @@ public static List findByosServers(Action action) { return allMinions.stream().filter( minionSummary -> MinionServerFactory.findByMinionId(minionSummary.getMinionId()) .map(Server::isDeniedOnPayg) - .orElse(false)).toList(); + .orElse(false)).collect(Collectors.toList()); } } diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java index e14ccc1fccad..16548ba80582 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server.java +++ b/java/code/src/com/redhat/rhn/domain/server/Server.java @@ -898,7 +898,7 @@ public void setChannelsChanged(Date channelsChangedIn) { */ public List getEntitledGroupTypes() { return this.groups.stream().filter(g ->g.getGroupType() != null) - .map(ServerGroup::getGroupType).toList(); + .map(ServerGroup::getGroupType).collect(Collectors.toList()); } /** @@ -907,7 +907,7 @@ public List getEntitledGroupTypes() { */ public List getEntitledGroups() { return this.groups.stream().filter(g ->g.getGroupType() != null) - .map(s -> (EntitlementServerGroup) s).toList(); + .map(s -> (EntitlementServerGroup) s).collect(Collectors.toList()); } /** @@ -916,8 +916,7 @@ public List getEntitledGroups() { */ public List getManagedGroups() { return this.groups.stream().filter(g -> g.getGroupType() == null) - .map(s -> (ManagedServerGroup) s) - .collect(Collectors.toList()); + .map(s -> (ManagedServerGroup) s).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java index c86fc84cc227..62d2f7e0064e 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java @@ -366,7 +366,7 @@ public static Optional findServerPath(Server server, Server proxySer */ public static void addServersToGroup(Collection servers, ServerGroup serverGroup) { List serverIdsToAdd = servers.stream().filter(s -> s.getOrgId().equals(serverGroup.getOrgId())) - .map(Server::getId).toList(); + .map(Server::getId).collect(Collectors.toList()); boolean serversUpdated = insertServersToGroup(serverIdsToAdd, serverGroup.getId()); @@ -449,7 +449,7 @@ public static void addServerHistoryWithEntitlementEvent(Server server, Entitleme */ public static void removeServersFromGroup(Collection servers, ServerGroup serverGroup) { List serverIdsToAdd = servers.stream().filter(s -> s.getOrgId().equals(serverGroup.getOrgId())) - .map(Server::getId).toList(); + .map(Server::getId).collect(Collectors.toList()); boolean serversUpdated = removeServersFromGroup(serverIdsToAdd, serverGroup.getId()); @@ -539,7 +539,7 @@ public static Map> findUnscheduledErrataByServerIds(User user, */ @SuppressWarnings("unchecked") public static List findSystemsPendingRebootActions(List systems) { - List sids = systems.stream().map(SystemOverview::getId).toList(); + List sids = systems.stream().map(SystemOverview::getId).collect(Collectors.toList()); Session session = HibernateFactory.getSession(); Query query = session.getNamedQuery("Server.findServersPendingRebootAction"); query.setParameter("systemIds", sids); @@ -627,7 +627,7 @@ public List lookupSystemsVisibleToUserWithEntitlement(User user, S DataResult> dr = mode.execute(params); return dr.stream().map(m -> new SystemIDInfo((Long) m.get("id"), (String) m.get("name"))) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerGroupFactory.java b/java/code/src/com/redhat/rhn/domain/server/ServerGroupFactory.java index baea70c6b10e..9c67e62c8468 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerGroupFactory.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerGroupFactory.java @@ -205,7 +205,7 @@ public static void remove(SaltApi saltApi, ServerGroup group) { .map(Server::asMinionServer) .flatMap(Opt::stream) .map(MinionServer::getMinionId) - .toList(); + .collect(Collectors.toList()); SINGLETON.removeObject(group); saltApi.refreshPillar(new MinionList(minions)); } diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.java b/java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.java index 0c409abf711f..25897b7187a3 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.java @@ -405,14 +405,14 @@ public boolean rollbackConfigFiles(User user) throws TaskomaticApiException { this.server.getConfigChannelStream().collect(Collectors.toSet()); this.server.unsubscribeConfigChannels(ccs.stream() - .filter(ConfigChannel::isGlobalChannel).toList(), user); + .filter(ConfigChannel::isGlobalChannel).collect(Collectors.toList()), user); // get the config_channels recorded from the snapshot ccs = getConfigChannels(); // tie config_channel list to server if (ccs != null) { this.server.subscribeConfigChannels(ccs.stream() - .filter(ConfigChannel::isGlobalChannel).toList(), + .filter(ConfigChannel::isGlobalChannel).collect(Collectors.toList()), user); } // deploy the particular config files diff --git a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java index d19c771c92e5..9aed3bdeca62 100644 --- a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java @@ -128,6 +128,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; /** * ServerFactoryTest @@ -1141,7 +1142,7 @@ public void testErrataAction() throws Exception { TestUtils.saveAndFlush(e1); List minions = Arrays.asList(zypperSystem, nonZypperSystem); - List minionSummaries = minions.stream().map(MinionSummary::new).toList(); + List minionSummaries = minions.stream().map(MinionSummary::new).collect(Collectors.toList()); Map, List> localCallListMap = SALT_SERVER_ACTION_SERVICE.errataAction(minionSummaries, Collections.singleton(e1.getId()), false); diff --git a/java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java b/java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java index 8ab8adce5bf7..cb63c9a2a761 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java @@ -37,6 +37,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -185,7 +186,7 @@ protected StreamInfo getStreamInfo(ActionMapping mapping, ActionForm form, // Read the CSV separator from user preferences User user = new RequestContext(request).getCurrentUser(); CSVWriter csvWriter = new CSVWriter(new StringWriter(), user.getCsvSeparator()); - csvWriter.setColumns(Arrays.stream(exportColumns.split(",")).map(String::trim).toList()); + csvWriter.setColumns(Arrays.stream(exportColumns.split(",")).map(String::trim).collect(Collectors.toList())); String header = getHeaderText(request, session); if (header != null) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesBaseAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesBaseAction.java index c1e347b4677d..e5ea2ff56e72 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesBaseAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesBaseAction.java @@ -22,6 +22,7 @@ import com.redhat.rhn.manager.user.UserManager; import java.util.List; +import java.util.stream.Collectors; /** * ChannelPackagesBaseAction @@ -33,7 +34,7 @@ public class ChannelPackagesBaseAction extends RhnAction { protected List findChannels(User user, Long selectedChan) { return ChannelFactory.findAllByUserOrderByChild(user).stream() .map(c -> setSelected(c, selectedChan)) - .toList(); + .collect(Collectors.toList()); } protected boolean canAccessChannel(User user, Channel channel) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java index 7596c4c501d6..ebf78a393541 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java @@ -35,6 +35,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -67,14 +68,14 @@ public ActionForward execute(ActionMapping mapping, List arches = ChannelManager.getChannelArchitectures(); List> channelArches = arches.stream() .map(arch -> Map.of("label", arch.getName(), "value", arch.getLabel())) - .toList(); + .collect(Collectors.toList()); ctx.getRequest().setAttribute("channelArches", channelArches); // setup subscribable base channels List subscribableBaseChannels = ChannelFactory.listSubscribableBaseChannels(user); List> channels = subscribableBaseChannels.stream() .map(channel -> Map.of("label", channel.getName(), "value", channel.getLabel())) - .toList(); + .collect(Collectors.toList()); ctx.getRequest().setAttribute("channels", channels); Long dcmId = ctx.getParamAsLong(DCM_ID); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java index 35802b8d75f5..76eb72bcef2e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java @@ -55,6 +55,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -230,7 +231,7 @@ public ActionForward confirmUpdateBaseChannels(ActionMapping mapping, "basesub.jsp.unableToLookupSystemDefaultChannelWithParams", String.join(", ", skippedServers.stream() .map(s -> "'" + s.getName() + "'") - .toList()), oldBaseChannelMessage); + .collect(Collectors.toList())), oldBaseChannelMessage); msgs.add(ActionMessages.GLOBAL_MESSAGE, actionMessage); strutsDelegate.saveMessages(request, msgs); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java index b44720f6eae7..1471fba7ca10 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java @@ -37,6 +37,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -100,7 +101,7 @@ public ActionForward update(ActionMapping mapping, ConfigurationManager cfgMgr = ConfigurationManager.getInstance(); List configChannelList = getChannelIds(form).stream() .map(chid -> cfgMgr.lookupConfigChannel(user, chid)) - .toList(); + .collect(Collectors.toList()); server.subscribeConfigChannels(configChannelList, user); RhnSet set = getRhnSet(user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java index 18fdc3cb530d..e3b4ddb71a36 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java @@ -44,6 +44,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -139,7 +140,7 @@ private ActionForward confirm(ActionMapping mapping, List configChannels = rankElements.stream() .filter(elm -> selectedChannels.contains(elm.getElement())) .map(elm -> cm.lookupConfigChannel(user, elm.getElement())) - .toList(); + .collect(Collectors.toList()); LOG.debug("Start adding config state"); int successes = 0; diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/LockPackageAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/LockPackageAction.java index f92513e4aa65..e74a3a613120 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/LockPackageAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/LockPackageAction.java @@ -49,6 +49,7 @@ import java.util.List; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -114,7 +115,7 @@ public ActionForward execute(ActionMapping mapping, List pkgsFindAlreadyLocked = PackageManager.lookupByIdAndUser( lockedPackagesResult.stream().map(PackageListItem::getPackageId) - .toList(), user); + .collect(Collectors.toList()), user); pkgsAlreadyLocked.addAll(pkgsFindAlreadyLocked); SessionSetHelper helper = new SessionSetHelper(request); diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java index e6d27cdd8932..e0f2f189f085 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java @@ -40,6 +40,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -143,7 +144,7 @@ else if (ftpUrl != null) { request.setAttribute("extraTags", pkg.getExtraTags() .entrySet().stream().map(e -> Map.entry(e.getKey().getName(), e.getValue())) - .toList()); + .collect(Collectors.toList())); return mapping.findForward(RhnHelper.DEFAULT_FORWARD); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListConfirmAction.java index 41d88a70aed2..56a4e8742528 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListConfirmAction.java @@ -53,6 +53,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -101,7 +102,7 @@ private List getSystemIds(HttpServletRequest request) { User user = context.getCurrentUser(); return SystemManager.inSet(user, SetLabels.SYSTEM_LIST).stream() .map(SystemOverview::getId) - .toList(); + .collect(Collectors.toList()); } private ActionForward handleDispatch( diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java index d9b869c1ce01..d9829e133656 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java @@ -620,7 +620,7 @@ private String populateRequestFromAction(HttpServletRequest request, RequestCont } Channel baseChannel = baseChannelSet.iterator().next(); - List channelIds = channels.stream().map(Channel::getId).toList(); + List channelIds = channels.stream().map(Channel::getId).collect(Collectors.toList()); List childChannels = getChannelDTOs(ctx, baseChannel, channelIds); // Get name of original base channel if channel is cloned @@ -634,7 +634,7 @@ private String populateRequestFromAction(HttpServletRequest request, RequestCont installedProducts, server.getServerArch().getCompatibleChannelArch(), ctx.getCurrentUser() - ).stream().filter(productSet -> productSet.getBaseProduct().equals(baseProduct)).toList(); + ).stream().filter(productSet -> productSet.getBaseProduct().equals(baseProduct)).collect(Collectors.toList()); if (targetProductSet.isEmpty()) { logger.debug("No valid migration target found"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java index 847c5ff1f95c..7019c5f74654 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java @@ -47,6 +47,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -135,7 +136,7 @@ public ActionForward execute(ActionMapping mapping, ActionForm form, (e1, e2) -> (e1.isBase() && e2.isBase()) || (!e1.isBase() && !e2.isBase()) ? e1.getHumanReadableLabel().compareTo(e2.getHumanReadableLabel()) : (e1.isBase() ? -1 : 1)) - .toList(); + .collect(Collectors.toList()); request.setAttribute("rebootRequired", rebootRequired); request.setAttribute("rebootScheduled", rebootScheduled); diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/groups/ListRemoveGroupsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/groups/ListRemoveGroupsAction.java index 158b3ab66555..cd70234cf165 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/groups/ListRemoveGroupsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/groups/ListRemoveGroupsAction.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -79,7 +80,7 @@ public List getResult(RequestContext context) { List groups = key.getServerGroups().stream() .filter(g -> g instanceof ManagedServerGroup) .map(g -> (ManagedServerGroup)g) - .toList(); + .collect(Collectors.toList()); AddGroupsAction.setupAccessMap(context, groups); return groups; } diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java b/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java index cc3b01e7f010..2cc9e15872af 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageOverview.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.persistence.Tuple; @@ -66,7 +67,7 @@ public PackageOverview(Tuple tuple) { .map(value -> Arrays.stream(value.split(",")) .map(c -> new Row(Map.of("name", c))) - .toList()) + .collect(Collectors.toList())) .orElse(new ArrayList<>()); } diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SetupWizardProductDto.java b/java/code/src/com/redhat/rhn/frontend/dto/SetupWizardProductDto.java index 43ed6bfdc9b4..1f6e95014f16 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/SetupWizardProductDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/SetupWizardProductDto.java @@ -29,6 +29,7 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -340,7 +341,7 @@ public List getInstallerUpdateChannels() { getOptionalChannels().stream() ) .filter(Channel::isInstallerUpdates) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/frontend/events/ScheduleRepoSyncAction.java b/java/code/src/com/redhat/rhn/frontend/events/ScheduleRepoSyncAction.java index f41226987ff2..5b07d1018d41 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/ScheduleRepoSyncAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/ScheduleRepoSyncAction.java @@ -28,6 +28,7 @@ import org.apache.logging.log4j.Logger; import java.util.List; +import java.util.stream.Collectors; /** * ScheduleRepoSyncAction @@ -62,7 +63,7 @@ private void scheduleRepoSync(List channelLabels, Long userId) { List channels = channelLabels.stream() .map(label -> ChannelManager.lookupByLabel(org, label)) - .toList(); + .collect(Collectors.toList()); try { new TaskomaticApi().scheduleSingleRepoSync(channels); diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/OvalServlet.java b/java/code/src/com/redhat/rhn/frontend/servlets/OvalServlet.java index 7e20b117e294..09cd9188a924 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/OvalServlet.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/OvalServlet.java @@ -39,6 +39,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; +import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -85,7 +86,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) { ovalFiles = erratas.stream() .flatMap(errata -> ErrataFactory.lookupErrataFilesByErrataAndFileType(errata.getId(), "oval") .stream()) - .toList(); + .collect(Collectors.toList()); } if (format.equals("xml")) { @@ -103,7 +104,7 @@ private List getErrataIds(HttpServletRequest request, HttpServletRespons return Collections.emptyList(); } return Arrays.stream(errataIds).map(id -> URLDecoder.decode(id, StandardCharsets.UTF_8)) - .toList(); + .collect(Collectors.toList()); } private String getFormat(HttpServletRequest request) { diff --git a/java/code/src/com/redhat/rhn/frontend/struts/ActionChainHelper.java b/java/code/src/com/redhat/rhn/frontend/struts/ActionChainHelper.java index 55391091e07a..b0949bbd1d0e 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/ActionChainHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/ActionChainHelper.java @@ -36,6 +36,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; @@ -140,6 +141,6 @@ public static String actionChainsJson(User user) { tuple.addProperty("id", ac.getId()); tuple.addProperty("text", ac.getLabel()); return tuple; - }).toList()); + }).collect(Collectors.toList())); } } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java index 78f39d1b8297..a65b26d54036 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java @@ -287,7 +287,7 @@ public List listChannels(String minionId, String token = tokenBuilder.getToken(); return key.getChannels().stream().map( c -> new ChannelInfo(c.getLabel(), c.getName(), url + c.getLabel(), token) - ).toList(); + ).collect(Collectors.toList()); } catch (JoseException e) { throw new TokenCreationException(e); @@ -858,7 +858,7 @@ public int addAppStreams(User loggedInUser, String key, List ActivationKey activationKey = lookupKey(key, loggedInUser); List appStreamsKeys = appStreams.stream() .map(it -> it.get("module") + ":" + it.get("stream")) - .toList(); + .collect(Collectors.toList()); Map channelsProviding = akm.getChannelsProvidingAppStreams(activationKey, appStreamsKeys); Map> toIncludeMap = channelsProviding.entrySet().stream() .collect(Collectors.groupingBy( @@ -894,7 +894,7 @@ public int removeAppStreams(User loggedInUser, String key, List it.get("module") + ":" + it.get("stream")) - .toList(); + .collect(Collectors.toList()); akm.removeAppStreams(activationKey, toRemove); return 1; } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/admin/configuration/AdminConfigurationHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/admin/configuration/AdminConfigurationHandler.java index 798a88c50f2f..64cc2fe7ae96 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/admin/configuration/AdminConfigurationHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/admin/configuration/AdminConfigurationHandler.java @@ -49,6 +49,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.security.auth.login.LoginException; @@ -231,7 +232,7 @@ private void createOrUpdateUser(User loggedInUser, String name, String password, User target = XmlRpcUserHelper.getInstance().lookupTargetUser(loggedInUser, name); List existingGroups = ServerGroupFactory.listAdministeredServerGroups(target).stream() .map(group -> group.getName()) - .toList(); + .collect(Collectors.toList()); LOG.debug("existing groups: {}", existingGroups); LOG.debug("requested groups: {}", systemGroups); List toAdd = new ArrayList<>(); @@ -258,7 +259,7 @@ private void createOrUpdateUser(User loggedInUser, String name, String password, List existingManageableChannels = Arrays.stream(channelHandler.listManageableChannels(target)) .map(c -> ((ChannelTreeNode)c).getChannelLabel()) - .toList(); + .collect(Collectors.toList()); LOG.debug("existing manageable channels: {}", existingManageableChannels); LOG.debug("requested manageable channels: {}", manageableChannels); @@ -278,7 +279,7 @@ private void createOrUpdateUser(User loggedInUser, String name, String password, List existingSubscribableChannels = Arrays.stream(channelHandler.listMyChannels(target)) .map(c -> ((ChannelTreeNode)c).getChannelLabel()) - .toList(); + .collect(Collectors.toList()); LOG.debug("existing subscribable channels: {}", existingSubscribableChannels); LOG.debug("requested subscribable channels: {}", subscribableChannels); @@ -391,7 +392,7 @@ private void createOrUpdateActivationKey(User loggedInUser, Long orgId, String n activationKeyHandler.addServerGroups(loggedInUser, key, serverGroupsToAdd.stream() .map(groupName -> serverGroupHandler.getDetails(loggedInUser, groupName).getId().intValue()) - .toList()); + .collect(Collectors.toList())); LOG.debug("Configuration channels: {}", configurationChannels); activationKeyHandler.setConfigChannels(loggedInUser, Arrays.asList(key), configurationChannels); } @@ -499,7 +500,7 @@ public int configure(User loggedInUser, Map content) { activationKeyData.getOrDefault("system_types", Collections.emptyList()); List systemTypesList = systemTypes.stream() .map(entry -> entry.get("type")) - .toList(); + .collect(Collectors.toList()); String contactMethod = (String) activationKeyData.get("contact_method"); Boolean configureAfterRegistration = (Boolean) activationKeyData.get("configure_after_registration"); List configurationChannels = (List) diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/chain/ActionChainHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/chain/ActionChainHandler.java index de9dda810288..508060541c42 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/chain/ActionChainHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/chain/ActionChainHandler.java @@ -47,6 +47,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; /** * @apidoc.namespace actionchain @@ -329,7 +330,7 @@ public Integer addErrataUpdate(User loggedInUser, List actionIds = null; try { List serverIds = sids.stream().map(sid -> - this.acUtil.getServerById(sid, loggedInUser)).toList(); + this.acUtil.getServerById(sid, loggedInUser)).collect(Collectors.toList()); actionIds = ActionChainManager.scheduleErrataUpdate(loggedInUser, serverIds, @@ -654,7 +655,7 @@ public Integer addConfigurationDeployment(User loggedInUser, (String) specifier.get("channelLabel"), (String) specifier.get("filePath"), (Integer) specifier.get("revision")).getId() - ).toList(); + ).collect(Collectors.toList()); try { ActionChainManager.createConfigActions(loggedInUser, revisionIds, server, diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java index 92164934286b..dee99e2d9640 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java @@ -101,6 +101,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import javax.persistence.NoResultException; @@ -3169,8 +3170,8 @@ public int clearVendorRepoFilters(User loggedInUser, String label) { public long applyChannelState(User user, List sids) { try { - List serverIds = sids.stream().map(Integer::longValue).toList(); - List minionServers = MinionServerFactory.lookupByIds(serverIds).toList(); + List serverIds = sids.stream().map(Integer::longValue).collect(Collectors.toList()); + List minionServers = MinionServerFactory.lookupByIds(serverIds).collect(Collectors.toList()); return ChannelManager.applyChannelState(user, minionServers).orElse(0L); } catch (com.redhat.rhn.taskomatic.TaskomaticApiException e) { diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java index 53d60269ef85..3cccd3cf6d10 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java @@ -68,6 +68,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.stream.Collectors; /** * ConfigHandler @@ -1030,6 +1031,6 @@ public List listAssignedSystemGroups(User loggedInUser, Stri List groupIds = StateFactory.listConfigChannelsSubscribedGroupIds(channel); return groupIds.stream() .map(gid -> ServerGroupFactory.lookupByIdAndOrg(gid, loggedInUser.getOrg())) - .toList(); + .collect(Collectors.toList()); } } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java index 00f844985455..fa97ba8b29f8 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java @@ -66,6 +66,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; /** * ConfigChannelHandlerTest @@ -282,7 +283,7 @@ public void testSyncSaltFilesNoChannels() { */ private int removeAllGlobals() { var channels = handler.listGlobals(admin); - var labels = channels.stream().map(ConfigChannelDto::getLabel).toList(); + var labels = channels.stream().map(ConfigChannelDto::getLabel).collect(Collectors.toList()); return handler.deleteChannels(admin, labels); } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java index 4469e593b6eb..5c53c6c4f6ac 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java @@ -328,7 +328,7 @@ public void testListAffectedSystems() throws Exception { Package unpatched1 = createTestPackage(user, channel1, "noarch"); createLaterTestPackage(user, userErrata, channel1, unpatched1); - Server server1 = createTestServer(user, Stream.of(channel1).toList()); + Server server1 = createTestServer(user, Stream.of(channel1).collect(Collectors.toList())); createTestInstalledPackage(unpatched1, server1); UpdateErrataCacheCommand uECC = new UpdateErrataCacheCommand(); @@ -351,7 +351,7 @@ public void testListAffectedSystems() throws Exception { Package unpatchedPkg2 = createTestPackage(admin, channel2, "noarch"); createLaterTestPackage(admin, vendorErrata, channel2, unpatchedPkg2); - Server server2 = createTestServer(admin, Stream.of(channel2).toList()); + Server server2 = createTestServer(admin, Stream.of(channel2).collect(Collectors.toList())); createTestInstalledPackage(unpatchedPkg2, server2); uECC.updateErrataCacheForServer(server2.getId(), false); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/formula/FormulaHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/formula/FormulaHandler.java index 1ea1d3ced219..282cdd8cb08b 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/formula/FormulaHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/formula/FormulaHandler.java @@ -42,6 +42,7 @@ import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * FormulaHandler @@ -165,7 +166,7 @@ public int setFormulasOfGroup(User loggedInUser, Integer systemGroupId, .map(Server::asMinionServer) .flatMap(Opt::stream) .map(MinionServer::getMinionId) - .toList(); + .collect(Collectors.toList()); saltApi.refreshPillar(new MinionList(minions)); } catch (ValidatorException e) { @@ -254,7 +255,7 @@ public List getCombinedFormulaDataByServerIds(User loggedInUser, St List sids) { List ids = sids.stream() .map(Integer::longValue) - .toList(); + .collect(Collectors.toList()); return this.formulaManager.getCombinedFormulaDataForSystems(loggedInUser, ids, formulaName); } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/image/ImageInfoHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/image/ImageInfoHandler.java index 76afa54f5939..7108704ddb7b 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/image/ImageInfoHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/image/ImageInfoHandler.java @@ -450,7 +450,7 @@ public List getRelevantErrata(User loggedInUser, Integer imageId List eids = opt.get().getPatches().stream() .map(Errata::getId) - .toList(); + .collect(Collectors.toList()); return ErrataFactory.search(eids, loggedInUser.getOrg()); } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/image/store/ImageStoreHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/image/store/ImageStoreHandler.java index f2cc00c9a5ff..d0f4889f1fda 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/image/store/ImageStoreHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/image/store/ImageStoreHandler.java @@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -116,7 +117,7 @@ public List listImageStoreTypes(User loggedInUser) { @ReadOnly public List listImageStores(User loggedInUser) { ensureImageAdmin(loggedInUser); - return ImageStoreFactory.listImageStores(loggedInUser.getOrg()).stream().toList(); + return new ArrayList<>(ImageStoreFactory.listImageStores(loggedInUser.getOrg())); } /** diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java index 7def7c5033ce..64919933c668 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * PackageHelper @@ -52,7 +53,7 @@ public static Map packageToMap(Package pkg, User user) { // deal with the providing channels first DataResult dr = PackageManager.providingChannels(user, pkg.getId()); - List channelLabels = dr.stream().map(r -> (String)r.get("label")).toList(); + List channelLabels = dr.stream().map(r -> (String)r.get("label")).collect(Collectors.toList()); pkgMap.put("providing_channels", channelLabels); // now deal with the actual package object. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/recurringaction/RecurringCustomStateHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/recurringaction/RecurringCustomStateHandler.java index 8773e0c3ea2a..a645b31dc9c9 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/recurringaction/RecurringCustomStateHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/recurringaction/RecurringCustomStateHandler.java @@ -36,6 +36,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -182,6 +183,6 @@ public List listAvailable(User loggedInUser) { // Get internal states RecurringActionFactory.listInternalStates().stream() .map(InternalState::getName) - ).toList(); + ).collect(Collectors.toList()); } } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RecurringActionSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RecurringActionSerializer.java index 068dd88bffc0..746bf997a548 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RecurringActionSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/RecurringActionSerializer.java @@ -26,6 +26,7 @@ import com.suse.manager.api.SerializedApiResponse; import java.util.Comparator; +import java.util.stream.Collectors; /** * Serializer for {@link com.redhat.rhn.domain.recurringactions.RecurringAction} class and subclasses @@ -70,7 +71,7 @@ public SerializedApiResponse serialize(RecurringAction src) { builder.add("states", stateAction.getStateConfig().stream() .sorted(Comparator.comparing(RecurringStateConfig::getPosition)) .map(RecurringStateConfig::getStateName) - .toList()); + .collect(Collectors.toList())); } else if (src.getActionType().equals(RecurringActionType.ActionType.HIGHSTATE)) { builder.add("test", ((RecurringHighstate) src.getRecurringActionType()).isTestMode()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/content/ContentSyncHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/content/ContentSyncHandler.java index 0ce30ba84567..51db4555aca0 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/content/ContentSyncHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/content/ContentSyncHandler.java @@ -251,8 +251,8 @@ public Object[] addChannels(User loggedInUser, String channelLabel, String mirro List mandatoryChannelLabels = SUSEProductFactory.findNotSyncedMandatoryChannels(channelLabel) - .map(ChannelTemplate::getChannelLabel) - .toList(); + .map(ChannelTemplate::getChannelLabel) + .toList(); LinkedHashSet channelLabelsToAdd = new LinkedHashSet<>(mandatoryChannelLabels); channelLabelsToAdd.add(channelLabel); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index 05a2131bdfc8..9510a33514af 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -19,6 +19,7 @@ import static java.util.Collections.singletonList; import static java.util.Optional.empty; import static java.util.Optional.of; +import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import com.redhat.rhn.FaultException; @@ -623,7 +624,7 @@ public List scheduleChangeChannels(User loggedInUser, List sids, List childChannels = channelIds.stream() .map(cid -> ChannelFactory.lookupByIdAndUser(cid, loggedInUser)) - .toList(); + .collect(toList()); // consistent check long bid = baseChannel.map(Channel::getId).orElse(-1L); @@ -644,7 +645,7 @@ public List scheduleChangeChannels(User loggedInUser, List sids, baseChannel, childChannels, earliestOccurrence, null); - return action.stream().map(Action::getId).toList(); + return action.stream().map(Action::getId).collect(toList()); } catch (com.redhat.rhn.taskomatic.TaskomaticApiException e) { throw new TaskomaticApiException(e.getMessage()); @@ -1563,7 +1564,7 @@ public List> listInstalledPackages(User loggedInUser, Intege Optional.ofNullable(pi.getInstallTimeObj()).ifPresent(it -> item.put("installtime", it)); item.put("retracted", pi.isRetracted()); return item; - }).toList(); + }).collect(toList()); } /** @@ -1609,7 +1610,7 @@ public List> listPackagesLockStatus(User loggedInUser, Integ item.put("pending status", pi.getPending().equals("L") ? "Locking" : "Unlocking"); } return item; - }).toList(); + }).collect(toList()); } /** @@ -3912,7 +3913,7 @@ public List scheduleApplyErrata(User loggedInUser, List sids, Lis // we need long values to pass to ErrataManager.applyErrataHelper List serverIds = sids.stream() .map(Integer::longValue) - .toList(); + .collect(toList()); if (!allowModules) { for (Long sid : serverIds) { @@ -3926,7 +3927,7 @@ public List scheduleApplyErrata(User loggedInUser, List sids, Lis } List eids = errataIds.stream() .map(Integer::longValue) - .toList(); + .collect(toList()); try { return ErrataManager.applyErrataHelper(loggedInUser, @@ -4249,16 +4250,16 @@ private Long[] schedulePackagesAction(User loggedInUser, List sids, if (ActionFactory.TYPE_PACKAGES_UPDATE.equals(acT)) { List> pidsidpairs = ErrataFactory.retractedPackages( - packages.stream().map(Package::getId).toList(), - sids.stream().map(Integer::longValue).toList() + packages.stream().map(Package::getId).collect(toList()), + sids.stream().map(Integer::longValue).collect(toList()) ); if (!pidsidpairs.isEmpty()) { - throw new RetractedPackageFault(pidsidpairs.stream().map(Tuple2::getA).toList()); + throw new RetractedPackageFault(pidsidpairs.stream().map(Tuple2::getA).collect(toList())); } } // Check if the package is part of a PTF. If true it cannot be manually installed/updated/ removed - List ptfPackages = packages.stream().filter(Package::isPartOfPtf).map(Package::getId).toList(); + List ptfPackages = packages.stream().filter(Package::isPartOfPtf).map(Package::getId).collect(toList()); if (!ptfPackages.isEmpty()) { throw new PtfPackageFault(ptfPackages); } @@ -4268,7 +4269,7 @@ private Long[] schedulePackagesAction(User loggedInUser, List sids, List ptfMasterPackages = packages.stream() .filter(Package::isMasterPtfPackage) .map(Package::getId) - .toList(); + .collect(toList()); if (!ptfMasterPackages.isEmpty()) { throw new PtfMasterFault(ptfMasterPackages); } @@ -4488,12 +4489,12 @@ public Long[] schedulePackageInstall(User loggedInUser, List sids, List packageIds, Date earliestOccurrence, Boolean allowModules) { List> retracted = ErrataFactory.retractedPackages( - packageIds.stream().map(Integer::longValue).toList(), - sids.stream().map(Integer::longValue).toList()); + packageIds.stream().map(Integer::longValue).collect(toList()), + sids.stream().map(Integer::longValue).collect(toList())); List retractedPids = retracted.stream() .map(Tuple2::getA) - .toList(); + .collect(toList()); if (retracted.isEmpty()) { return schedulePackagesAction(loggedInUser, sids, packageIdsToMaps(loggedInUser, packageIds), earliestOccurrence, @@ -4998,13 +4999,13 @@ public Long schedulePackageLockChange(User loggedInUser, Integer sid, Set pkgsAlreadyLocked = new HashSet<>(); List pkgsFindAlreadyLocked = PackageManager.lookupByIdAndUser( lockedPackagesResult.stream().map(PackageListItem::getPackageId) - .toList(), loggedInUser); + .collect(toList()), loggedInUser); pkgsAlreadyLocked.addAll(pkgsFindAlreadyLocked); Set pkgsToLock = new HashSet<>(); List pkgsFindToLock = PackageManager.lookupByIdAndUser(pkgIdsToLock - .stream().map(Integer::longValue).toList(), loggedInUser); + .stream().map(Integer::longValue).collect(toList()), loggedInUser); pkgsFindToLock.stream().filter(Objects::nonNull).forEach(pkgsToLock::add); pkgsToLock.removeAll(pkgsAlreadyLocked); @@ -5014,7 +5015,7 @@ public Long schedulePackageLockChange(User loggedInUser, Integer sid, Set pkgsToUnlock = new HashSet<>(); List pkgsFindToUnlock = PackageManager.lookupByIdAndUser(pkgIdsToUnlock - .stream().map(Integer::longValue).toList(), loggedInUser); + .stream().map(Integer::longValue).collect(toList()), loggedInUser); pkgsFindToUnlock.stream().filter(Objects::nonNull).forEach(pkgsToUnlock::add); pkgsToUnlock.forEach(x -> x.setLockPending(Boolean.TRUE)); @@ -8288,7 +8289,7 @@ public List getInstalledProducts(User loggedInUser, .map(p -> new SUSEInstalledProduct(p.getName(), p.getVersion(), p.getArch().getLabel(), p.getRelease(), p.isBaseproduct(), p.getSUSEProduct().getFriendlyName())) - .toList(); + .collect(toList()); } /** @@ -8663,10 +8664,10 @@ public Long scheduleApplyHighstate(User loggedInUser, Integer sid, Date earliest * @apidoc.returntype #param("int", "actionId", "The action id of the scheduled action") */ public Long scheduleApplyHighstate(User loggedInUser, List sids, Date earliestOccurrence, Boolean test) { - List sysids = sids.stream().map(Integer::longValue).collect(Collectors.toList()); + List sysids = sids.stream().map(Integer::longValue).collect(toList()); try { - Set visible = MinionServerFactory.lookupVisibleToUser(loggedInUser) - .map(Server::getId).collect(toSet()); + List visible = MinionServerFactory.lookupVisibleToUser(loggedInUser) + .map(Server::getId).toList(); if (!visible.containsAll(sysids)) { sysids.removeAll(visible); throw new UnsupportedOperationException("Some System not managed with Salt: " + sysids); @@ -8730,7 +8731,7 @@ public Long scheduleApplyStates(User loggedInUser, Integer sid, List sta */ public Long scheduleApplyStates(User loggedInUser, List sids, List stateNames, Date earliestOccurrence, Boolean test) { - List sysids = sids.stream().map(Integer::longValue).toList(); + List sysids = sids.stream().map(Integer::longValue).collect(toList()); try { List visible = MinionServerFactory.lookupVisibleToUser(loggedInUser) .map(Server::getId).toList(); @@ -9058,7 +9059,7 @@ public List refreshPillar(User loggedInUser, String subset, List changeProxy(User loggedInUser, List sids, Integer proxyId) { - List sysids = sids.stream().map(Integer::longValue).toList(); + List sysids = sids.stream().map(Integer::longValue).collect(toList()); try { return ActionManager.changeProxy(loggedInUser, sysids, proxyId.longValue()); } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/XmlRpcSystemHelper.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/XmlRpcSystemHelper.java index e9f1299729ed..18b37e0e4e2b 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/XmlRpcSystemHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/XmlRpcSystemHelper.java @@ -30,6 +30,7 @@ import com.suse.manager.webui.utils.gson.BootstrapParameters; import java.util.List; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -92,7 +93,7 @@ public Server lookupServer(User user, Number sid) throws NoSuchSystemException { public List lookupServers(User user, List serverIds) throws NoSuchSystemException { try { return SystemManager.lookupByServerIdsAndUser( - serverIds.stream().map(Number::longValue).toList(), user.getId()); + serverIds.stream().map(Number::longValue).collect(Collectors.toList()), user.getId()); } catch (LookupException e) { throw new NoSuchSystemException("No such systems found for user: " + user.getId()); @@ -113,7 +114,7 @@ public List lookupServersForSubscribe(User user, List throws NoSuchSystemException { try { return ServerFactory.getSystemsForSubscribe( - serverIds.stream().map(Number::longValue).toList(), user); + serverIds.stream().map(Number::longValue).collect(Collectors.toList()), user); } catch (LookupException e) { throw new NoSuchSystemException("No such systems found for user: " + user.getId()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/appstreams/SystemAppStreamHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/appstreams/SystemAppStreamHandler.java index 622d721faf08..2d0adcafd80c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/appstreams/SystemAppStreamHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/appstreams/SystemAppStreamHandler.java @@ -38,6 +38,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; /** * Handler for AppStream operations on systems @@ -188,7 +189,7 @@ public List listModuleStreams(User loggedInUser, Inte AppStreamsManager.listChannelAppStreams(channel.getId()), server::hasAppStreamModuleEnabled )) - .toList(); + .collect(Collectors.toList()); } catch (LookupException e) { throw new NoSuchSystemException(); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java index a75691f2572b..c56c75bafb8e 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java @@ -57,6 +57,7 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -517,7 +518,7 @@ public int addChannels(User loggedInUser, List sids, List config // and their ranks will be overridden channelsToAdd = Stream .concat(channels.stream(), server.getConfigChannelStream().filter(c -> !channels.contains(c))) - .toList(); + .collect(Collectors.toList()); } else { // Channels are added to the end by default diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java index 34887ee60a4c..5ccbf7741a4b 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java @@ -81,6 +81,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; /** * SystemConfigHandlerTest @@ -224,7 +225,7 @@ public void testConfigSetChannels() { List channels = List.of(gcc1, gcc2); - List channelLabels = channels.stream().map(ConfigChannel::getLabel).toList(); + List channelLabels = channels.stream().map(ConfigChannel::getLabel).collect(Collectors.toList()); //test set channels handler.setChannels(admin, serverIds, channelLabels); @@ -273,7 +274,7 @@ public void testConfigChannelRemove() { List channels = List.of(gcc1, gcc2); List channelLabels = channels.stream() .map(ConfigChannel::getLabel) - .toList(); + .collect(Collectors.toList()); srv1.setConfigChannels(channels, regular); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/monitoring/SystemMonitoringHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/monitoring/SystemMonitoringHandler.java index 3fc4e604c8c1..aec3007c3d88 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/monitoring/SystemMonitoringHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/monitoring/SystemMonitoringHandler.java @@ -23,6 +23,7 @@ import com.suse.manager.api.ReadOnly; import java.util.List; +import java.util.stream.Collectors; /** * SystemMonitoringHandler @@ -62,7 +63,7 @@ public SystemMonitoringHandler(FormulaManager formulaManagerIn) { public List listEndpoints(User loggedInUser, List sids) { List ids = sids.stream() .map(Integer::longValue) - .toList(); + .collect(Collectors.toList()); return this.formulaManager.listEndpoints(ids); } } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java index 04181310fe35..7d4da001dc56 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java @@ -50,6 +50,7 @@ import java.util.Date; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; /** * ServerGroupHandler @@ -608,7 +609,7 @@ public int subscribeConfigChannel(User loggedInUser, String systemGroupName, List channels = configChannelLabels.stream() .map(l -> Optional.ofNullable(manager.lookupGlobalConfigChannel(loggedInUser, l)) .orElseThrow(() -> new NoSuchChannelException(l))) - .toList(); + .collect(Collectors.toList()); group.subscribeConfigChannels(channels, loggedInUser); return 1; @@ -638,7 +639,7 @@ public int unsubscribeConfigChannel(User loggedInUser, String systemGroupName, List channels = configChannelLabels.stream() .map(l -> Optional.ofNullable(manager.lookupGlobalConfigChannel(loggedInUser, l)) .orElseThrow(() -> new NoSuchChannelException(l))) - .toList(); + .collect(Collectors.toList()); group.unsubscribeConfigChannels(channels, loggedInUser); return 1; @@ -667,6 +668,6 @@ public List listAssignedFormuals(User loggedInUser, String systemGroupN List formulas = FormulaFactory.listFormulas(); List assigned = FormulaFactory.getFormulasByGroup(group); - return formulas.stream().filter(f -> assigned.contains(f.getName())).toList(); + return formulas.stream().filter(f -> assigned.contains(f.getName())).collect(Collectors.toList()); } } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java index 49cfbd50beb2..f5c788f38c1d 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java @@ -1019,7 +1019,7 @@ public int addAssignedSystemGroups(User loggedInUser, String login, List groups.add(group); } - List groupIds = groups.stream().map(ManagedServerGroup::getId).toList(); + List groupIds = groups.stream().map(ManagedServerGroup::getId).collect(Collectors.toList()); UserManager.grantServerGroupPermission(targetUser.getId(), groupIds); // Follow up with a call to addDefaultSystemGroups if setDefault is true: diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserNotificationsHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserNotificationsHandler.java index 9321033641b2..aa5bad386708 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserNotificationsHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserNotificationsHandler.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; +import java.util.stream.Collectors; /** * Provides API to manage user notifications. @@ -117,7 +118,7 @@ public int deleteNotifications(User user, List notifications) { }); }) .filter(Objects::nonNull) - .toList(); + .collect(Collectors.toList()); int cnt = UserNotificationFactory.delete(collect); return cnt == notifications.size() ? 1 : 0; } diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionChainManager.java b/java/code/src/com/redhat/rhn/manager/action/ActionChainManager.java index 2a45a40b1ff7..e1c17c147cd9 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionChainManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionChainManager.java @@ -558,10 +558,10 @@ public static List scheduleErrataUpdate(User user, List servers, L // This won't actually apply the errata because we're passing in an action chain return ErrataManager.applyErrata(user, - errataIds.stream().map(Integer::longValue).toList(), + errataIds.stream().map(Integer::longValue).collect(Collectors.toList()), earliest, actionChain, - servers.stream().map(Server::getId).toList(), true, false + servers.stream().map(Server::getId).collect(Collectors.toList()), true, false ); } @@ -585,10 +585,10 @@ public static List scheduleErrataUpdate(User user, List servers, L // This won't actually apply the errata because we're passing in an action chain return ErrataManager.applyErrata(user, - errataIds.stream().map(Integer::longValue).toList(), + errataIds.stream().map(Integer::longValue).collect(Collectors.toList()), earliest, actionChain, - servers.stream().map(Server::getId).toList(), onlyRelevant, false); + servers.stream().map(Server::getId).collect(Collectors.toList()), onlyRelevant, false); } diff --git a/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java b/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java index c9d90960c9b8..7de076d030a3 100644 --- a/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/action/test/ActionManagerTest.java @@ -563,7 +563,7 @@ public void testCancelActionForSubsetOfServerWithMultipleServerActions() throws .collect(Collectors.toList()); servers.remove(0); - Collection activeServers = servers.stream().map(Server::getId).toList(); + Collection activeServers = servers.stream().map(Server::getId).collect(Collectors.toList()); Map> actionMap = actionList.stream() .map(a -> new ImmutablePair<>( diff --git a/java/code/src/com/redhat/rhn/manager/audit/CVEAuditManager.java b/java/code/src/com/redhat/rhn/manager/audit/CVEAuditManager.java index 2ee09436fe53..bac29f28a5e3 100644 --- a/java/code/src/com/redhat/rhn/manager/audit/CVEAuditManager.java +++ b/java/code/src/com/redhat/rhn/manager/audit/CVEAuditManager.java @@ -130,7 +130,7 @@ public static void insertRelevantImageChannels(Map populateCVEChannels(AuditTarget auditTarget) { ).entrySet() .stream() // its safe to call get here since groupingBy will not produce empty lists - .map(s -> s.getValue().get()).toList(); + .map(s -> s.getValue().get()).collect(Collectors.toList()); }); } @@ -908,7 +908,7 @@ public static List listImagesByPatchStatus(User user, system.getPatchStatus(), system.getChannels(), system.getErratas() - )).toList(); + )).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/manager/audit/CVEAuditManagerOVAL.java b/java/code/src/com/redhat/rhn/manager/audit/CVEAuditManagerOVAL.java index dcec720ad06a..6894cb76debb 100644 --- a/java/code/src/com/redhat/rhn/manager/audit/CVEAuditManagerOVAL.java +++ b/java/code/src/com/redhat/rhn/manager/audit/CVEAuditManagerOVAL.java @@ -333,7 +333,7 @@ private static List getInstalledPackageVersions( List allInstalledPackages) { return allInstalledPackages.stream().filter(installed -> Objects.equals(installed.getName(), pkg.getName())) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/manager/audit/test/CVEAuditManagerOVALTest.java b/java/code/src/com/redhat/rhn/manager/audit/test/CVEAuditManagerOVALTest.java index 6bb2447cee52..1a686d6fbf04 100644 --- a/java/code/src/com/redhat/rhn/manager/audit/test/CVEAuditManagerOVALTest.java +++ b/java/code/src/com/redhat/rhn/manager/audit/test/CVEAuditManagerOVALTest.java @@ -59,6 +59,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; // TODO: Test for when patch status is unknown public class CVEAuditManagerOVALTest extends RhnBaseTestCase { @@ -87,7 +88,7 @@ void testDoAuditSystemNotAffected() throws Exception { CVEAuditManager.populateCVEChannels(); List results = CVEAuditManager.listSystemsByPatchStatus(user, cve.getName()) - .toList(); + .collect(Collectors.toList()); CVEAuditSystemBuilder systemAuditResult = CVEAuditManagerOVAL.doAuditSystem(cve.getName(), results, server); @@ -122,7 +123,7 @@ void testDoAuditSystemNotAffectedWhenOSIsAffected() throws Exception { CVEAuditManager.populateCVEChannels(); List results = CVEAuditManager.listSystemsByPatchStatus(user, cve.getName()) - .toList(); + .collect(Collectors.toList()); CVEAuditSystemBuilder systemAuditResult = CVEAuditManagerOVAL.doAuditSystem(cve.getName(), results, server); @@ -156,7 +157,7 @@ void testDoAuditSystemPatched() throws Exception { CVEAuditManager.populateCVEChannels(); List results = CVEAuditManager.listSystemsByPatchStatus(user, cve.getName()) - .toList(); + .collect(Collectors.toList()); CVEAuditSystemBuilder systemAuditResult = CVEAuditManagerOVAL.doAuditSystem(cve.getName(), results, server); @@ -194,7 +195,7 @@ void testDoAuditSystemAffectedFullPatchAvailable() throws Exception { CVEAuditManager.populateCVEChannels(); List results = CVEAuditManager.listSystemsByPatchStatus(user, cve.getName()) - .toList(); + .collect(Collectors.toList()); CVEAuditSystemBuilder systemAuditResult = CVEAuditManagerOVAL.doAuditSystem(cve.getName(), results, server); @@ -229,7 +230,7 @@ void testDoAuditSystemAffectedPatchUnavailable() throws Exception { CVEAuditManager.populateCVEChannels(); List results = CVEAuditManager.listSystemsByPatchStatus(user, cve.getName()) - .toList(); + .collect(Collectors.toList()); CVEAuditSystemBuilder systemAuditResult = CVEAuditManagerOVAL.doAuditSystem(cve.getName(), results, server); @@ -272,7 +273,7 @@ void testDoAuditSystemAffectedPartialPatchAvailable() throws Exception { CVEAuditManager.populateCVEChannels(); List results = CVEAuditManager.listSystemsByPatchStatus(user, cve.getName()) - .toList(); + .collect(Collectors.toList()); CVEAuditSystemBuilder systemAuditResult = CVEAuditManagerOVAL.doAuditSystem(cve.getName(), results, server); @@ -314,7 +315,7 @@ void testDoAuditSystemAffectedPartialPatchAvailableFalsePositive() throws Except CVEAuditManager.populateCVEChannels(); List results = CVEAuditManager.listSystemsByPatchStatus(user, cve.getName()) - .toList(); + .collect(Collectors.toList()); CVEAuditSystemBuilder systemAuditResult = CVEAuditManagerOVAL.doAuditSystem(cve.getName(), results, server); @@ -361,7 +362,7 @@ void testDoAuditSystemAffectedPatchInapplicable() throws Exception { HibernateFactory.getSession().flush(); List results = CVEAuditManager.listSystemsByPatchStatus(user, cve.getName()) - .toList(); + .collect(Collectors.toList()); CVEAuditSystemBuilder systemAuditResult = CVEAuditManagerOVAL.doAuditSystem(cve.getName(), results, server); @@ -411,7 +412,7 @@ void testDoAuditSystemAffectedPatchInapplicableSuccessorProduct() throws Excepti HibernateFactory.getSession().flush(); List results = CVEAuditManager.listSystemsByPatchStatus(user, cve.getName()) - .toList(); + .collect(Collectors.toList()); CVEAuditSystemBuilder systemAuditResult = CVEAuditManagerOVAL.doAuditSystem(cve.getName(), results, server); @@ -453,7 +454,7 @@ public void testDoAuditSystemPatchedWithIrrelevantErrata() throws Exception { CVEAuditManager.populateCVEChannels(); List results = CVEAuditManager.listSystemsByPatchStatus(user, cve.getName()) - .toList(); + .collect(Collectors.toList()); CVEAuditSystemBuilder systemAuditResult = CVEAuditManagerOVAL.doAuditSystem(cve.getName(), results, server); @@ -486,7 +487,7 @@ void testDoAuditSystemAffectedPatchUnavailableInUyuni() throws Exception { CVEAuditManager.populateCVEChannels(); List results = CVEAuditManager.listSystemsByPatchStatus(user, cve.getName()) - .toList(); + .collect(Collectors.toList()); CVEAuditSystemBuilder systemAuditResult = CVEAuditManagerOVAL.doAuditSystem(cve.getName(), results, server); diff --git a/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java b/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java index 898c1d1c7388..83a12a638649 100644 --- a/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java +++ b/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java @@ -85,6 +85,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; /** * ConfigurationManager @@ -180,7 +181,7 @@ public DataResult listGlobalChannels(User user, PageControl pc public List listGlobalChannels(User user) { return ConfigurationFactory.listGlobalChannels().stream() .filter(c -> accessToChannel(user.getId(), c.getId())) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java index 1897004972a1..d147e259c9f2 100644 --- a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java +++ b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java @@ -328,7 +328,7 @@ private static List getAdditionalRepositories() { catch (IOException e) { LOG.error(e.getMessage(), e); } - repos.addAll(collectRepos(flattenProducts(getAdditionalProducts()).toList())); + repos.addAll(collectRepos(flattenProducts(getAdditionalProducts()).collect(Collectors.toList()))); return repos; } @@ -506,7 +506,7 @@ private List listProductsImpl() { return new MgrSyncProductDto( root.getFriendlyName(), root.getProductId(), root.getId(), root.getVersion(), false, baseChannel, allChannels, extensions); - }).toList(); + }).collect(Collectors.toList()); } /** @@ -871,7 +871,7 @@ public void refreshRepositoriesAuthentication( List ptfRepos = repositories.stream() .filter(r -> !availableRepoIds.contains(r.getSCCId())) .filter(SCCRepositoryJson::isPtfRepository) - .toList(); + .collect(Collectors.toList()); generatePtfChannels(ptfRepos); Map availableReposById = SCCCachingFactory.lookupRepositories().stream() .collect(Collectors.toMap(SCCRepository::getSccId, r -> r)); @@ -1095,7 +1095,7 @@ private static ChannelTemplate convertToChannelTemplate(SUSEProduct root, PtfPro List cList = Stream.concat(ptfInfo.getChannelParts().stream(), suffix.stream()) .filter(e -> !e.isBlank()) - .toList(); + .collect(Collectors.toList()); template.setChannelLabel(String.join("-", cList).toLowerCase().replaceAll("( for | )", "-")); template.setChannelName(String.join(" ", cList)); @@ -1355,7 +1355,7 @@ public Collection updateSubscriptions() throws ContentSyncE List sources = filterCredentials(); List subscriptions = sources.stream() .flatMap(source -> updateSubscriptions(source).stream()) - .toList(); + .collect(Collectors.toList()); LOG.debug("Found {} available subscriptions.", subscriptions.size()); return subscriptions; @@ -1633,7 +1633,7 @@ private List loadStaticTree(String tag) throws ContentSyncExce }); return tree.stream() .filter(e -> e.getTags().isEmpty() || e.getTags().contains(tag)) - .toList(); + .collect(Collectors.toList()); } /** @@ -1655,7 +1655,7 @@ public static Stream flattenProducts(List produc * @return a list of repositories */ public static List collectRepos(List products) { - return products.stream().flatMap(p -> p.getRepositories().stream()).toList(); + return products.stream().flatMap(p -> p.getRepositories().stream()).collect(Collectors.toList()); } private static Map productAttributeOverride(List tree, @@ -1699,7 +1699,7 @@ private static List overrideProductAttributes( .setProductType(productType) .setReleaseStage(releaseStage) .build(); - }).toList(); + }).collect(Collectors.toList()); } @@ -1957,7 +1957,7 @@ public void updateSUSEProducts(List products) throws ContentSync Stream.concat( products.stream(), getAdditionalProducts().stream() - ).toList(), + ).collect(Collectors.toList()), loadStaticTree(), getAdditionalRepositories()) ); } @@ -1975,7 +1975,7 @@ public void updateSUSEProducts(List products, List processed = new HashMap<>(); List allProducts = overrideProductAttributes( - flattenProducts(products).toList(), + flattenProducts(products).collect(Collectors.toList()), staticTree ); @@ -2129,7 +2129,7 @@ public List getAvailableChannels() { .map(ChannelTemplate::getProduct) .distinct() .flatMap(p -> getAvailableChannels(p, p, entriesByProducts, repoIdsWithAuth, allSUSEProdExt)) - .toList(); + .collect(Collectors.toList()); } /** @@ -2196,7 +2196,7 @@ public List listChannels() { return listProducts().stream().flatMap(p -> Stream.concat( p.getChannels().stream(), p.getExtensions().stream().flatMap(e -> e.getChannels().stream()) - )).toList(); + )).collect(Collectors.toList()); } protected Optional getTokenFromURL(String url) { diff --git a/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerNonRegressionTest.java b/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerNonRegressionTest.java index c590dfd91c32..96def04fc23f 100644 --- a/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerNonRegressionTest.java +++ b/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerNonRegressionTest.java @@ -91,7 +91,7 @@ public void skipTestListProducts() throws Exception { baseProducts.stream(), baseProducts.stream() .flatMap(p -> p.getExtensions().stream()) - ).toList(); + ).collect(Collectors.toList()); Set checkedProducts = new LinkedHashSet<>(); diff --git a/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerTest.java b/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerTest.java index 5df02e3ee539..8c2fa3b9d4dc 100644 --- a/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerTest.java @@ -421,8 +421,8 @@ public void testClonedVendorChannelMandadory() throws Exception { .toList(); assertIterableEquals( - List.of(applicationsFeb, basesystemFeb).stream().distinct().sorted().toList(), - resultAppFeb.stream().distinct().sorted().toList() + List.of(applicationsFeb, basesystemFeb).stream().distinct().sorted().collect(Collectors.toList()), + resultAppFeb.stream().distinct().sorted().collect(Collectors.toList()) ); List resultAppJan = SUSEProductFactory @@ -430,8 +430,8 @@ public void testClonedVendorChannelMandadory() throws Exception { .toList(); assertIterableEquals( - List.of(applicationsJan, basesystemJan).stream().distinct().sorted().toList(), - resultAppJan.stream().distinct().sorted().toList() + List.of(applicationsJan, basesystemJan).stream().distinct().sorted().collect(Collectors.toList()), + resultAppJan.stream().distinct().sorted().collect(Collectors.toList()) ); } @@ -828,7 +828,7 @@ public void testUpdateChannelsWithPtfReposAllModules() throws Exception { List r = basesystem.getChannelTemplates().stream() .filter(pr -> pr.getRootProduct().equals(sles)) .filter(pr -> Arrays.asList(15000L, 15001L).contains(pr.getRepository().getSccId())) - .toList(); + .collect(Collectors.toList()); assertNotEmpty(r); r.forEach(pr -> { assertNotNull(pr.getRepository()); @@ -849,7 +849,7 @@ public void testUpdateChannelsWithPtfReposAllModules() throws Exception { r = basesystem.getChannelTemplates().stream() .filter(pr -> pr.getRootProduct().equals(SUSEProductFactory.lookupByProductId(1941L))) .filter(pr -> Arrays.asList(15000L, 15001L).contains(pr.getRepository().getSccId())) - .toList(); + .collect(Collectors.toList()); assertNotEmpty(r); r.forEach(pr -> { assertNotNull(pr.getRepository()); @@ -871,7 +871,7 @@ public void testUpdateChannelsWithPtfReposAllModules() throws Exception { r = tools.getChannelTemplates().stream() .filter(pr -> pr.getRootProduct().equals(sles)) .filter(pr -> Arrays.asList(15002L, 15003L).contains(pr.getRepository().getSccId())) - .toList(); + .collect(Collectors.toList()); assertNotEmpty(r); r.forEach(pr -> { assertNotNull(pr.getRepository()); @@ -892,7 +892,7 @@ public void testUpdateChannelsWithPtfReposAllModules() throws Exception { r = tools.getChannelTemplates().stream() .filter(pr -> pr.getRootProduct().equals(SUSEProductFactory.lookupByProductId(1941L))) .filter(pr -> Arrays.asList(15002L, 15003L).contains(pr.getRepository().getSccId())) - .toList(); + .collect(Collectors.toList()); assertNotEmpty(r); r.forEach(pr -> { assertNotNull(pr.getRepository()); @@ -1377,7 +1377,7 @@ public void testGetAvailableChannels() throws Exception { List availableChannels = csm.getAvailableChannels(); List avChanLanbels = availableChannels - .stream().map(ChannelTemplate::getChannelLabel).toList(); + .stream().map(ChannelTemplate::getChannelLabel).collect(Collectors.toList()); assertContains(avChanLanbels, "sles12-pool-x86_64"); assertContains(avChanLanbels, "sle-12-cloud-compute5-updates-x86_64"); @@ -1743,7 +1743,7 @@ public void testUpgradePathRemoved() throws Exception { // Remove the upgrade path via the predecessor Id csm.updateSUSEProducts(Stream.of(product1, product2.copy().setOnlinePredecessorIds(Collections.emptyList()) - .build()).toList()); + .build()).collect(Collectors.toList())); // There should be no upgrade paths assertTrue(SUSEProductFactory.lookupByProductId(product1Id).getUpgrades().isEmpty()); diff --git a/java/code/src/com/redhat/rhn/manager/content/ubuntu/UbuntuErrataManager.java b/java/code/src/com/redhat/rhn/manager/content/ubuntu/UbuntuErrataManager.java index 86aa8f49d80e..ee077991da6d 100644 --- a/java/code/src/com/redhat/rhn/manager/content/ubuntu/UbuntuErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/content/ubuntu/UbuntuErrataManager.java @@ -206,10 +206,10 @@ private static Stream parseUbuntuErrata(Map err else { return Stream.empty(); } - }).toList(); + }).collect(Collectors.toList()); return Stream.of(new Tuple3<>(name, version, archs)); }) - ).toList(); + ).collect(Collectors.toList()); if (packageData.isEmpty()) { // Skip Errata when we have no matching packages @@ -392,7 +392,7 @@ else if (errata.getPackages().addAll(packages)) { Map> errataToChannels = changedErrata.stream().collect( Collectors.toMap( Errata::getId, - e -> e.getChannels().stream().map(Channel::getId).toList() + e -> e.getChannels().stream().map(Channel::getId).collect(Collectors.toList()) ) ); changedErrata.stream().flatMap(e -> e.getChannels().stream()).distinct() diff --git a/java/code/src/com/redhat/rhn/manager/contentmgmt/DependencyResolver.java b/java/code/src/com/redhat/rhn/manager/contentmgmt/DependencyResolver.java index 327fc3b06854..68a57053a725 100644 --- a/java/code/src/com/redhat/rhn/manager/contentmgmt/DependencyResolver.java +++ b/java/code/src/com/redhat/rhn/manager/contentmgmt/DependencyResolver.java @@ -37,6 +37,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -100,7 +101,7 @@ public DependencyResolutionResult resolveFilters(List filters) th .filter(f -> f instanceof ModuleFilter) .map(ModuleFilter.class::cast) .filter(f -> FilterCriteria.Matcher.EQUALS.equals(f.getCriteria().getMatcher())) - .toList(); + .collect(toList()); if (isModulesDisabled(filters) && !moduleFilters.isEmpty()) { throw new DependencyResolutionException("Modularity is disabled.", new ModularityDisabledException()); @@ -135,7 +136,7 @@ else if (!moduleFilters.isEmpty()) { private DependencyResolutionResult resolveModularDependencies(List filters) throws DependencyResolutionException { List sources = this.getActiveSources(); - List modules = filters.stream().map(ModuleFilter::getModule).toList(); + List modules = filters.stream().map(ModuleFilter::getModule).collect(toList()); ModulePackagesResponse modPkgList; try { modPkgList = modulemdApi.getPackagesForModules(sources, modules); @@ -144,7 +145,7 @@ private DependencyResolutionResult resolveModularDependencies(List throw new DependencyResolutionException("Failed to resolve modular dependencies.", e); } - List resolvedModules = modPkgList.getSelected().stream().map(Module::new).toList(); + List resolvedModules = modPkgList.getSelected().stream().map(Module::new).collect(Collectors.toList()); // 1. Modular packages to be denied PackageFilter pkgDenyFilter = new ModularPackageFilter(); @@ -201,7 +202,7 @@ private List getActiveSources() { .filter(Optional::isPresent) .map(s -> s.get().getChannel()) .filter(Channel::isModular) - .toList(); + .collect(toList()); } } diff --git a/java/code/src/com/redhat/rhn/manager/contentmgmt/test/ContentManagerChannelAlignmentTest.java b/java/code/src/com/redhat/rhn/manager/contentmgmt/test/ContentManagerChannelAlignmentTest.java index c0513dbf0323..e69efa6cc79b 100644 --- a/java/code/src/com/redhat/rhn/manager/contentmgmt/test/ContentManagerChannelAlignmentTest.java +++ b/java/code/src/com/redhat/rhn/manager/contentmgmt/test/ContentManagerChannelAlignmentTest.java @@ -70,6 +70,7 @@ import java.util.Date; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; /** * Test for the content-management related methods in {@link ChannelManager} @@ -195,7 +196,7 @@ public void testNewestPackagesCacheRefreshedWithFilter() { contentManager.alignEnvironmentTargetSync(Arrays.asList(filter, filter2), srcChannel, tgtChannel, user); List ids = ChannelManager.latestPackagesInChannel(tgtChannel).stream() .map(p -> (Long) p.get("id")) - .toList(); + .collect(Collectors.toList()); assertEquals(2, ids.size()); assertContains(ids, pack4.getId()); assertContains(ids, pack5.getId()); diff --git a/java/code/src/com/redhat/rhn/manager/contentmgmt/test/MockModulemdApi.java b/java/code/src/com/redhat/rhn/manager/contentmgmt/test/MockModulemdApi.java index 545b12e91311..1a34037c5cdb 100644 --- a/java/code/src/com/redhat/rhn/manager/contentmgmt/test/MockModulemdApi.java +++ b/java/code/src/com/redhat/rhn/manager/contentmgmt/test/MockModulemdApi.java @@ -101,7 +101,7 @@ public ModulePackagesResponse getPackagesForModules(List sources, List< return new ModulePackagesResponse(getRpmApis(selectedModules), getPackages(selectedModules), selectedModules.stream() .map(m -> new ModuleInfo(m.getName(), m.getStream(), "1000000001", "6789abcd", "x86_64")) - .toList() + .collect(Collectors.toList()) ); } @@ -233,7 +233,7 @@ private static List doGetAllPackages() throws ModuleNotFoundException { } private static List getMetadataPaths(List sources) throws RepositoryNotModularException { - return sources.stream().map(MockModulemdApi::getMetadataPath).toList(); + return sources.stream().map(MockModulemdApi::getMetadataPath).collect(Collectors.toList()); } private static String getMetadataPath(Channel channel) throws RepositoryNotModularException { diff --git a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java index c64e6d11edc2..97cfadafb7a4 100644 --- a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java +++ b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java @@ -825,7 +825,7 @@ public static List removeIncompatibleTargets(Optional missing = missingAddonSuccessors.stream().map(SUSEProduct::getFriendlyName) - .toList(); + .collect(Collectors.toList()); if (LOG.isWarnEnabled()) { LOG.warn("No migration target found for '{}'. Skipping", String.join(", ", missing)); } diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java index 6ee136fee068..12831ffe4e6e 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -311,7 +311,7 @@ public static void truncateErrata(Set srcErrata, Channel tgtChannel, Use List emptyChannelErrata = filteredErrata.stream() .filter(t -> t.getChannels().isEmpty()) .map(OwnedErrata::new) - .toList(); + .collect(Collectors.toList()); ErrataManager.deleteErrata(user, emptyChannelErrata); } @@ -1295,7 +1295,7 @@ public static void removeErratumAndPackagesFromChannel(Set excludedErrat p -> includedErrata.stream().noneMatch(included -> included.getPackages().contains(p)) ) ).collect(Collectors.toUnmodifiableSet()); - List pids = packagesToRemove.stream().map(Package::getId).toList(); + List pids = packagesToRemove.stream().map(Package::getId).collect(Collectors.toList()); ErrataCacheManager.deleteCacheEntriesForChannelPackages(chan.getId(), pids); // remove packages @@ -1493,7 +1493,7 @@ public static void clearErrataNotifications(Errata e) { public static void bulkErrataNotification(Map> errataToChannels, Date date) { List> eidList = errataToChannels.entrySet().stream() .map(entry -> Collections.singletonMap("eid", (Object)entry.getKey())) - .toList(); + .collect(Collectors.toList()); WriteMode m = ModeFactory.getWriteMode(ERRATA_QUERIES, "clear_errata_notification"); m.executeUpdates(eidList); @@ -1507,7 +1507,7 @@ public static void bulkErrataNotification(Map> errataToChannels params.put("datetime", newDate); return params; }) - .toList(); + .collect(Collectors.toList()); WriteMode w = ModeFactory.getWriteMode(ERRATA_QUERIES, "insert_errata_notification"); w.executeUpdates(notifyList); @@ -1790,7 +1790,7 @@ private static List scheduleErrataActions(User scheduler, Org org, Date ea List retracted = errataList.stream() .filter(e -> e.getAdvisoryStatus() == AdvisoryStatus.RETRACTED) - .collect(toList()); + .toList(); if (!retracted.isEmpty()) { throw new RetractedErrataException(retracted.stream().map(Errata::getId).collect(toList())); } @@ -1898,12 +1898,11 @@ private static List scheduleErrataActions(User scheduler, Org org, Date ea actionChain, errataMap, updateStackMap, serverMap, minionTargets); // store all actions and return ids List actionIds = new ArrayList<>(); - List traditionalErrataActions = + Stream traditionalErrataActions = concat(nonZypperTradClientActions, concat(updateStackActions, - nonUpdateStackActions)) - .collect(toList()); - traditionalErrataActions.stream().forEach(ea-> { + nonUpdateStackActions)); + traditionalErrataActions.forEach(ea-> { ActionPackageDetails details = ea.getDetails(); details.setAllowVendorChange(allowVendorChange); ea.setDetails(details); @@ -1911,9 +1910,8 @@ private static List scheduleErrataActions(User scheduler, Org org, Date ea actionIds.add(action.getId()); }); - List minionErrataActions = minionActions.collect(toList()); List minionTaskoActions = new ArrayList<>(); - minionErrataActions.stream().forEach(ea-> { + minionActions.forEach(ea-> { ActionPackageDetails details = ea.getDetails(); details.setAllowVendorChange(allowVendorChange); ea.setDetails(details); diff --git a/java/code/src/com/redhat/rhn/manager/formula/FormulaManager.java b/java/code/src/com/redhat/rhn/manager/formula/FormulaManager.java index 1ac841d86f81..5cc45519dad5 100644 --- a/java/code/src/com/redhat/rhn/manager/formula/FormulaManager.java +++ b/java/code/src/com/redhat/rhn/manager/formula/FormulaManager.java @@ -87,7 +87,7 @@ public void saveGroupFormulaData(User user, Long groupId, String formulaName, Ma FormulaFactory.saveGroupFormulaData(content, group, formulaName); List minionIds = group.getServers().stream() .flatMap(s -> Opt.stream(s.asMinionServer())) - .map(MinionServer::getMinionId).toList(); + .map(MinionServer::getMinionId).collect(Collectors.toList()); saltApi.refreshPillar(new MinionList(minionIds)); } @@ -340,7 +340,7 @@ public List getCombinedFormulaDataForSystems(User user, List return minions.stream().map(minion -> getCombinedFormulaDataForSystem(minion, Optional.ofNullable(managedGroupsPerServer.get(minion.getId())), groupsFormulaData, formulaName)) - .toList(); + .collect(Collectors.toList()); } private FormulaData getCombinedFormulaDataForSystem(MinionServer minion, @@ -419,6 +419,6 @@ public List listEndpoints(List systemIDs) { getCombinedFormulaDataForSystemAndFormula(minion, Optional.ofNullable(managedGroupsPerServer.get(minion.getId())), groupsFormulaData, formulaName)).stream()) - ).toList(); + ).collect(Collectors.toList()); } } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java index 1a379c7eb3ee..5b90388b5166 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java @@ -32,6 +32,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * KickstartLocaleCommand - for editing locale-related options @@ -123,7 +124,7 @@ public List> getValidTimezones() { row.put("display", dto.getName()); row.put("value", dto.getLabel()); return row; - }).toList(); + }).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/manager/satellite/UpgradeCommand.java b/java/code/src/com/redhat/rhn/manager/satellite/UpgradeCommand.java index 1f6c9c0b02c3..89212bb4bab5 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/UpgradeCommand.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/UpgradeCommand.java @@ -362,7 +362,7 @@ private void refreshVirtHostPillar() { .filter(Server::hasVirtualizationEntitlement) .toList(); virtHosts.forEach(MinionPillarManager.INSTANCE::generatePillar); - List minionIds = virtHosts.stream().map(MinionServer::getMinionId).toList(); + List minionIds = virtHosts.stream().map(MinionServer::getMinionId).collect(Collectors.toList()); GlobalInstanceHolder.SALT_API.refreshPillar(new MinionList(minionIds)); log.warn("Refreshed virtualization hosts pillar"); } @@ -378,7 +378,7 @@ private void refreshAllSystemsPillar() { try { List hosts = MinionServerFactory.listMinions(); hosts.forEach(MinionPillarManager.INSTANCE::generatePillar); - List minionIds = hosts.stream().map(MinionServer::getMinionId).toList(); + List minionIds = hosts.stream().map(MinionServer::getMinionId).collect(Collectors.toList()); GlobalInstanceHolder.SALT_API.refreshPillar(new MinionList(minionIds)); log.info("Refreshed hosts pillar"); } @@ -400,7 +400,7 @@ private void convertSystemThresholdFromConfig() { private void allSystemsSyncAll() { try { List minionIds = MinionServerFactory.listMinions() - .stream().map(MinionServer::getMinionId).toList(); + .stream().map(MinionServer::getMinionId).collect(Collectors.toList()); GlobalInstanceHolder.SALT_API.syncAllAsync(new MinionList(minionIds)); log.info("Sync all scheduled on all systems"); } diff --git a/java/code/src/com/redhat/rhn/manager/setup/MirrorCredentialsManager.java b/java/code/src/com/redhat/rhn/manager/setup/MirrorCredentialsManager.java index 187ccd4af1ea..741f562c92c1 100644 --- a/java/code/src/com/redhat/rhn/manager/setup/MirrorCredentialsManager.java +++ b/java/code/src/com/redhat/rhn/manager/setup/MirrorCredentialsManager.java @@ -94,7 +94,7 @@ public List findMirrorCredentials() { Comparator.comparing(MirrorCredentialsDto::isPrimary).reversed() .thenComparing(MirrorCredentialsDto::getId) ) - .toList(); + .collect(Collectors.toList()); if (log.isDebugEnabled()) { log.debug("Found {} mirror credentials", credsList.size()); } diff --git a/java/code/src/com/redhat/rhn/manager/setup/ProductSyncManager.java b/java/code/src/com/redhat/rhn/manager/setup/ProductSyncManager.java index b5551c3487bf..9332b1341052 100644 --- a/java/code/src/com/redhat/rhn/manager/setup/ProductSyncManager.java +++ b/java/code/src/com/redhat/rhn/manager/setup/ProductSyncManager.java @@ -106,7 +106,7 @@ public Map> addProducts(List produ // Ident are in the form 'product_id-label'. If the product id is negative, the ident starts with a minus, // so we need to skip the first character when performing the indexOf id -> Long.valueOf(id.substring(0, id.indexOf('-', 1))) - ).toList(); + ).collect(Collectors.toList()); // Retrieve the tree structure final Map productTreeMap = @@ -428,10 +428,10 @@ private SetupWizardProductDto convertProduct(final MgrSyncProductDto productIn) List mandatoryChannelsOut = collect.get(true).stream() // Add base channel on top of everything else so it can be added first. .sorted((a, b) -> StringUtils.isBlank(a.getParentLabel()) ? -1 : - StringUtils.isBlank(b.getParentLabel()) ? 1 : 0).map(mapping).toList(); + StringUtils.isBlank(b.getParentLabel()) ? 1 : 0).map(mapping).collect(Collectors.toList()); List optionalChannelsOut = collect.get(false).stream() - .map(mapping).toList(); + .map(mapping).collect(Collectors.toList()); // Setup the product that will be displayed SetupWizardProductDto displayProduct = new SetupWizardProductDto( diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java index 8818c93bb63f..aa764e289e7f 100644 --- a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java +++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java @@ -156,7 +156,7 @@ public static List findServersInSetByChannel(User user, Long baseChannel List serverIds = ServerFactory.findServersInSetByChannel(user, baseChannelId); return serverIds.stream() .map(ServerFactory::lookupById) - .toList(); + .collect(Collectors.toList()); } /** @@ -215,7 +215,7 @@ private static List scheduleChannelChanges(User ) ).flatMap(Function.identity()); - return Stream.concat(succededResults, erroredResults).toList(); + return Stream.concat(succededResults, erroredResults).collect(Collectors.toList()); } private static Stream handleChannelChangesForSystemsWithNoBaseChannel( diff --git a/java/code/src/com/redhat/rhn/manager/system/CancelKickstartSessionOperation.java b/java/code/src/com/redhat/rhn/manager/system/CancelKickstartSessionOperation.java index 18b63bf57c1d..e561041be76e 100644 --- a/java/code/src/com/redhat/rhn/manager/system/CancelKickstartSessionOperation.java +++ b/java/code/src/com/redhat/rhn/manager/system/CancelKickstartSessionOperation.java @@ -29,6 +29,7 @@ import com.redhat.rhn.taskomatic.TaskomaticApiException; import java.util.List; +import java.util.stream.Collectors; /** * DeleteSystemFromActionOperation - deletes a system from an action @@ -69,7 +70,7 @@ public ValidatorError store() { String rebootName = ActionFactory.TYPE_KICKSTART_INITIATE.getName(); List actions = pendingActions.stream().filter(action -> action.getActionName().equals(rebootName)) .map(action -> ActionManager.lookupAction(user, action.getId())) - .toList(); + .collect(Collectors.toList()); try { ActionManager.cancelActions(user, actions, List.of(server.getId())); } diff --git a/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java b/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java index adcf49812411..f6f4a043e7e3 100644 --- a/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java @@ -358,7 +358,7 @@ public void updatePillarAfterGroupUpdateForServers(Collection servers) { // Trigger pillar refresh List minionIds = servers.stream() .flatMap(s -> Opt.stream(s.asMinionServer())) - .map(MinionServer::getMinionId).toList(); + .map(MinionServer::getMinionId).collect(Collectors.toList()); saltApi.refreshPillar(new MinionList(minionIds)); } diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index 8b2535c01f8e..b3614ad72fc6 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -167,6 +167,7 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; /** @@ -225,7 +226,7 @@ public List retrieveSystemGroupsForSystemsWithEntitlementAndUse List systemIDInfos = this.serverFactory.lookupSystemsVisibleToUserWithEntitlement(user, entitlement); - List systemIDs = systemIDInfos.stream().map(SystemIDInfo::getSystemID).toList(); + List systemIDs = systemIDInfos.stream().map(SystemIDInfo::getSystemID).collect(Collectors.toList()); Map> managedGroupsPerServer = this.serverGroupFactory.lookupManagedSystemGroupsForSystems(systemIDs); @@ -233,7 +234,7 @@ public List retrieveSystemGroupsForSystemsWithEntitlementAndUse return systemIDInfos.stream() .map(s -> new SystemGroupsDTO(s.getSystemID(), managedGroupsPerServer.getOrDefault(s.getSystemID(), new ArrayList<>()))) - .toList(); + .collect(Collectors.toList()); } /** @@ -245,7 +246,7 @@ public static void snapshotServers(Collection servers, String reason) { if (!Config.get().getBoolean(ConfigDefaults.TAKE_SNAPSHOTS)) { return; } - List serverIds = servers.stream().map(Server::getId).toList(); + List serverIds = servers.stream().map(Server::getId).collect(Collectors.toList()); List snapshottableServerIds = filterServerIdsWithFeature(serverIds, "ftr_snapshotting"); // If the server is null or doesn't have the snapshotting feature, don't bother. @@ -502,11 +503,11 @@ public MinionServer createSystemProfile(User creator, String systemName, Map hwAddrs = hwAddress.map(Collections::singleton).orElse(emptySet()); List matchingProfiles = findMatchingEmptyProfiles(hostname, hwAddrs); if (!matchingProfiles.isEmpty()) { - throw new SystemsExistException(matchingProfiles.stream().map(Server::getId).toList()); + throw new SystemsExistException(matchingProfiles.stream().map(Server::getId).collect(Collectors.toList())); } String uniqueId = SystemManagerUtils.createUniqueId( - Arrays.asList(hwAddress, hostname).stream().flatMap(Opt::stream).toList()); + Stream.of(hwAddress, hostname).flatMap(Opt::stream).collect(Collectors.toList())); MinionServer server = new MinionServer(); server.setName(systemName); @@ -1702,7 +1703,7 @@ public static List filterServerIdsWithFeature(List sids, String feat params.put("feature", feat); DataResult> result = m.execute(params, sids); - return result.stream().map(Map::values).flatMap(Collection::stream).toList(); + return result.stream().map(Map::values).flatMap(Collection::stream).collect(Collectors.toList()); } /** @@ -2919,7 +2920,7 @@ public static List listSystemIds() { SelectMode mode = ModeFactory.getMode("System_queries", "system_ids"); Map params = new HashMap<>(); DataResult> dr = mode.execute(params); - return dr.stream().map(data -> (Long)data.get("id")).toList(); + return dr.stream().map(data -> (Long)data.get("id")).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java b/java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java index 92e380183a38..227332c96449 100644 --- a/java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java @@ -76,6 +76,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; /** JUnit test case for the User * class. @@ -570,7 +571,7 @@ public void testLookupTimeZoneAll() { Set validTimezones = ZoneId.getAvailableZoneIds(); assertTrue(lst.stream().filter(timezone -> !validTimezones.contains(timezone.getOlsonName())) - .toList() + .collect(Collectors.toList()) .isEmpty()); assertEquals(UserManager.getTimeZone("GMT"), lst.get(0)); diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java b/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java index 325a2361aac2..05488db6c114 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java +++ b/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java @@ -682,7 +682,7 @@ public void scheduleStagingJobs(Map> actionData) params.put("staging_job_minion_server_id", Long.toString(minionData.getKey())); params.put("earliest_action", minionData.getValue().toInstant().toString()); return params; - })).toList(); + })).collect(Collectors.toList()); invoke("tasko.scheduleRuns", MINION_ACTION_BUNCH_LABEL, MINION_ACTION_JOB_DOWNLOAD_PREFIX, paramList); } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/AutoErrataTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/AutoErrataTask.java index 6a300683b4ac..24971bb5ab04 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/AutoErrataTask.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/AutoErrataTask.java @@ -111,7 +111,7 @@ protected List getAutoErrataSystems() { SelectMode select = ModeFactory.getMode(TaskConstants.MODE_NAME, TaskConstants.TASK_QUERY_AUTO_ERRATA_SYSTEMS); List> results = select.execute(); - return results.stream().map(system -> system.get("id")).toList(); + return results.stream().map(system -> system.get("id")).collect(Collectors.toList()); } /** @@ -125,7 +125,7 @@ protected List filterSystemsInMaintenanceMode(List systems) { return ServerFactory.lookupByIds(systems).stream() .filter(mm::isSystemInMaintenanceMode) .map(Server::getId) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/HubReportDbUpdateWorker.java b/java/code/src/com/redhat/rhn/taskomatic/task/HubReportDbUpdateWorker.java index 38ea84d2cbff..3ae8a15c336b 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/HubReportDbUpdateWorker.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/HubReportDbUpdateWorker.java @@ -40,6 +40,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; public class HubReportDbUpdateWorker implements QueueWorker { @@ -101,7 +102,7 @@ private List filterExistingTables(Session remoteSession, Long serverId) return false; }); - return tableEntry.stream().map(t -> String.valueOf(t.getValue())).toList(); + return tableEntry.stream().map(t -> String.valueOf(t.getValue())).collect(Collectors.toList()); } private void updateRemoteData(Session remoteSession, Session localSession, String tableName, long mgmId) { diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/MinionActionChainExecutor.java b/java/code/src/com/redhat/rhn/taskomatic/task/MinionActionChainExecutor.java index e0c341784760..bcf3d330dd54 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/MinionActionChainExecutor.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/MinionActionChainExecutor.java @@ -125,7 +125,7 @@ public void execute(JobExecutionContext context) { .stream() .map(ActionChainEntry::getActionId) .filter(Objects::nonNull) - .toList(); + .collect(Collectors.toList()); ActionFactory.rejectScheduledActions(actionsId, LOCALIZATION.getMessage("task.action.rejection.reason", MAXIMUM_TIMEDELTA_FOR_SCHEDULED_ACTIONS)); @@ -139,7 +139,7 @@ public void execute(JobExecutionContext context) { .stream() .map(ActionChainEntry::getActionId) .filter(Objects::nonNull) - .toList(); + .collect(Collectors.toList()); ActionFactory.rejectScheduledActions(actionsId, LOCALIZATION.getMessage("task.action.rejection.notcompliant")); return; @@ -159,7 +159,7 @@ public void execute(JobExecutionContext context) { .stream() .map(ActionChainEntry::getActionId) .filter(Objects::nonNull) - .toList(); + .collect(Collectors.toList()); Set nonCompliantByosMinions = actionChain.getEntries() .stream() diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/MinionCheckin.java b/java/code/src/com/redhat/rhn/taskomatic/task/MinionCheckin.java index 97e9f1bc8160..f765f0fab5a5 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/MinionCheckin.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/MinionCheckin.java @@ -24,6 +24,7 @@ import org.quartz.JobExecutionContext; import java.util.List; +import java.util.stream.Collectors; /** @@ -65,7 +66,7 @@ private List findCheckinCandidatesIds() { TaskConstants.TASK_QUERY_MINION_CHECKIN_FIND_CHECKIN_CANDIDATES); List checkinCandidates = candidatesResolver.getCheckinCandidates(); - return checkinCandidates.stream().map(SystemSummary::getMinionId).toList(); + return checkinCandidates.stream().map(SystemSummary::getMinionId).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/ModularDataCleanup.java b/java/code/src/com/redhat/rhn/taskomatic/task/ModularDataCleanup.java index 9cd0c9320a56..1f9f11eb1fb4 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/ModularDataCleanup.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/ModularDataCleanup.java @@ -69,7 +69,7 @@ public void execute(JobExecutionContext jobExecutionContext) { .stream() .map(File::toPath) .filter(path -> !usedModularDataAbsolutePaths.contains(path)) - .toList(); + .collect(Collectors.toList()); logCleaning(unusedModularPaths); unusedModularPaths.forEach(path -> path.toFile().delete()); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RecurringActionJob.java b/java/code/src/com/redhat/rhn/taskomatic/task/RecurringActionJob.java index c860c6e3210a..4af4cc73577e 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/RecurringActionJob.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/RecurringActionJob.java @@ -37,6 +37,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; /** * Used to schedule actions from Recurring action schedules @@ -89,7 +90,7 @@ else if (actionType instanceof RecurringState stateType) { List mods = configs.stream() .sorted(Comparator.comparingLong(RecurringStateConfig::getPosition)) .map(RecurringStateConfig::getStateName) - .toList(); + .collect(Collectors.toList()); Action a = ActionManager.scheduleApplyStates(action.getCreator(), minionIds, mods, Optional.of(Map.of("rec_id", action.getId().toString())), diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/ReportDBHelper.java b/java/code/src/com/redhat/rhn/taskomatic/task/ReportDBHelper.java index aad675675f38..2172060989b7 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/ReportDBHelper.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/ReportDBHelper.java @@ -111,7 +111,7 @@ private String getOrderColumns(Session session, String table, Logger log) { */ public SelectMode generateExistingTables(Session session, List tables) { List selectContent = - tables.stream().map(t -> "to_regclass('" + t + "') AS " + t).toList(); + tables.stream().map(t -> "to_regclass('" + t + "') AS " + t).collect(Collectors.toList()); final String sqlStatement = "SELECT " + String.join(",", selectContent); return new GeneratedSelectMode("exists.reportdbtables" , session, sqlStatement, Collections.emptyList()); } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/TokenCleanup.java b/java/code/src/com/redhat/rhn/taskomatic/task/TokenCleanup.java index 3516177355ce..508af19062c5 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/TokenCleanup.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/TokenCleanup.java @@ -70,7 +70,7 @@ public void execute(JobExecutionContext arg0In) { } }); - List changedMinionIds = changedMinions.map(MinionServer::getMinionId).toList(); + List changedMinionIds = changedMinions.map(MinionServer::getMinionId).collect(Collectors.toList()); if (Config.get().getBoolean(ConfigDefaults.TOKEN_REFRESH_AUTO_DEPLOY)) { saltApi.deployChannels(changedMinionIds); } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygUpdateAuthTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygUpdateAuthTask.java index 3592ba781708..58f51845f228 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygUpdateAuthTask.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygUpdateAuthTask.java @@ -43,6 +43,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; public class PaygUpdateAuthTask extends RhnJavaJob { @@ -94,7 +95,7 @@ public void execute(JobExecutionContext jobExecutionContext) { List paygSshData; if (jobExecutionContext != null && jobExecutionContext.getJobDetail().getJobDataMap().containsKey(KEY_ID)) { int sshId = Integer.parseInt((String) jobExecutionContext.getJobDetail().getJobDataMap().get(KEY_ID)); - paygSshData = PaygSshDataFactory.lookupById(sshId).stream().toList(); + paygSshData = PaygSshDataFactory.lookupById(sshId).stream().collect(Collectors.toList()); } else { paygSshData = PaygSshDataFactory.lookupPaygSshData(); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebRepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebRepositoryWriter.java index 32a6d76b2b8f..fd8334ff47f9 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebRepositoryWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebRepositoryWriter.java @@ -33,6 +33,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import java.util.zip.GZIPOutputStream; /** @@ -169,7 +170,7 @@ public void writeRepomdFiles(Channel channel) { private void loadExtraTags(DataResult packageBatch) { List pkgIds = packageBatch.stream() .map(PackageDto::getId) - .toList(); + .collect(Collectors.toList()); Map> extraTags = TaskManager.getChannelPackageExtraTags(pkgIds); packageBatch.stream().forEach(pkgDto -> pkgDto.setExtraTags(extraTags.get(pkgDto.getId()))); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/test/ReportDbUpdateTaskTest.java b/java/code/src/com/redhat/rhn/taskomatic/task/test/ReportDbUpdateTaskTest.java index be8eb3dfe99a..788337f8e0f6 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/test/ReportDbUpdateTaskTest.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/test/ReportDbUpdateTaskTest.java @@ -47,6 +47,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import java.util.stream.IntStream; import javax.persistence.Tuple; @@ -101,7 +102,7 @@ public void canSyncTablesUsingAQueryById() throws Exception { // Create some packages and add them to the channel List packages = IntStream.range(1, 10) .mapToObj(index -> PackageTest.createTestPackage(user.getOrg())) - .toList(); + .collect(Collectors.toList()); channel.getPackages().addAll(packages); @@ -109,7 +110,7 @@ public void canSyncTablesUsingAQueryById() throws Exception { List updatedPackages = packages.stream() .map(originalPackage -> PackageTestUtils.newVersionOfPackage(originalPackage, null, "2.0.0", null, user.getOrg())) - .toList(); + .collect(Collectors.toList()); channel.getPackages().addAll(updatedPackages); updatablePackagesMap.put(server.getId(), updatedPackages); @@ -140,7 +141,7 @@ public void canSyncTablesUsingAQueryById() throws Exception { List updatablePackagesForServer = updatablePackagesMap.get(testServer.getId()).stream() .sorted(Comparator.comparing(pck -> pck.getId())) - .toList(); + .collect(Collectors.toList()); assertFalse(CollectionUtils.isEmpty(updatablePackagesForServer), "The updatable packages reference list should not be empty"); diff --git a/java/code/src/com/suse/manager/api/RouteFactory.java b/java/code/src/com/suse/manager/api/RouteFactory.java index 9257e7554ad5..94c3153bb3b8 100644 --- a/java/code/src/com/suse/manager/api/RouteFactory.java +++ b/java/code/src/com/suse/manager/api/RouteFactory.java @@ -103,7 +103,7 @@ public RouteFactory(SerializerFactory serializerFactoryIn) { return Collectors.collectingAndThen( Collectors.toList(), list -> { - list = list.stream().filter(Objects::nonNull).toList(); + list = list.stream().filter(Objects::nonNull).collect(Collectors.toList()); if (list.size() > 1) { throw new IllegalStateException("Multiple items found."); } diff --git a/java/code/src/com/suse/manager/api/test/TestHandler.java b/java/code/src/com/suse/manager/api/test/TestHandler.java index a51069a51da7..08d8f7bb9502 100644 --- a/java/code/src/com/suse/manager/api/test/TestHandler.java +++ b/java/code/src/com/suse/manager/api/test/TestHandler.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; /** * API handler with multiple methods for unit testing @@ -95,7 +96,7 @@ public Object[] sortIntegerList(List myList) { * @return the sorted list of longs */ public List sortLongList(List myList) { - return myList.stream().sorted().toList(); + return myList.stream().sorted().collect(Collectors.toList()); } /** @@ -104,7 +105,7 @@ public List sortLongList(List myList) { * @return the sorted list of strings */ public List sortStringList(List myList) { - return myList.stream().sorted().toList(); + return myList.stream().sorted().collect(Collectors.toList()); } /** @@ -150,7 +151,7 @@ public Set mapKeysToSet(Map myMap, Integer numKeys) { */ @ReadOnly public List listOfMaps(List> myList) { - return myList.stream().flatMap(m -> m.values().stream()).toList(); + return myList.stream().flatMap(m -> m.values().stream()).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/suse/manager/maintenance/MaintenanceManager.java b/java/code/src/com/suse/manager/maintenance/MaintenanceManager.java index 0448e7e46ac0..137eeb414cde 100644 --- a/java/code/src/com/suse/manager/maintenance/MaintenanceManager.java +++ b/java/code/src/com/suse/manager/maintenance/MaintenanceManager.java @@ -851,7 +851,7 @@ public List systemIdsMaintenanceMode(List minions) { List logList = minions.stream() .filter(m -> !minionsInMaintMode.contains(m.getId())) - .toList(); + .collect(Collectors.toList()); logSkippedMinions(logList); return minionsInMaintMode; diff --git a/java/code/src/com/suse/manager/maintenance/rescheduling/CancelRescheduleStrategy.java b/java/code/src/com/suse/manager/maintenance/rescheduling/CancelRescheduleStrategy.java index 2de774c38da8..a1938543d9e8 100644 --- a/java/code/src/com/suse/manager/maintenance/rescheduling/CancelRescheduleStrategy.java +++ b/java/code/src/com/suse/manager/maintenance/rescheduling/CancelRescheduleStrategy.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * CancelRescheduleStrategy - Cancel the action for the system @@ -48,7 +49,7 @@ public RescheduleResult reschedule(User user, Map> actionsS for (Action action: actionsServers.keySet()) { List serverIds = actionsServers.get(action).stream() .map(Server::getId) - .toList(); + .collect(Collectors.toList()); ActionManager.cancelActions(user, Collections.singletonList(action), serverIds); LOG.info("Cancel action '{}' for servers '{}'", action, serverIds); } diff --git a/java/code/src/com/suse/manager/maintenance/test/IcalUtilsTest.java b/java/code/src/com/suse/manager/maintenance/test/IcalUtilsTest.java index 35215432489b..0cecdc9d66a2 100644 --- a/java/code/src/com/suse/manager/maintenance/test/IcalUtilsTest.java +++ b/java/code/src/com/suse/manager/maintenance/test/IcalUtilsTest.java @@ -35,6 +35,7 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.List; +import java.util.stream.Collectors; import net.fortuna.ical4j.model.Calendar; @@ -68,10 +69,10 @@ public void testSameMomentDifferentTimezones() { ZonedDateTime tokyoStart = ZonedDateTime.parse("2020-06-09T21:00:00+09:00"); // Japan (same moment in time!) List> listNewYork = icalUtils.calculateUpcomingPeriods(multiZonesCal, empty(), - newYorkStart.toInstant(), 5).toList(); + newYorkStart.toInstant(), 5).collect(Collectors.toList()); List> listTokyo = icalUtils.calculateUpcomingPeriods(multiZonesCal, empty(), - tokyoStart.toInstant(), 5).toList(); + tokyoStart.toInstant(), 5).collect(Collectors.toList()); assertEquals(listNewYork, listTokyo); } @@ -88,12 +89,12 @@ public void testSameLocalTimeAhead() { ZonedDateTime newYorkStart = ZonedDateTime.parse("2020-06-08T02:00:00-04:00"); // NY List> listNewYork = icalUtils.calculateUpcomingPeriods(multiZonesCal, empty(), - newYorkStart.toInstant(), 5).toList(); + newYorkStart.toInstant(), 5).collect(Collectors.toList()); // Sri Lanka is ahead of NYC, so at 11:00 in Sri Lanka, we still see maint. windows starting at 2:00 in NY ZonedDateTime sriLankaAlike = ZonedDateTime.parse("2020-06-08T11:00:00+05:30"); List> listSriLanka = icalUtils.calculateUpcomingPeriods(multiZonesCal, empty(), - sriLankaAlike.toInstant(), 5).toList(); + sriLankaAlike.toInstant(), 5).collect(Collectors.toList()); assertEquals(listNewYork, listSriLanka); } @@ -116,9 +117,9 @@ public void testSameLocalTimeBehind() { // is already over and we shouldn't see it ZonedDateTime tahitiLike = ZonedDateTime.parse("2020-06-08T08:00:00-10:00"); List> listTahiti = icalUtils.calculateUpcomingPeriods(multiZonesCal, empty(), - tahitiLike.toInstant(), 4).toList(); + tahitiLike.toInstant(), 4).collect(Collectors.toList()); - List> newYorkButFirst = listNewYork.stream().skip(1).toList(); + List> newYorkButFirst = listNewYork.stream().skip(1).collect(Collectors.toList()); // the Tahitian windows should match the NYC ones minus the first one assertEquals(newYorkButFirst, listTahiti); } @@ -135,12 +136,12 @@ public void testMultiScheduleFiltering() { List> nycEvents = icalUtils.calculateUpcomingPeriods( multiZonesCal, of("Maint. windows - NYC - weekdays"), datetime.toInstant(), 3) .map(pair -> Pair.of(formatNY(pair.getLeft()), formatNY((pair.getRight())))) - .toList(); + .collect(Collectors.toList()); List> sriLankaEvts = icalUtils.calculateUpcomingPeriods( multiZonesCal, of("Maint. windows-Sri Lanka"), datetime.toInstant(), 3) .map(pair -> Pair.of(formatSriLanka(pair.getLeft()), formatSriLanka((pair.getRight())))) - .toList(); + .collect(Collectors.toList()); List> listNoEvts = icalUtils.calculateUpcomingPeriods( multiZonesCal, of("There is no window, only zuul"), datetime.toInstant(), 5) diff --git a/java/code/src/com/suse/manager/maintenance/test/MaintenanceManagerTest.java b/java/code/src/com/suse/manager/maintenance/test/MaintenanceManagerTest.java index ceecc363af32..ff4de57957d8 100644 --- a/java/code/src/com/suse/manager/maintenance/test/MaintenanceManagerTest.java +++ b/java/code/src/com/suse/manager/maintenance/test/MaintenanceManagerTest.java @@ -71,6 +71,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; import net.fortuna.ical4j.data.CalendarBuilder; import net.fortuna.ical4j.model.Calendar; @@ -624,7 +625,7 @@ public void testPreprocessCalendarData() throws Exception { event.getName(), Instant.ofEpochMilli(event.getFromMilliseconds()).toString(), Instant.ofEpochMilli(event.getToMilliseconds()).toString())) - .toList(); + .collect(Collectors.toList()); assertEquals(List.of( Triple.of("SAP Maintenance Window", "2020-04-27T06:00:00Z", "2020-04-27T08:00:00Z"), @@ -659,7 +660,7 @@ public void testPreprocessScheduleData() throws Exception { event.getName(), Instant.ofEpochMilli(event.getFromMilliseconds()).toString(), Instant.ofEpochMilli(event.getToMilliseconds()).toString())) - .toList(); + .collect(Collectors.toList()); assertEquals(List.of( Triple.of("SAP Maintenance Window", "2020-04-27T06:00:00Z", "2020-04-27T08:00:00Z"), @@ -678,7 +679,7 @@ public void testPreprocessScheduleData() throws Exception { event.getName(), Instant.ofEpochMilli(event.getFromMilliseconds()).toString(), Instant.ofEpochMilli(event.getToMilliseconds()).toString())) - .toList(); + .collect(Collectors.toList()); assertEquals(List.of( Triple.of("SAP Maintenance Window", "2020-04-27T06:00:00Z", "2020-04-27T08:00:00Z"), diff --git a/java/code/src/com/suse/manager/matcher/MatcherJsonIO.java b/java/code/src/com/suse/manager/matcher/MatcherJsonIO.java index b7bfc51b62ea..3ec4cc866d3d 100644 --- a/java/code/src/com/suse/manager/matcher/MatcherJsonIO.java +++ b/java/code/src/com/suse/manager/matcher/MatcherJsonIO.java @@ -206,7 +206,7 @@ public List getJsonSystems(String arch, boolean includeSelf, boolean }); return Stream.concat(systems, jsonSystemForSelf(arch, includeSelf, selfMonitoringEnabled)) - .toList(); + .collect(Collectors.toList()); } private static Set getVirtualGuests(Server system) { @@ -228,7 +228,7 @@ public List getJsonProducts() { p.getChannelFamily() != null ? p.getChannelFamily().getLabel() : "", p.isBase(), p.getFree())) - .toList(); + .collect(Collectors.toList()); } /** @@ -257,7 +257,7 @@ public List getJsonSubscriptions() { .collect(Collectors.toSet()) ); }) - .toList(); + .collect(Collectors.toList()); } /** @@ -269,7 +269,7 @@ public List getJsonMatches() { .createQuery("SELECT ps FROM PinnedSubscription ps", PinnedSubscription.class) .stream() .map(p -> new MatchJson(p.getSystemId(), p.getSubscriptionId(), null, null)) - .toList(); + .collect(Collectors.toList()); } /** @@ -314,7 +314,7 @@ public List getJsonVirtualizationGroups() { vhm.getServers().stream() .flatMap(s -> getVirtualGuests(s).stream()) .collect(Collectors.toSet()))) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/suse/manager/model/attestation/test/AttestationFactoryTest.java b/java/code/src/com/suse/manager/model/attestation/test/AttestationFactoryTest.java index 009b73a80620..c1efe6dfd836 100644 --- a/java/code/src/com/suse/manager/model/attestation/test/AttestationFactoryTest.java +++ b/java/code/src/com/suse/manager/model/attestation/test/AttestationFactoryTest.java @@ -45,6 +45,7 @@ import java.util.List; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; public class AttestationFactoryTest extends BaseTestCaseWithUser { @@ -138,7 +139,7 @@ public void testInitAttestationResults() { assertNotEmpty(results); List rTypeList = results.stream() .map(CoCoAttestationResult::getResultType) - .toList(); + .collect(Collectors.toList()); assertContains(rTypeList, CoCoResultType.SEV_SNP); assertContains(rTypeList, CoCoResultType.SECURE_BOOT); assertNotContains(rTypeList, CoCoResultType.NONE); diff --git a/java/code/src/com/suse/manager/reactor/PGEventStream.java b/java/code/src/com/suse/manager/reactor/PGEventStream.java index 5a00f21b2836..08eb1bceb287 100644 --- a/java/code/src/com/suse/manager/reactor/PGEventStream.java +++ b/java/code/src/com/suse/manager/reactor/PGEventStream.java @@ -51,6 +51,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.LongStream; import java.util.stream.Stream; @@ -76,7 +77,7 @@ public class PGEventStream extends AbstractEventStream implements PGNotification .namingPattern(i == 0 ? "salt-global-event-thread-%d" : String.format("salt-event-thread-%d", i)) .build() ) - ).toList(); + ).collect(Collectors.toList()); /** @@ -141,7 +142,7 @@ public void run() { List missingJobs = IntStream.range(0, allJobs.size()) .mapToObj(i -> executorServices.get(i).getActiveCount() > 0 ? 0 : allJobs.get(i)) - .toList(); + .collect(Collectors.toList()); if (missingJobs.stream().mapToLong(l -> l).sum() > 0) { LOG.warn("Found {} events without a job. Scheduling...", missingJobs); @@ -171,7 +172,7 @@ public void run() { public void notification(int processId, String channelName, String payload) { List counts = Arrays.stream(payload.split(",")) .map(Long::valueOf) - .toList(); + .collect(Collectors.toList()); notification(counts); } diff --git a/java/code/src/com/suse/manager/reactor/hardware/HardwareMapper.java b/java/code/src/com/suse/manager/reactor/hardware/HardwareMapper.java index a8f39f10f379..a3ce473b1c14 100644 --- a/java/code/src/com/suse/manager/reactor/hardware/HardwareMapper.java +++ b/java/code/src/com/suse/manager/reactor/hardware/HardwareMapper.java @@ -767,7 +767,7 @@ private void setFqdns(MinionServer serverIn, List fqdns) { else { Collection serverFQDNs = serverIn.getFqdns(); Collection srvFqdnsObj = fqdns.stream().map(fqdn -> new ServerFQDN(serverIn, fqdn)) - .toList(); + .collect(Collectors.toList()); serverFQDNs.retainAll(srvFqdnsObj); serverFQDNs.addAll(srvFqdnsObj); } diff --git a/java/code/src/com/suse/manager/reactor/messaging/JobReturnEventMessageAction.java b/java/code/src/com/suse/manager/reactor/messaging/JobReturnEventMessageAction.java index c051764d0d7e..af1bf53a2456 100644 --- a/java/code/src/com/suse/manager/reactor/messaging/JobReturnEventMessageAction.java +++ b/java/code/src/com/suse/manager/reactor/messaging/JobReturnEventMessageAction.java @@ -53,7 +53,6 @@ import java.util.Arrays; import java.util.Calendar; import java.util.Date; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Objects; @@ -61,6 +60,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; +import java.util.stream.Stream; /** @@ -109,13 +109,13 @@ public void execute(EventMessage msg) { // React according to the function the minion ran String function = jobReturnEvent.getData().getFun(); - List> functionArgs = new LinkedList<>(); + Stream> functionArgs = Stream.empty(); if (jobReturnEvent.getData().getFunArgs() instanceof List funArgs && !funArgs.isEmpty() && funArgs.get(0) instanceof Map) { - functionArgs = funArgs.stream().filter(x -> x instanceof Map).toList(); - } + functionArgs = funArgs.stream().filter(x -> x instanceof Map); + } - boolean isFunctionTestMode = functionArgs.stream() + boolean isFunctionTestMode = functionArgs .anyMatch(e -> e.containsKey("test") && Boolean.parseBoolean(e.get("test").toString())); if (Objects.isNull(function) && LOG.isDebugEnabled()) { diff --git a/java/code/src/com/suse/manager/saltboot/PXEEvent.java b/java/code/src/com/suse/manager/saltboot/PXEEvent.java index 731a001cee3b..3dff631b1554 100644 --- a/java/code/src/com/suse/manager/saltboot/PXEEvent.java +++ b/java/code/src/com/suse/manager/saltboot/PXEEvent.java @@ -26,6 +26,7 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; public class PXEEvent { private static final Logger LOG = LogManager.getLogger(PXEEvent.class); @@ -97,7 +98,7 @@ public List getHwAddresses() { return macGrains.entrySet().stream() .filter(e -> !e.getKey().equals("lo")) .map(e -> (String)e.getValue()) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/suse/manager/saltboot/SaltbootUtils.java b/java/code/src/com/suse/manager/saltboot/SaltbootUtils.java index ed5a196ef427..a2fb07149f88 100644 --- a/java/code/src/com/suse/manager/saltboot/SaltbootUtils.java +++ b/java/code/src/com/suse/manager/saltboot/SaltbootUtils.java @@ -40,6 +40,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.stream.Collectors; public class SaltbootUtils { private static final Logger LOG = LogManager.getLogger(SaltbootUtils.class); @@ -228,7 +229,7 @@ public static void createSaltbootSystem(String minionId, String bootImage, Strin Network k = new Network(con, hw); k.setMacAddress(hw); return k; - }).toList(); + }).collect(Collectors.toList()); system.setNetworkInterfaces(networks); system.enableNetboot(true); system.save(); diff --git a/java/code/src/com/suse/manager/utils/PagedSqlQueryBuilder.java b/java/code/src/com/suse/manager/utils/PagedSqlQueryBuilder.java index 6ada00cd8b2e..aefd755df2c9 100644 --- a/java/code/src/com/suse/manager/utils/PagedSqlQueryBuilder.java +++ b/java/code/src/com/suse/manager/utils/PagedSqlQueryBuilder.java @@ -35,6 +35,7 @@ import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; import java.util.stream.Stream; import javax.persistence.PersistenceException; @@ -378,7 +379,7 @@ private List createDTOs(List data, Class clazz) { LOG.error("Failed to create {} from SQL tuple", clazz.getName(), e); return null; } - }).toList(); + }).collect(Collectors.toList()); } catch (NoSuchMethodException e) { LOG.error("Cannot create {} objects from Tuple", clazz.getName()); diff --git a/java/code/src/com/suse/manager/utils/SaltUtils.java b/java/code/src/com/suse/manager/utils/SaltUtils.java index 7c24d43a3c9f..396d539bac2a 100644 --- a/java/code/src/com/suse/manager/utils/SaltUtils.java +++ b/java/code/src/com/suse/manager/utils/SaltUtils.java @@ -1617,7 +1617,7 @@ private static void updatePackages(MinionServer server, Collection unchanged = oldPackageMap.entrySet().stream().filter( e -> newPackageMap.containsKey(e.getKey()) - ).map(Map.Entry::getValue).toList(); + ).map(Map.Entry::getValue).collect(Collectors.toList()); packages.retainAll(unchanged); Map> packagesToAdd = newPackageMap.entrySet().stream().filter( @@ -1677,7 +1677,7 @@ private static List createPackagesFromSalt( return packageInfoAndNameBySaltPackageKey.entrySet().stream().map(e -> createInstalledPackage( packageNames.get(e.getValue().getA()), packageEvrsBySaltPackageKey.get(e.getKey()), e.getValue().getB(), server)) - .toList(); + .collect(Collectors.toList()); } /** @@ -1856,7 +1856,7 @@ private static void handleHardwareProfileUpdate(MinionServer server, result.getDnsFqdns().stream() ), result.getCustomFqdns().stream() - ).distinct().toList() + ).distinct().collect(Collectors.toList()) ); server.setPayg(result.getInstanceFlavor().map(o -> o.equals("PAYG")).orElse(false)); server.setContainerRuntime(result.getContainerRuntime()); diff --git a/java/code/src/com/suse/manager/webui/controllers/AnsibleController.java b/java/code/src/com/suse/manager/webui/controllers/AnsibleController.java index ec462354ca45..6c99ab48cccb 100644 --- a/java/code/src/com/suse/manager/webui/controllers/AnsibleController.java +++ b/java/code/src/com/suse/manager/webui/controllers/AnsibleController.java @@ -65,6 +65,7 @@ import java.util.Optional; import java.util.Set; import java.util.TimeZone; +import java.util.stream.Collectors; import spark.ModelAndView; import spark.Request; @@ -187,12 +188,12 @@ public static String listTypedPathsByMinion(Request req, Response res, User user if (pathType.equalsIgnoreCase(AnsiblePath.Type.PLAYBOOK.getLabel())) { paths = AnsibleManager.listAnsiblePlaybookPaths(minionServerId, user).stream() .map(AnsiblePathJson::new) - .toList(); + .collect(Collectors.toList()); } else { paths = AnsibleManager.listAnsibleInventoryPaths(minionServerId, user).stream() .map(AnsiblePathJson::new) - .toList(); + .collect(Collectors.toList()); } return result(res, success(paths), new TypeToken<>() { }); } @@ -209,7 +210,7 @@ public static String listAnsiblePathsByMinion(Request req, Response res, User us long minionServerId = Long.parseLong(req.params("minionServerId")); List paths = AnsibleManager.listAnsiblePaths(minionServerId, user).stream() .map(AnsiblePathJson::new) - .toList(); + .collect(Collectors.toList()); return result(res, success(paths), new TypeToken<>() { }); } diff --git a/java/code/src/com/suse/manager/webui/controllers/CVEAuditController.java b/java/code/src/com/suse/manager/webui/controllers/CVEAuditController.java index 1a6dd61c6500..8ecf54abafce 100644 --- a/java/code/src/com/suse/manager/webui/controllers/CVEAuditController.java +++ b/java/code/src/com/suse/manager/webui/controllers/CVEAuditController.java @@ -168,13 +168,13 @@ private static List handleRequest(CVEAuditRequest request, User .listSystemsByPatchStatus(user, request.cveIdentifier, request.statuses); return cveAuditServers.stream().map(x -> (CVEAuditSystem)x) - .toList(); + .collect(Collectors.toList()); case IMAGE: List cveAuditImages = CVEAuditManagerOVAL .listImagesByPatchStatus(user, request.cveIdentifier, request.statuses); return cveAuditImages.stream().map(x -> (CVEAuditSystem)x) - .toList(); + .collect(Collectors.toList()); default: throw new RuntimeException("unreachable"); } } @@ -198,7 +198,7 @@ public static Object cveAuditCSV(Request req, Response res, User user) { catch (IllegalArgumentException e) { return Stream.empty(); } - }).toList(); + }).collect(Collectors.toList()); List cveAuditSystems = Collections.emptyList(); if (!psList.isEmpty()) { EnumSet statuses = EnumSet.copyOf(psList); diff --git a/java/code/src/com/suse/manager/webui/controllers/ConfidentialComputingController.java b/java/code/src/com/suse/manager/webui/controllers/ConfidentialComputingController.java index b2d25b36d2a0..2025621a0cc0 100644 --- a/java/code/src/com/suse/manager/webui/controllers/ConfidentialComputingController.java +++ b/java/code/src/com/suse/manager/webui/controllers/ConfidentialComputingController.java @@ -38,6 +38,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.stream.Collectors; import spark.ModelAndView; import spark.Request; @@ -103,7 +104,7 @@ public String listAllAttestations(Request request, Response response, User user) List reportsJson = attestationManager.listCoCoAttestationReportsForUser(user, pc) .stream() .map(CoCoAttestationReportJson::new) - .toList(); + .collect(Collectors.toList()); return json(GSON, response, new PagedDataResultJson<>(reportsJson, totalSize, Collections.emptySet()), new TypeToken<>() { }); diff --git a/java/code/src/com/suse/manager/webui/controllers/FormulaController.java b/java/code/src/com/suse/manager/webui/controllers/FormulaController.java index 18014d832d78..7924e7b0db0a 100644 --- a/java/code/src/com/suse/manager/webui/controllers/FormulaController.java +++ b/java/code/src/com/suse/manager/webui/controllers/FormulaController.java @@ -57,6 +57,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import spark.ModelAndView; import spark.Request; @@ -240,7 +241,7 @@ public String saveFormula(Request request, Response response, User user) { FormulaFactory.saveGroupFormulaData(formData, group, formulaName); List minionIds = group.getServers().stream() .flatMap(s -> Opt.stream(s.asMinionServer())) - .map(MinionServer::getMinionId).toList(); + .map(MinionServer::getMinionId).collect(Collectors.toList()); saltApi.refreshPillar(new MinionList(minionIds)); break; default: @@ -355,7 +356,7 @@ public String saveSelectedFormulas(Request request, Response response, FormulaFactory.saveGroupFormulas(group, selectedFormulas); List minionIds = group.getServers().stream() .flatMap(s -> Opt.stream(s.asMinionServer())) - .map(MinionServer::getMinionId).toList(); + .map(MinionServer::getMinionId).collect(Collectors.toList()); saltApi.refreshPillar(new MinionList(minionIds)); break; default: diff --git a/java/code/src/com/suse/manager/webui/controllers/ImageBuildController.java b/java/code/src/com/suse/manager/webui/controllers/ImageBuildController.java index 05cfdf1674b2..1499567d01b4 100644 --- a/java/code/src/com/suse/manager/webui/controllers/ImageBuildController.java +++ b/java/code/src/com/suse/manager/webui/controllers/ImageBuildController.java @@ -91,6 +91,7 @@ import java.util.NoSuchElementException; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; import spark.ModelAndView; import spark.Request; @@ -307,7 +308,7 @@ private List getServerStreamJson(List systemList) { json.addProperty("id", s.getId()); json.addProperty("name", s.getName()); return json; - }).toList(); + }).collect(Collectors.toList()); } /** @@ -782,7 +783,7 @@ public Object getRuntimeDetails(Request req, Response res, User user) { private static List getImageInfoSummaryList( List imageInfos) { return imageInfos.stream().map(ImageBuildController::getImageInfoSummary) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/suse/manager/webui/controllers/ImageProfileController.java b/java/code/src/com/suse/manager/webui/controllers/ImageProfileController.java index 18c3ad42d497..373ffc436c23 100644 --- a/java/code/src/com/suse/manager/webui/controllers/ImageProfileController.java +++ b/java/code/src/com/suse/manager/webui/controllers/ImageProfileController.java @@ -430,7 +430,7 @@ private static JsonObject getJsonObject(ImageProfile profile) { */ private static List getJsonList(List profileList) { return profileList.stream().map(ImageProfileController::getJsonObject) - .toList(); + .collect(Collectors.toList()); } /** @@ -460,7 +460,7 @@ private static List getActivationKeyNames(User user) { .findAllActive(user).stream() .filter(ak -> ak.getBaseChannel() != null) .map(ActivationKey::getKey) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/suse/manager/webui/controllers/ImageStoreController.java b/java/code/src/com/suse/manager/webui/controllers/ImageStoreController.java index b88067eba57d..1cb1e642a7ad 100644 --- a/java/code/src/com/suse/manager/webui/controllers/ImageStoreController.java +++ b/java/code/src/com/suse/manager/webui/controllers/ImageStoreController.java @@ -52,6 +52,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.stream.Collectors; import spark.ModelAndView; import spark.Request; @@ -297,7 +298,7 @@ public static Object list(Request req, Response res, User user) { List imageStores = ImageStoreFactory.listImageStores(user.getOrg()) .stream() .filter(s -> s.getStoreType().equals(ImageStoreFactory.TYPE_REGISTRY)) - .toList(); + .collect(Collectors.toList()); return json(res, getJsonList(imageStores), new TypeToken<>() { }); } @@ -409,7 +410,7 @@ private static List getJsonList(List imageStoreList, Str json.addProperty("uri", uriPrefix + imageStore.getUri()); json.addProperty("type", imageStore.getStoreType().getLabel()); return json; - }).toList(); + }).collect(Collectors.toList()); } private static void setStoreCredentials(ImageStore store, ImageStoreCreateRequest request) { diff --git a/java/code/src/com/suse/manager/webui/controllers/MinionController.java b/java/code/src/com/suse/manager/webui/controllers/MinionController.java index 8ec4e9964bbc..b5f94859f659 100644 --- a/java/code/src/com/suse/manager/webui/controllers/MinionController.java +++ b/java/code/src/com/suse/manager/webui/controllers/MinionController.java @@ -236,7 +236,7 @@ public static ModelAndView orgRecurringActions(Request request, Response respons List servers = ServerFactory.lookupByIdsAndOrg(systems, user.getOrg()); List minions = MinionServerUtils.filterSaltMinions(servers) .map(SimpleMinionJson::fromMinionServer) - .toList(); + .collect(Collectors.toList()); Map data = new HashMap<>(); String orgId = request.queryParams("oid"); @@ -285,7 +285,7 @@ public static ModelAndView yourOrgRecurringActions(Request request, Response res List servers = ServerFactory.lookupByIdsAndOrg(systems, user.getOrg()); List minions = MinionServerUtils.filterSaltMinions(servers) .map(SimpleMinionJson::fromMinionServer) - .toList(); + .collect(Collectors.toList()); Map data = new HashMap<>(); data.put("minions", Json.GSON.toJson(minions)); @@ -350,7 +350,7 @@ public static ModelAndView serverGroupRecurringActions(Request request, Response List groupServers = ServerGroupFactory.listServers(group); List minions = MinionServerUtils.filterSaltMinions(groupServers) .map(SimpleMinionJson::fromMinionServer) - .toList(); + .collect(Collectors.toList()); Map data = new HashMap<>(); data.put("groupId", grpId); @@ -380,7 +380,7 @@ public static ModelAndView serverGroupHighstate(Request request, Response respon ServerGroupFactory.lookupByIdAndOrg(Long.parseLong(grpId), user.getOrg()); List minions = ServerGroupFactory.listMinionIdsForServerGroup(group).stream() - .map(m -> new SimpleMinionJson(m.getServerId(), m.getMinionId())).toList(); + .map(m -> new SimpleMinionJson(m.getServerId(), m.getMinionId())).collect(Collectors.toList()); Map data = new HashMap<>(); data.put("groupId", grpId); @@ -405,7 +405,7 @@ public static ModelAndView serverGroupHighstate(Request request, Response respon public static ModelAndView ssmHighstate(Request request, Response response, User user) { List minions = MinionServerFactory.findMinionIdsByServerIds(SsmManager.listServerIds(user)).stream() - .map(m -> new SimpleMinionJson(m.getServerId(), m.getMinionId())).toList(); + .map(m -> new SimpleMinionJson(m.getServerId(), m.getMinionId())).collect(Collectors.toList()); Map data = new HashMap<>(); data.put("minions", Json.GSON.toJson(minions)); @@ -486,10 +486,10 @@ public static void addProxies(User user, Map model) { List path = proxy.getServerPaths().stream() .sorted(Comparator.comparingLong(ServerPath::getPosition)) .map(ServerPath::getHostname) - .toList(); + .collect(Collectors.toList()); entry.put("path", path); return entry; }) - .toList(); + .collect(Collectors.toList()); model.put("proxies", Json.GSON.toJson(proxies)); } @@ -506,7 +506,7 @@ public static ModelAndView bootstrap(Request request, Response response, User us ActivationKeyManager akm = ActivationKeyManager.getInstance(); List visibleBootstrapKeys = akm.findAllActive(user).stream() .map(ActivationKey::getKey) - .toList(); + .collect(Collectors.toList()); data.put("availableActivationKeys", Json.GSON.toJson(visibleBootstrapKeys)); addProxies(user, data); return new ModelAndView(data, "templates/minion/bootstrap.jade"); @@ -549,7 +549,7 @@ public static ModelAndView ssmProxy(Request request, Response response, User use List minions = MinionServerFactory.lookupByIds(SsmManager.listServerIds(user)) .filter(m -> !m.isProxy()) - .map(m -> new SimpleMinionJson(m.getId(), m.getMinionId())).toList(); + .map(m -> new SimpleMinionJson(m.getId(), m.getMinionId())).collect(Collectors.toList()); if (minions.size() == SsmManager.listServerIds(user).size()) { data.put("minions", Json.GSON.toJson(minions)); } @@ -662,7 +662,7 @@ public static ModelAndView ssmCoCoSettings(Request request, Response response, U "name", minionServer.getName(), "cocoSupport", minionServer.doesOsSupportCoCoAttestation() )) - .toList() + .collect(Collectors.toList()) )); addCoCoMetadata(data); @@ -689,7 +689,7 @@ public static ModelAndView ssmCoCoSchedule(Request request, Response response, U "name", minionServer.getName(), "cocoSupport", minionServer.doesOsSupportCoCoAttestation() )) - .toList() + .collect(Collectors.toList()) )); addActionChains(user, data); diff --git a/java/code/src/com/suse/manager/webui/controllers/MinionsAPI.java b/java/code/src/com/suse/manager/webui/controllers/MinionsAPI.java index 75e94b97ea7c..e9ae176f1c4c 100644 --- a/java/code/src/com/suse/manager/webui/controllers/MinionsAPI.java +++ b/java/code/src/com/suse/manager/webui/controllers/MinionsAPI.java @@ -488,7 +488,7 @@ private static PageControl getPageControl(Request request) { private static List listAllSelectionKey(DataResult resultList) { return resultList.stream() .map(PackageListItem::getSelectionKey) - .toList(); + .collect(Collectors.toList()); } private static Set getSessionSet(Request request, Server server, String setLabel) { @@ -547,7 +547,7 @@ private String listAllAttestations(Request request, Response response, User user attestationManager.listCoCoAttestationReportsForUserAndServer(user, server, pc) .stream() .map(CoCoAttestationReportJson::new) - .toList(); + .collect(Collectors.toList()); return json(GSON, response, new PagedDataResultJson<>(reportsJson, totalSize, Collections.emptySet()), new TypeToken<>() { }); diff --git a/java/code/src/com/suse/manager/webui/controllers/NotificationMessageController.java b/java/code/src/com/suse/manager/webui/controllers/NotificationMessageController.java index 810e2bee8a75..daa6ce348066 100644 --- a/java/code/src/com/suse/manager/webui/controllers/NotificationMessageController.java +++ b/java/code/src/com/suse/manager/webui/controllers/NotificationMessageController.java @@ -48,6 +48,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.stream.Collectors; import spark.ModelAndView; import spark.Request; @@ -158,7 +159,7 @@ public String delete(Request request, Response response, User user) { List notifications = messageIds.stream() .map(id -> UserNotificationFactory.lookupByUserAndMessageId(id, user)) .flatMap(Optional::stream) - .toList(); + .collect(Collectors.toList()); UserNotificationFactory.delete(notifications); @@ -295,6 +296,6 @@ public String retryReposync(Request request, Response response, User user) { public List getJSONNotificationMessages(List list, User user) { return list.stream() .map(un -> new NotificationMessageJson(un.getMessage(), un.getRead())) - .toList(); + .collect(Collectors.toList()); } } diff --git a/java/code/src/com/suse/manager/webui/controllers/PackageController.java b/java/code/src/com/suse/manager/webui/controllers/PackageController.java index aaeb9096a943..85739f256096 100644 --- a/java/code/src/com/suse/manager/webui/controllers/PackageController.java +++ b/java/code/src/com/suse/manager/webui/controllers/PackageController.java @@ -48,6 +48,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import spark.ModelAndView; import spark.Request; @@ -123,7 +124,7 @@ private static Object allPackages(PageControlHelper pch, Response response, User return json(response, packages.stream() .map(PackageOverview::getId) - .toList(), new TypeToken<>() { }); + .collect(Collectors.toList()), new TypeToken<>() { }); } DataResult packages = PackageManager.listCustomPackages(user.getOrg().getId(), source, pc); @@ -156,7 +157,7 @@ private static Object orphanedPackages(PageControlHelper pch, Response response, return json(response, packages.stream() .map(PackageOverview::getId) - .toList(), new TypeToken<>() { }); + .collect(Collectors.toList()), new TypeToken<>() { }); } DataResult packages = PackageManager.listOrphanPackages(user.getOrg().getId(), source, pc); @@ -195,7 +196,7 @@ private static Object channelPackages(Request request, Response response, User u return json(response, packages.stream() .map(PackageOverview::getId) - .toList(), new TypeToken<>() { }); + .collect(Collectors.toList()), new TypeToken<>() { }); } DataResult packages = PackageManager.listCustomPackageForChannel( diff --git a/java/code/src/com/suse/manager/webui/controllers/ProductsController.java b/java/code/src/com/suse/manager/webui/controllers/ProductsController.java index b853f2380684..35acdd7a5646 100644 --- a/java/code/src/com/suse/manager/webui/controllers/ProductsController.java +++ b/java/code/src/com/suse/manager/webui/controllers/ProductsController.java @@ -338,7 +338,7 @@ public static String getMandatoryChannels(Request request, Response response, Us catch (NoSuchElementException e) { log.error("Fail to load mandatory channels for channel {}", channelId, e); } - return channels.map(Channel::getId).toList(); + return channels.map(Channel::getId).collect(Collectors.toList()); } )); return result(response, ResultJson.success(result), new TypeToken<>() { }); @@ -436,7 +436,7 @@ public static String data(Request request, Response response, User user) { ) ).collect(Collectors.toSet())); - }).toList()); + }).collect(Collectors.toList())); return json(response, new SUSEProductsJson(jsonProducts, null), new TypeToken<>() { }); } catch (Exception e) { diff --git a/java/code/src/com/suse/manager/webui/controllers/RecurringActionController.java b/java/code/src/com/suse/manager/webui/controllers/RecurringActionController.java index 491e69c10e23..342e1d28407d 100644 --- a/java/code/src/com/suse/manager/webui/controllers/RecurringActionController.java +++ b/java/code/src/com/suse/manager/webui/controllers/RecurringActionController.java @@ -79,6 +79,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; import spark.ModelAndView; import spark.Request; @@ -171,7 +172,7 @@ public static String getTargets(Request request, Response response, User user) { type, id, user, pc, PagedSqlQueryBuilder::parseFilterAsText); return json(response, members.stream() .map(SimpleMinionJson::getId) - .toList()); + .collect(Collectors.toList())); } members = RecurringActionManager.listEntityMembers( @@ -276,7 +277,7 @@ private static List actionsToJson(List mods = configs.stream() .sorted(Comparator.comparingLong(RecurringStateConfig::getPosition)) .map(RecurringStateConfig::getStateName) - .toList(); + .collect(Collectors.toList()); try { Action a = ActionManager.scheduleApplyStates(user, diff --git a/java/code/src/com/suse/manager/webui/controllers/SsmController.java b/java/code/src/com/suse/manager/webui/controllers/SsmController.java index 8d99250d2032..7bc7d22479af 100644 --- a/java/code/src/com/suse/manager/webui/controllers/SsmController.java +++ b/java/code/src/com/suse/manager/webui/controllers/SsmController.java @@ -57,6 +57,7 @@ import java.util.Date; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; import java.util.stream.Stream; import spark.Request; @@ -112,11 +113,11 @@ public static String getBaseChannels(Request request, Response response, User us compatibles.stream().map(cc -> new SsmChannelDto( cc.getId(), cc.getName(), cc.isCustom())) - .toList()); + .collect(Collectors.toList())); List serversByChannel = SsmManager.findServersInSetByChannel(user, c.getId()); allowedBaseJson.setServers(serversByChannel.stream() .map(s -> new SsmServerDto(s.getId(), s.getName())) - .toList()); + .collect(Collectors.toList())); result.add(allowedBaseJson); } @@ -147,11 +148,11 @@ private static Optional createAllowedBaseChannelsFor ChannelFactory.listCompatibleBasesForSSMNoBaseInNullOrg(user).stream()) .map(c -> new SsmChannelDto(c.getId(), c.getName(), c.isCustom())) - .toList(); + .collect(Collectors.toList()); rslt.setAllowedBaseChannels(allowed); rslt.setServers(noBase.stream() .map(s -> new SsmServerDto(s.getId(), s.getName())) - .toList()); + .collect(Collectors.toList())); return Optional.of(rslt); } diff --git a/java/code/src/com/suse/manager/webui/controllers/StatesAPI.java b/java/code/src/com/suse/manager/webui/controllers/StatesAPI.java index c505ca039677..478bec18d68a 100644 --- a/java/code/src/com/suse/manager/webui/controllers/StatesAPI.java +++ b/java/code/src/com/suse/manager/webui/controllers/StatesAPI.java @@ -258,7 +258,7 @@ public String matchStates(Request request, Response response, User user) { } ).orElseGet(Collections::emptyList).stream() .filter(c -> c.getName().toLowerCase().contains(targetLowerCase)) - .toList(); + .collect(Collectors.toList()); // Find matches among this currently assigned salt states Set result = new HashSet<>(); // use a set to avoid duplicates @@ -290,7 +290,7 @@ public String saveConfigChannels(Request request, Response response, User user) List channels = json.getChannels().stream() .sorted(Comparator.comparingInt(ConfigChannelJson::getPosition)) .map(j -> configManager.lookupConfigChannel(user, j.getId())) - .toList(); + .collect(Collectors.toList()); try { SaltConfigurable entity = handleTarget(json.getTargetType(), json.getTargetId(), @@ -434,7 +434,7 @@ public Object applyHighstate(Request req, Response res, User user) { MinionServerFactory.lookupByIds(json.getIds()).map(server -> { checkUserHasPermissionsOnServer(server, user); return server.getId(); - }).toList(); + }).collect(Collectors.toList()); ActionChain actionChain = json.getActionChain() .filter(StringUtils::isNotEmpty) @@ -495,7 +495,7 @@ public Object apply(Request request, Response response, User user) { List minionServerIds = MinionServerUtils .filterSaltMinions(ServerGroupFactory.listServers(group)) .map(Server::getId) - .toList(); + .collect(Collectors.toList()); List states = json.getStates(); if (states.size() == 1 && "custom_groups".equals(states.get(0))) { @@ -516,7 +516,7 @@ public Object apply(Request request, Response response, User user) { List minionServerIds = MinionServerFactory .lookupByOrg(org.getId()).stream() .map(MinionServer::getId) - .toList(); + .collect(Collectors.toList()); ApplyStatesAction action = ActionManager.scheduleApplyStates(user, minionServerIds, json.getStates(), getScheduleDate(json)); diff --git a/java/code/src/com/suse/manager/webui/controllers/SystemsController.java b/java/code/src/com/suse/manager/webui/controllers/SystemsController.java index b99cc255cffb..229f89413a75 100644 --- a/java/code/src/com/suse/manager/webui/controllers/SystemsController.java +++ b/java/code/src/com/suse/manager/webui/controllers/SystemsController.java @@ -191,7 +191,7 @@ public Object virtualSystems(Request request, Response response, User user) { return json(response, virtual.stream() .filter(SystemOverview::isSelectable) .map(VirtualSystemOverview::getUuid) - .toList() + .collect(Collectors.toList()) ); } @@ -280,7 +280,7 @@ private Object allSystems(Request request, Response response, User user) { return json(response, systems.stream() .filter(SystemOverview::isSelectable) .map(SystemOverview::getId) - .toList(), new TypeToken<>() { }); + .collect(Collectors.toList()), new TypeToken<>() { }); } DataResult systems = SystemManager.systemListNew(user, parser, pc); @@ -509,7 +509,7 @@ public String getAvailableBaseChannels(Request request, Response response, User c.isCloned(), c.getArchLabel() )) - .toList(); + .collect(Collectors.toList()); return result(response, ResultJson.success(baseChannels), new TypeToken<>() { }); }); @@ -679,7 +679,7 @@ public Object getAccessibleChannelChildren(Request request, Response response, U c.getChannelArch().getLabel(), channelRecommendedFlags.get(c.getId()), preservationsByNewChild.get(c) != null ? preservationsByNewChild.get(c).getId() : null)) - .toList(); + .collect(Collectors.toList()); return result(response, ResultJson.success(jsonList), new TypeToken<>() { }); } catch (LookupException e) { diff --git a/java/code/src/com/suse/manager/webui/controllers/VirtualHostManagerController.java b/java/code/src/com/suse/manager/webui/controllers/VirtualHostManagerController.java index 149ed7af2222..15ab28294dc7 100644 --- a/java/code/src/com/suse/manager/webui/controllers/VirtualHostManagerController.java +++ b/java/code/src/com/suse/manager/webui/controllers/VirtualHostManagerController.java @@ -172,7 +172,7 @@ public static Object getModules(Request request, Response response, User user) { List gathererModuleNames = getGathererModules() .entrySet().stream() .map(Map.Entry::getKey) - .toList(); + .collect(Collectors.toList()); return json(response, gathererModuleNames); } @@ -342,7 +342,7 @@ public static String validateKubeconfig(Request request, Response response, Map json = new HashMap<>(); json.put("contexts", contexts.stream() .map(ctx -> ctx.get("name")) - .toList()); + .collect(Collectors.toList())); json.put("currentContext", currentContext); return result(response, ResultJson.success(json), new TypeToken<>() { }); } @@ -393,7 +393,7 @@ public static String getKubeconfigContexts(Request request, (List>)map.get("contexts"); contextNames = contexts.stream() .map(ctx -> (String)ctx.get("name")) - .toList(); + .collect(Collectors.toList()); } } } @@ -695,7 +695,7 @@ private static List getJsonList(List vhmList) { json.addProperty("orgName", imageStore.getOrg().getName()); json.addProperty("gathererModule", imageStore.getGathererModule()); return json; - }).toList(); + }).collect(Collectors.toList()); } private static ResultJson getJsonDetails(VirtualHostManager vhm) { diff --git a/java/code/src/com/suse/manager/webui/controllers/activationkeys/ActivationKeysController.java b/java/code/src/com/suse/manager/webui/controllers/activationkeys/ActivationKeysController.java index 6b835f9e0b5f..fc7740f83ddf 100644 --- a/java/code/src/com/suse/manager/webui/controllers/activationkeys/ActivationKeysController.java +++ b/java/code/src/com/suse/manager/webui/controllers/activationkeys/ActivationKeysController.java @@ -36,6 +36,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Function; +import java.util.stream.Collectors; import spark.Request; import spark.Response; @@ -102,7 +103,7 @@ public static String getAccessibleBaseChannels(Request request, Response respons group.setBase(b); return group; }) - .toList() + .collect(Collectors.toList()) ), new TypeToken<>() { }); } diff --git a/java/code/src/com/suse/manager/webui/controllers/activationkeys/ActivationKeysViewsController.java b/java/code/src/com/suse/manager/webui/controllers/activationkeys/ActivationKeysViewsController.java index 3f0525563da8..c64c01257937 100644 --- a/java/code/src/com/suse/manager/webui/controllers/activationkeys/ActivationKeysViewsController.java +++ b/java/code/src/com/suse/manager/webui/controllers/activationkeys/ActivationKeysViewsController.java @@ -43,6 +43,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; import spark.ModelAndView; import spark.Request; @@ -111,7 +112,7 @@ private static List getChannelAppStreams(ActivationKe (module, stream) -> ActivationKeyManager.getInstance().hasAppStreamModuleEnabled( activationKey, channel, module, stream ) - )).toList(); + )).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/suse/manager/webui/controllers/admin/mappers/PaygResponseMappers.java b/java/code/src/com/suse/manager/webui/controllers/admin/mappers/PaygResponseMappers.java index 835318c6f1e8..c70a2f9ef690 100644 --- a/java/code/src/com/suse/manager/webui/controllers/admin/mappers/PaygResponseMappers.java +++ b/java/code/src/com/suse/manager/webui/controllers/admin/mappers/PaygResponseMappers.java @@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils; import java.util.List; +import java.util.stream.Collectors; public class PaygResponseMappers { private static LocalizationService ls = LocalizationService.getInstance(); @@ -49,7 +50,7 @@ public static List mapPaygPropertiesResumeFromDB(List sortedPackages = appStream.getArtifacts() .stream() .map(PackageJson::new) - .toList(); + .collect(Collectors.toList()); artifacts.put("packages", sortedPackages); return result(res, success(artifacts), new TypeToken<>() { }); } diff --git a/java/code/src/com/suse/manager/webui/controllers/bootstrap/AbstractMinionBootstrapper.java b/java/code/src/com/suse/manager/webui/controllers/bootstrap/AbstractMinionBootstrapper.java index 822afe3569df..256d2fcbb9ee 100644 --- a/java/code/src/com/suse/manager/webui/controllers/bootstrap/AbstractMinionBootstrapper.java +++ b/java/code/src/com/suse/manager/webui/controllers/bootstrap/AbstractMinionBootstrapper.java @@ -106,7 +106,7 @@ protected AbstractMinionBootstrapper(SystemQuery systemQueryIn, SaltApi saltApiI public BootstrapResult bootstrap(BootstrapParameters params, User user, String defaultContactMethod) { List errors = validateBootstrap(params); if (!errors.isEmpty()) { - return new BootstrapResult(false, errors.stream().map(BootstrapError::new).toList()); + return new BootstrapResult(false, errors.stream().map(BootstrapError::new).collect(Collectors.toList())); } return bootstrapInternal(params, user, defaultContactMethod); diff --git a/java/code/src/com/suse/manager/webui/controllers/bootstrap/BootstrapResult.java b/java/code/src/com/suse/manager/webui/controllers/bootstrap/BootstrapResult.java index 99cc5c92dabc..8e3665ade186 100644 --- a/java/code/src/com/suse/manager/webui/controllers/bootstrap/BootstrapResult.java +++ b/java/code/src/com/suse/manager/webui/controllers/bootstrap/BootstrapResult.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; /** * Representation of the status of bootstrap and possibly error messages. @@ -84,7 +85,7 @@ public boolean isSuccess() { * @return messages */ public List getMessages() { - return errors.stream().map(BootstrapError::getMessage).toList(); + return errors.stream().map(BootstrapError::getMessage).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/suse/manager/webui/controllers/channels/ChannelsApiController.java b/java/code/src/com/suse/manager/webui/controllers/channels/ChannelsApiController.java index d7d7c499373f..ab5ae456680a 100644 --- a/java/code/src/com/suse/manager/webui/controllers/channels/ChannelsApiController.java +++ b/java/code/src/com/suse/manager/webui/controllers/channels/ChannelsApiController.java @@ -104,7 +104,7 @@ public static String getModularChannels(Request req, Response res, User user) { .distinct() .filter(Channel::isModular) .map(ChannelsJson.ChannelJson::new) - .toList(); + .collect(Collectors.toList()); return result(res, ResultJson.success(jsonChannels), new TypeToken<>() { }); } diff --git a/java/code/src/com/suse/manager/webui/controllers/contentmanagement/handlers/LivePatchingApiController.java b/java/code/src/com/suse/manager/webui/controllers/contentmanagement/handlers/LivePatchingApiController.java index 7ab1bc491072..34aa5d76bde3 100644 --- a/java/code/src/com/suse/manager/webui/controllers/contentmanagement/handlers/LivePatchingApiController.java +++ b/java/code/src/com/suse/manager/webui/controllers/contentmanagement/handlers/LivePatchingApiController.java @@ -38,6 +38,7 @@ import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; import java.util.stream.Stream; import spark.Request; @@ -128,7 +129,7 @@ public static String getSlesSystems(Request req, Response res, User user) { String query = StringUtils.defaultString(req.queryParams("q")); List slesSystems = ServerFactory.querySlesSystems(query, 20, user) .map(System::new) - .toList(); + .collect(Collectors.toList()); return result(res, ResultJson.success(slesSystems), new TypeToken<>() { }); } diff --git a/java/code/src/com/suse/manager/webui/controllers/contentmanagement/handlers/ValidationUtils.java b/java/code/src/com/suse/manager/webui/controllers/contentmanagement/handlers/ValidationUtils.java index d123efb06c0d..fe432a97f070 100644 --- a/java/code/src/com/suse/manager/webui/controllers/contentmanagement/handlers/ValidationUtils.java +++ b/java/code/src/com/suse/manager/webui/controllers/contentmanagement/handlers/ValidationUtils.java @@ -36,7 +36,7 @@ private ValidationUtils() { } public static List convertValidationErrors(ValidatorException exc) { return exc.getResult().getErrors().stream() .map(ValidationMessage::getLocalizedMessage) - .toList(); + .collect(Collectors.toList()); } /** @@ -48,6 +48,6 @@ public static Map> convertFieldValidationErrors(ValidatorEx return exc.getResult().getFieldErrors().entrySet().stream() .collect(Collectors.toMap(Map.Entry::getKey, m -> m.getValue().stream() .map(ValidationMessage::getLocalizedMessage) - .toList())); + .collect(Collectors.toList()))); } } diff --git a/java/code/src/com/suse/manager/webui/controllers/contentmanagement/mappers/ResponseMappers.java b/java/code/src/com/suse/manager/webui/controllers/contentmanagement/mappers/ResponseMappers.java index 3e24577ec1f0..be5b89cc0496 100644 --- a/java/code/src/com/suse/manager/webui/controllers/contentmanagement/mappers/ResponseMappers.java +++ b/java/code/src/com/suse/manager/webui/controllers/contentmanagement/mappers/ResponseMappers.java @@ -50,6 +50,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; /** @@ -91,7 +92,7 @@ public static ProjectPropertiesResponse mapProjectPropertiesFromDB(ContentProjec historyEntryResponse.setVersion(entry.getVersion()); return historyEntryResponse; }) - .toList(); + .collect(Collectors.toList()); properties.setHistoryEntries(historyEntries); return properties; @@ -121,7 +122,7 @@ public static List mapSourcesFromDB(List mapEnvironmentsFromDB(List stream(source.asSoftwareSource())) - .toList(), + .collect(Collectors.toList()), swSourcesWithUnsyncedPatches, sourceTagetChannelIds )); project.setFilters(mapProjectFilterFromDB(projectDB.getProjectFilters())); @@ -208,11 +209,11 @@ public static List mapProjectListingFromDB( contentProjectResumeResponse.setEnvironments( environments.stream() .map(ContentEnvironment::getName) - .toList() + .collect(Collectors.toList()) ); return contentProjectResumeResponse; }) - .toList(); + .collect(Collectors.toList()); } /** @@ -239,12 +240,12 @@ public static List mapFilterListingFromDB( contentFilterResponse.setProjects( projects.stream() .map(p -> new ImmutablePair<>(p.getLabel(), p.getName())) - .toList() + .collect(Collectors.toList()) ); return contentFilterResponse; }) .sorted(Comparator.comparing(FilterResponse::getName)) - .toList(); + .collect(Collectors.toList()); } @@ -270,7 +271,7 @@ public static List mapProjectFilterFromDB(List mapProjectFilterFromDB(List mapProjectMessagesFromDB(List messages) { return messages.stream() .map(m -> new ProjectMessageResponse(m.getMessage(), m.getType(), m.getEntity())) - .toList(); + .collect(Collectors.toList()); } } diff --git a/java/code/src/com/suse/manager/webui/controllers/maintenance/MaintenanceCalendarController.java b/java/code/src/com/suse/manager/webui/controllers/maintenance/MaintenanceCalendarController.java index 7d419fb63cad..c353610c4a4b 100644 --- a/java/code/src/com/suse/manager/webui/controllers/maintenance/MaintenanceCalendarController.java +++ b/java/code/src/com/suse/manager/webui/controllers/maintenance/MaintenanceCalendarController.java @@ -141,10 +141,10 @@ public static String list(Request request, Response response, User user) { .map(tuple -> Map.of( "id", tuple.getScheduleId().toString(), "name", tuple.getScheduleName())) - .toList(); + .collect(Collectors.toList()); return new MaintenanceCalendarJson(calId, calName, schedules); }) - .toList(); + .collect(Collectors.toList()); return json(response, calendarsWithSchedules, new TypeToken<>() { }); } @@ -175,7 +175,7 @@ public static String details(Request request, Response response, User user) { "id", schedule.getId().toString(), "name", schedule.getName() ) - ).toList()); + ).collect(Collectors.toList())); json.setEventNames(new IcalUtils().getEventNames(calendar)); return json(response, json, new TypeToken<>() { }); diff --git a/java/code/src/com/suse/manager/webui/controllers/maintenance/MaintenanceController.java b/java/code/src/com/suse/manager/webui/controllers/maintenance/MaintenanceController.java index 5f35d9fa2211..96f3f4dd6004 100644 --- a/java/code/src/com/suse/manager/webui/controllers/maintenance/MaintenanceController.java +++ b/java/code/src/com/suse/manager/webui/controllers/maintenance/MaintenanceController.java @@ -59,6 +59,7 @@ import java.util.Map; import java.util.Set; import java.util.TimeZone; +import java.util.stream.Collectors; import spark.Request; import spark.Response; @@ -193,7 +194,7 @@ private static String applyTimezoneShift(User user, Long date) { } private static List eventsToJson(User user, List events) { - return events.stream().map(event -> eventToJson(user, event)).toList(); + return events.stream().map(event -> eventToJson(user, event)).collect(Collectors.toList()); } private static MaintenanceWindowDataJson eventToJson(User user, MaintenanceWindowData event) { diff --git a/java/code/src/com/suse/manager/webui/controllers/maintenance/MaintenanceScheduleController.java b/java/code/src/com/suse/manager/webui/controllers/maintenance/MaintenanceScheduleController.java index 6ad5c203afaa..3914febbe262 100644 --- a/java/code/src/com/suse/manager/webui/controllers/maintenance/MaintenanceScheduleController.java +++ b/java/code/src/com/suse/manager/webui/controllers/maintenance/MaintenanceScheduleController.java @@ -308,7 +308,7 @@ public static String systemSchedules(Request request, Response response, User us if ("id".equals(pageHelper.getFunction())) { // Return only IDs for "select all" function - return json(response, systems.stream().map(SystemScheduleDto::getId).toList(), + return json(response, systems.stream().map(SystemScheduleDto::getId).collect(Collectors.toList()), new TypeToken<>() { }); } @@ -431,7 +431,7 @@ public static String unassign(Request request, Response response, User user) { } private static List schedulesToJson(List schedules) { - return schedules.stream().map(MaintenanceScheduleController::scheduleToJson).toList(); + return schedules.stream().map(MaintenanceScheduleController::scheduleToJson).collect(Collectors.toList()); } private static MaintenanceScheduleJson scheduleToJson(MaintenanceSchedule schedule) { diff --git a/java/code/src/com/suse/manager/webui/services/SaltActionChainGeneratorService.java b/java/code/src/com/suse/manager/webui/services/SaltActionChainGeneratorService.java index 4d4a87217b6f..aa9fad45d4c8 100644 --- a/java/code/src/com/suse/manager/webui/services/SaltActionChainGeneratorService.java +++ b/java/code/src/com/suse/manager/webui/services/SaltActionChainGeneratorService.java @@ -331,11 +331,9 @@ private boolean isSaltUpgrade(SaltState state) { if (moduleRun.getKwargs() != null) { Map>> paramPillar = (Map>>) moduleRun.getKwargs().get("pillar"); - if (!paramPillar.get("param_pkgs").stream() + if (paramPillar.get("param_pkgs").stream() .filter(e -> !e.isEmpty()) - .map(e -> e.get(0)) - .filter("salt"::equals) - .toList().isEmpty()) { + .map(e -> e.get(0)).anyMatch("salt"::equals)) { return true; } } diff --git a/java/code/src/com/suse/manager/webui/services/SaltServerActionService.java b/java/code/src/com/suse/manager/webui/services/SaltServerActionService.java index df29e6316e65..c982f0776d2b 100644 --- a/java/code/src/com/suse/manager/webui/services/SaltServerActionService.java +++ b/java/code/src/com/suse/manager/webui/services/SaltServerActionService.java @@ -403,7 +403,7 @@ public void execute(Action actionIn, boolean forcePackageListRefresh, } List sshPushMinions = MinionServerFactory.findMinionsByServerIds( - sshMinionSummaries.stream().map(MinionSummary::getServerId).toList()); + sshMinionSummaries.stream().map(MinionSummary::getServerId).collect(Collectors.toList())); if (!sshPushMinions.isEmpty()) { for (MinionServer sshMinion : sshPushMinions) { @@ -520,7 +520,7 @@ private void startSSHActionChain(ActionChain actionChain, Set ssh // first check if there's an action chain with a reboot already executing Map>> pendingResumeConf = saltApi.getPendingResume( sshMinions.stream().map(MinionSummary::getMinionId) - .toList() + .collect(Collectors.toList()) ); List targetSSHMinions = sshMinions.stream() .filter(sshMinion -> { @@ -557,7 +557,7 @@ private void startSSHActionChain(ActionChain actionChain, Set ssh Map>> res = saltSSHService.callSyncSSH(call, new MinionList(targetSSHMinions.stream().map(MinionSummary::getMinionId) - .toList()), + .collect(Collectors.toList())), extraFilerefs); res.forEach((minionId, chunkResult) -> { @@ -838,7 +838,7 @@ public void executeActionChain(long actionChainId) { ServerAction sa = saCalls.getKey(); List> calls = saCalls.getValue(); return convertToState(actionChain.getId(), sa, calls, minion).stream(); - }).toList(); + }).collect(Collectors.toList()); statesPerMinion.put(minion, states); }); @@ -1073,7 +1073,7 @@ private Map>, List> errataToPa e.getValue().getB().endsWith("-X") ? e.getValue().getB().substring(0, e.getValue().getB().length() - 2) : e.getValue().getB())) - .toList())) + .collect(Collectors.toList()))) ), Map.Entry::getValue )); @@ -1139,7 +1139,7 @@ private Map, List> packagesRemoveAction( } }); List> duplicatedPkgs = pkgsAll.stream() - .filter(p -> !uniquePkgs.contains(p)).toList(); + .filter(p -> !uniquePkgs.contains(p)).collect(Collectors.toList()); Map params = new HashMap<>(); params.put(PARAM_PKGS, uniquePkgs); @@ -1418,7 +1418,7 @@ private Map, List> imageBuildAction( imageStores.add(profile.getTargetStore()); List minions = MinionServerFactory.findMinionsByServerIds( - minionSummaries.stream().map(MinionSummary::getServerId).toList()); + minionSummaries.stream().map(MinionSummary::getServerId).collect(Collectors.toList())); //TODO: optimal scheduling would be to group by host and orgid return minions.stream().collect( @@ -1533,7 +1533,7 @@ private Map, List> distUpgradeAction( distupgrade.put("channels", subbed.stream() .sorted() .map(c -> "susemanager:" + c.getLabel()) - .toList()); + .collect(Collectors.toList())); if (Objects.nonNull(action.getDetails().getMissingSuccessors())) { pillar.put("missing_successors", Arrays.asList(action.getDetails().getMissingSuccessors().split(","))); } @@ -1762,8 +1762,8 @@ private Map, List> appStreamAction( .map(d -> d.getStream() == null ? singletonList(d.getModuleName()) : Arrays.asList(d.getModuleName(), d.getStream())) - .collect(toList()); - var disableParams = details.get(false).stream().map(AppStreamActionDetails::getModuleName).collect(toList()); + .toList(); + var disableParams = details.get(false).stream().map(AppStreamActionDetails::getModuleName).toList(); Optional> params = Optional.of(Map.of( PARAM_APPSTREAMS_ENABLE, enableParams, @@ -1822,7 +1822,7 @@ private LocalCall prepareStagingTargets(Action actionIn, List private Map> execute(Action actionIn, LocalCall call, List minionSummaries, boolean forcePackageListRefresh, boolean isStagingJob) { - List minionIds = minionSummaries.stream().map(MinionSummary::getMinionId).toList(); + List minionIds = minionSummaries.stream().map(MinionSummary::getMinionId).collect(Collectors.toList()); if (LOG.isDebugEnabled()) { LOG.debug("Executing action for: {}", minionIds.stream().collect(Collectors.joining(", "))); @@ -1857,7 +1857,7 @@ private Map> callAsyncActionChainStart( ActionChain actionChain, Set minionSummaries) { List minionIds = minionSummaries.stream().map(MinionSummary::getMinionId) - .toList(); + .collect(Collectors.toList()); if (LOG.isDebugEnabled()) { LOG.debug("Executing action chain for: {}", String.join(", ", minionIds)); @@ -2091,14 +2091,13 @@ public void failDependentServerActions(long actionId, String minionId, Optional< while (!actionIdsDependencies.isEmpty()) { Long acId = actionIdsDependencies.pop(); - List serverActionsWithPrereq = serverActions.stream() + serverActions.stream() .filter(s -> s.getParentAction().getPrerequisite() != null) .filter(s -> s.getParentAction().getPrerequisite().getId().equals(acId)) - .toList(); - for (ServerAction sa : serverActionsWithPrereq) { - actionIdsDependencies.push(sa.getParentAction().getId()); - sa.fail("Prerequisite failed"); - } + .forEach(sa -> { + actionIdsDependencies.push(sa.getParentAction().getId()); + sa.fail("Prerequisite failed"); + }); } } } diff --git a/java/code/src/com/suse/manager/webui/services/SaltStateGeneratorService.java b/java/code/src/com/suse/manager/webui/services/SaltStateGeneratorService.java index 941be57930ce..b7aaac888470 100644 --- a/java/code/src/com/suse/manager/webui/services/SaltStateGeneratorService.java +++ b/java/code/src/com/suse/manager/webui/services/SaltStateGeneratorService.java @@ -80,6 +80,7 @@ import java.util.Optional; import java.util.Set; import java.util.TreeMap; +import java.util.stream.Collectors; /** * Service to manage the Salt states generated by Suse Manager. @@ -451,7 +452,7 @@ public void generateRecurringState(RecurringAction action) { List statesList = config.stream() .sorted(Comparator.comparingLong(RecurringStateConfig::getPosition)) .map(RecurringStateConfig::getStateName) - .toList(); + .collect(Collectors.toList()); generateStateAssignmentFile(SALT_RECURRING_STATE_FILE_PREFIX + action.getId(), statesList, suseManagerStatesFilesRoot.resolve(SALT_RECURRING_STATES_DIR)); } @@ -499,7 +500,7 @@ private void generateConfigStates(StateRevision stateRevision, String fileName, ConfigChannelSaltManager confChannelSaltManager = ConfigChannelSaltManager.getInstance(); List stateNames = stateRevision.getConfigChannels().stream().map( confChannelSaltManager::getChannelStateName) - .toList(); + .collect(Collectors.toList()); generateStateAssignmentFile(fileName, stateNames, statePath.resolve(SALT_CONFIG_STATES_DIR)); } diff --git a/java/code/src/com/suse/manager/webui/services/StateSourceService.java b/java/code/src/com/suse/manager/webui/services/StateSourceService.java index db7b39f75f8d..e136906c2193 100644 --- a/java/code/src/com/suse/manager/webui/services/StateSourceService.java +++ b/java/code/src/com/suse/manager/webui/services/StateSourceService.java @@ -78,7 +78,7 @@ public static List getSystemStateSources(MinionServer minion) { // Internal states stateOrigins = Stream.concat(stateOrigins, Stream.of(StateSourceDto.internalState())); - return stateOrigins.toList(); + return stateOrigins.collect(Collectors.toList()); } private static Stream getStateSources(List channels, SaltConfigurable source, diff --git a/java/code/src/com/suse/manager/webui/services/impl/SaltSSHService.java b/java/code/src/com/suse/manager/webui/services/impl/SaltSSHService.java index 72d255f68023..298c453abce3 100644 --- a/java/code/src/com/suse/manager/webui/services/impl/SaltSSHService.java +++ b/java/code/src/com/suse/manager/webui/services/impl/SaltSSHService.java @@ -409,7 +409,7 @@ private static List sortServerPaths(Set serverPaths) { return serverPaths.stream() .sorted(Comparator.comparing(ServerPath::getPosition).reversed()) - .toList(); + .collect(Collectors.toList()); } /** @@ -844,7 +844,7 @@ public Optional> cleanupSSHMinion(MinionServer minion, int timeout) (saltRes) -> saltRes.values().stream() .filter(value -> !value.isResult()) .map(StateApplyResult::getComment) - .toList() + .collect(Collectors.toList()) ); return result.isEmpty() ? Optional.>empty() : Optional.of(result); @@ -965,7 +965,7 @@ public Map> findApplyHighstateActionsPerMinion(Map state instanceof ActionSaltState) .map(state -> ((ActionSaltState)state).getActionId()) - .toList() + .collect(Collectors.toList()) )); } diff --git a/java/code/src/com/suse/manager/webui/services/impl/SaltService.java b/java/code/src/com/suse/manager/webui/services/impl/SaltService.java index 4f79039fc26e..49ce23315e08 100644 --- a/java/code/src/com/suse/manager/webui/services/impl/SaltService.java +++ b/java/code/src/com/suse/manager/webui/services/impl/SaltService.java @@ -764,7 +764,7 @@ public List matchCompoundSync(String target) { return result.entrySet().stream() .filter(e -> e.getValue().result().isPresent() && Boolean.TRUE.equals(e.getValue().result().get())) .map(Entry::getKey) - .toList(); + .collect(Collectors.toList()); } catch (SaltException e) { throw new RhnRuntimeException(e); diff --git a/java/code/src/com/suse/manager/webui/services/test/SaltServerActionServiceTest.java b/java/code/src/com/suse/manager/webui/services/test/SaltServerActionServiceTest.java index ac68a7562bb0..10730237c40c 100644 --- a/java/code/src/com/suse/manager/webui/services/test/SaltServerActionServiceTest.java +++ b/java/code/src/com/suse/manager/webui/services/test/SaltServerActionServiceTest.java @@ -153,7 +153,7 @@ public void testPackageUpdate() throws Exception { mins.add(testMinionServer); List minionSummaries = mins.stream(). - map(MinionSummary::new).toList(); + map(MinionSummary::new).collect(Collectors.toList()); Channel channel = ChannelFactoryTest.createTestChannel(user); Package p64 = ErrataTestUtils.createTestPackage(user, channel, "x86_64"); @@ -199,7 +199,7 @@ public void testPackageFullUpdate() throws Exception { mins.add(testMinionServer); List minionSummaries = mins.stream(). - map(MinionSummary::new).toList(); + map(MinionSummary::new).collect(Collectors.toList()); Channel channel = ChannelFactoryTest.createTestChannel(user); Package p64 = ErrataTestUtils.createTestPackage(user, channel, "x86_64"); @@ -244,7 +244,7 @@ public void testRetractedPackageInstall() throws Exception { mins.add(testMinionServer); List minionSummaries = mins.stream(). - map(MinionSummary::new).toList(); + map(MinionSummary::new).collect(Collectors.toList()); Channel channel = ChannelFactoryTest.createTestChannel(user); SystemManager.subscribeServerToChannel(user, testMinionServer, channel); @@ -296,7 +296,7 @@ public void testPackageRemoveDebian() throws Exception { mins.add(testMinionServer); List minionSummaries = mins.stream(). - map(MinionSummary::new).toList(); + map(MinionSummary::new).collect(Collectors.toList()); Channel channel = ChannelFactoryTest.createTestChannel(user); Package p = ErrataTestUtils.createTestPackage(user, channel, "amd64-deb"); @@ -340,7 +340,7 @@ public void testPackageUpdateDebian() throws Exception { mins.add(testMinionServer); List minionSummaries = mins.stream(). - map(MinionSummary::new).toList(); + map(MinionSummary::new).collect(Collectors.toList()); Channel channel = ChannelFactoryTest.createTestChannel(user); Package p1 = ErrataTestUtils.createTestPackage(user, channel, "amd64-deb"); @@ -398,7 +398,7 @@ public void testPackageRemoveDuplicates() throws Exception { mins.add(testMinion); List minionSummaries = mins.stream(). - map(MinionSummary::new).toList(); + map(MinionSummary::new).collect(Collectors.toList()); Channel channel = ChannelFactoryTest.createTestChannel(user); Package p1 = ErrataTestUtils.createTestPackage(user, channel, "x86_64"); diff --git a/java/code/src/com/suse/manager/webui/utils/DownloadTokenBuilder.java b/java/code/src/com/suse/manager/webui/utils/DownloadTokenBuilder.java index fccbf324ee3f..314c833dde4b 100644 --- a/java/code/src/com/suse/manager/webui/utils/DownloadTokenBuilder.java +++ b/java/code/src/com/suse/manager/webui/utils/DownloadTokenBuilder.java @@ -16,6 +16,7 @@ import org.jose4j.jwt.JwtClaims; +import java.util.ArrayList; import java.util.Optional; import java.util.Set; @@ -60,9 +61,7 @@ public void onlyChannels(Set channels) { public JwtClaims getClaims() { JwtClaims claims = super.getClaims(); claims.setClaim("org", this.orgId); - onlyChannels.ifPresent(channels -> - claims.setStringListClaim("onlyChannels", - channels.stream().toList())); + onlyChannels.ifPresent(channels -> claims.setStringListClaim("onlyChannels", new ArrayList<>(channels))); return claims; } } diff --git a/java/code/src/com/suse/manager/webui/utils/MinionActionUtils.java b/java/code/src/com/suse/manager/webui/utils/MinionActionUtils.java index 4d218e892a1d..ed3c5e2caaba 100644 --- a/java/code/src/com/suse/manager/webui/utils/MinionActionUtils.java +++ b/java/code/src/com/suse/manager/webui/utils/MinionActionUtils.java @@ -57,6 +57,7 @@ import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -159,7 +160,7 @@ public void cleanupMinionActions() { .map(MinionServer::getMinionId) .map(Stream::of) .orElseGet(Stream::empty) - ).toList(); + ).collect(Collectors.toList()); Map>> running = saltApi.running(new MinionList(minionIds)); diff --git a/java/code/src/com/suse/manager/webui/utils/SparkApplicationHelper.java b/java/code/src/com/suse/manager/webui/utils/SparkApplicationHelper.java index b16f1ac97f68..f4932dbf5937 100644 --- a/java/code/src/com/suse/manager/webui/utils/SparkApplicationHelper.java +++ b/java/code/src/com/suse/manager/webui/utils/SparkApplicationHelper.java @@ -55,6 +55,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; import de.neuland.jade4j.JadeConfiguration; import spark.ModelAndView; @@ -238,7 +239,7 @@ public static TemplateViewRoute withRolesTemplate(TemplateViewRouteWithUser rout ModelAndView modelAndView = route.handle(request, response, user); List roles = user.getRoles().stream() .map(Role::getLabel) - .toList(); + .collect(Collectors.toList()); Object model = modelAndView.getModel(); if (model instanceof Map mod) { mod.put("roles", GSON.toJson(roles)); diff --git a/java/code/src/com/suse/manager/webui/utils/gson/ChannelsJson.java b/java/code/src/com/suse/manager/webui/utils/gson/ChannelsJson.java index 2b992a425ff2..2649ab094fec 100644 --- a/java/code/src/com/suse/manager/webui/utils/gson/ChannelsJson.java +++ b/java/code/src/com/suse/manager/webui/utils/gson/ChannelsJson.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -201,7 +202,7 @@ public void setChildren(Stream childrenIn) { this.children = childrenIn.map( (c) -> new ChannelJson(c.getId(), c.getLabel(), c.getName(), c.isCustom(), true, c.isCloned(), c.getChannelArch().getLabel())) - .toList(); + .collect(Collectors.toList()); } /** @@ -222,7 +223,7 @@ public void setChildrenWithRecommendedAndArch(Stream childrenIn, Map LocalizationService.getInstance().getMessage(label)).orElse(null); this.actionScheduledBy = action.map(Action::getSchedulerUser).map(User::getLogin).orElse(null); - this.results = report.getResults().stream().map(CoCoAttestationResultJson::new).toList(); + this.results = report.getResults().stream().map(CoCoAttestationResultJson::new).collect(Collectors.toList()); } public long getId() { diff --git a/java/code/src/com/suse/manager/webui/utils/gson/ConfigChannelJson.java b/java/code/src/com/suse/manager/webui/utils/gson/ConfigChannelJson.java index 46461e767704..fbccbe7e9f74 100644 --- a/java/code/src/com/suse/manager/webui/utils/gson/ConfigChannelJson.java +++ b/java/code/src/com/suse/manager/webui/utils/gson/ConfigChannelJson.java @@ -20,6 +20,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder; import java.util.List; +import java.util.stream.Collectors; import java.util.stream.IntStream; /** @@ -174,7 +175,7 @@ public void setAssigned(boolean assignedIn) { public static List listOrdered(List channelsIn) { return IntStream.range(0, channelsIn.size()) .mapToObj(i -> new ConfigChannelJson(channelsIn.get(i), i + 1)) - .toList(); + .collect(Collectors.toList()); } @Override diff --git a/java/code/src/com/suse/manager/webui/utils/gson/ImageInfoJson.java b/java/code/src/com/suse/manager/webui/utils/gson/ImageInfoJson.java index d88729a7819e..ac989a699b9e 100644 --- a/java/code/src/com/suse/manager/webui/utils/gson/ImageInfoJson.java +++ b/java/code/src/com/suse/manager/webui/utils/gson/ImageInfoJson.java @@ -390,7 +390,7 @@ public void setImageFiles(Set imageFilesIn) { json.addProperty("name", file.getFile()); json.addProperty("url", OSImageStoreUtils.getOSImageFileURI(file)); return json; - }).toList(); + }).collect(Collectors.toList()); } /** @@ -412,7 +412,7 @@ public void setDeltaSourceFor(Set deltaSourceForIn) { target.getVersion() + "-" + target.getRevisionNumber()); return json; - }).toList(); + }).collect(Collectors.toList()); } /** @@ -434,7 +434,7 @@ public void setDeltaTargetFor(Set deltaTargetForIn) { source.getVersion() + "-" + source.getRevisionNumber()); return json; - }).toList(); + }).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/suse/manager/webui/utils/gson/PackageActionJson.java b/java/code/src/com/suse/manager/webui/utils/gson/PackageActionJson.java index f9751ef5ce20..9e35b0522e94 100644 --- a/java/code/src/com/suse/manager/webui/utils/gson/PackageActionJson.java +++ b/java/code/src/com/suse/manager/webui/utils/gson/PackageActionJson.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * Data required to schedule an action (install/update/remove) on packages @@ -76,7 +77,7 @@ public List> getSelectedPackageMap() { return selectedPackages.stream() .map(PackageListItem::parse) .map(PackageListItem::getKeyMap) - .toList(); + .collect(Collectors.toList()); } } diff --git a/java/code/src/com/suse/manager/webui/utils/gson/SaltMinionJson.java b/java/code/src/com/suse/manager/webui/utils/gson/SaltMinionJson.java index 857b65fbd142..d57e0ce1d0c1 100644 --- a/java/code/src/com/suse/manager/webui/utils/gson/SaltMinionJson.java +++ b/java/code/src/com/suse/manager/webui/utils/gson/SaltMinionJson.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.function.Function; import java.util.function.Predicate; +import java.util.stream.Collectors; import java.util.stream.Stream; @@ -78,7 +79,7 @@ public static List fromFingerprints(Key.Fingerprints fp, fromFingerprints(fp.getDeniedMinions(), sids, STATE_DENIED, isVisible), fromFingerprints(fp.getRejectedMinions(), sids, STATE_REJECTED, isVisible), fromFingerprints(fp.getUnacceptedMinions(), sids, STATE_PENDING, isVisible) - ).flatMap(Function.identity()).toList(); + ).flatMap(Function.identity()).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/suse/manager/webui/websocket/RemoteMinionCommands.java b/java/code/src/com/suse/manager/webui/websocket/RemoteMinionCommands.java index 40d79323097a..58df2481b3c6 100644 --- a/java/code/src/com/suse/manager/webui/websocket/RemoteMinionCommands.java +++ b/java/code/src/com/suse/manager/webui/websocket/RemoteMinionCommands.java @@ -61,6 +61,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; +import java.util.stream.Collectors; import javax.websocket.OnClose; import javax.websocket.OnError; @@ -146,7 +147,7 @@ public void onMessage(Session session, String messageBody) { .lookupVisibleToUser(webSession.getUser()) .filter(mm::isSystemInMaintenanceMode) .map(MinionServer::getMinionId) - .toList(); + .collect(Collectors.toList()); failAfter = FutureUtils.failAfter(timeOut); @@ -226,7 +227,7 @@ public void onMessage(Session session, String messageBody) { entry.getValue().result().orElse(false); }) .map(Map.Entry::getKey) - .toList(); + .collect(Collectors.toList()); previewedMinions.addAll(sshMinions); diff --git a/java/code/src/com/suse/manager/xmlrpc/maintenance/MaintenanceHandler.java b/java/code/src/com/suse/manager/xmlrpc/maintenance/MaintenanceHandler.java index be7786164bdb..5076403bc0f5 100644 --- a/java/code/src/com/suse/manager/xmlrpc/maintenance/MaintenanceHandler.java +++ b/java/code/src/com/suse/manager/xmlrpc/maintenance/MaintenanceHandler.java @@ -518,6 +518,6 @@ public List listSystemsWithSchedule(User loggedInUser, String scheduleName private static List createStrategiesFromStrings(List strategyLabels) { return strategyLabels.stream() .map(label -> RescheduleStrategyType.fromLabel(label).createInstance()) - .toList(); + .collect(Collectors.toList()); } } diff --git a/java/code/src/com/suse/manager/xmlrpc/serializer/RescheduleResultSerializer.java b/java/code/src/com/suse/manager/xmlrpc/serializer/RescheduleResultSerializer.java index 75bfd5b088f2..790e7da6e164 100644 --- a/java/code/src/com/suse/manager/xmlrpc/serializer/RescheduleResultSerializer.java +++ b/java/code/src/com/suse/manager/xmlrpc/serializer/RescheduleResultSerializer.java @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * Serializer for {@link com.suse.manager.maintenance.rescheduling.RescheduleResult} @@ -78,7 +79,7 @@ public SerializedApiResponse serialize(RescheduleResult src) { a.put("prerequisite", action.getPrerequisite().getId()); } a.put("affected_system_ids", src.getActionsServers().get(action).stream() - .map(Server::getId).toList()); + .map(Server::getId).collect(Collectors.toList())); a.put("details", StringUtil.toPlainText(action.getFormatter().getNotes())); actions.add(a); } diff --git a/java/code/src/com/suse/oval/OVALCachingFactory.java b/java/code/src/com/suse/oval/OVALCachingFactory.java index d4524734111e..9e395733a600 100644 --- a/java/code/src/com/suse/oval/OVALCachingFactory.java +++ b/java/code/src/com/suse/oval/OVALCachingFactory.java @@ -41,6 +41,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; public class OVALCachingFactory extends HibernateFactory { private static final Logger LOG = LogManager.getLogger(OVALCachingFactory.class); @@ -128,7 +129,7 @@ public static List getVulnerablePackagesByProductAndCve(Strin vulnerablePackage.setName((String) row.get("vulnerablepkgname")); vulnerablePackage.setFixVersion((String) row.get("vulnerablepkgfixversion")); return vulnerablePackage; - }).toList(); + }).collect(Collectors.toList()); } /** diff --git a/java/code/src/com/suse/oval/OVALCleaner.java b/java/code/src/com/suse/oval/OVALCleaner.java index 88f7b3ae6806..744eee7c1947 100644 --- a/java/code/src/com/suse/oval/OVALCleaner.java +++ b/java/code/src/com/suse/oval/OVALCleaner.java @@ -35,6 +35,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * This class is responsible for cleaning OVAL resources and filling up missing data. It acts as an adapter that takes @@ -105,7 +106,7 @@ private static void fillCves(DefinitionType definition, OsFamily osFamily) { } return ""; - }).filter(StringUtils::isNotBlank).toList(); + }).filter(StringUtils::isNotBlank).collect(Collectors.toList()); definition.setCves(cves); break; case DEBIAN: @@ -116,7 +117,7 @@ private static void fillCves(DefinitionType definition, OsFamily osFamily) { } List cleanCves = definition.getCves().stream().map(OVALCleaner::removeWhitespaceChars) - .toList(); + .collect(Collectors.toList()); definition.setCves(cleanCves); } diff --git a/java/code/src/com/suse/oval/vulnerablepkgextractor/CriteriaTreeBasedExtractor.java b/java/code/src/com/suse/oval/vulnerablepkgextractor/CriteriaTreeBasedExtractor.java index 6c160e792cb3..06bf095a56dc 100644 --- a/java/code/src/com/suse/oval/vulnerablepkgextractor/CriteriaTreeBasedExtractor.java +++ b/java/code/src/com/suse/oval/vulnerablepkgextractor/CriteriaTreeBasedExtractor.java @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.List; import java.util.function.BooleanSupplier; +import java.util.stream.Collectors; /** * An abstract implementation that provides utility methods to extract vulnerable package information from @@ -60,7 +61,7 @@ public final List extract() { return matchedCriteriaList.stream().map(this::extractItem) .flatMap(Collection::stream) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/suse/oval/vulnerablepkgextractor/redhat/RedHatVulnerablePackageExtractorFromVulnerabilityDefinition.java b/java/code/src/com/suse/oval/vulnerablepkgextractor/redhat/RedHatVulnerablePackageExtractorFromVulnerabilityDefinition.java index c3fa118ea031..6f99cefd60db 100644 --- a/java/code/src/com/suse/oval/vulnerablepkgextractor/redhat/RedHatVulnerablePackageExtractorFromVulnerabilityDefinition.java +++ b/java/code/src/com/suse/oval/vulnerablepkgextractor/redhat/RedHatVulnerablePackageExtractorFromVulnerabilityDefinition.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; /** * Vulnerable packages extractor for vulnerability definitions @@ -54,7 +55,7 @@ public List extract() { List vulnerablePackages = vulnerabilityDefinition.getMetadata().getAdvisory() .map(Advisory::getAffectedComponents).orElse(Collections.emptyList()) .stream().map(this::toVulnerablePackage) - .toList(); + .collect(Collectors.toList()); String cve = vulnerabilityDefinition.getSingleCve().orElseThrow(); diff --git a/java/code/src/com/suse/scc/client/SCCWebClient.java b/java/code/src/com/suse/scc/client/SCCWebClient.java index fe0156719dac..95951b718c3c 100644 --- a/java/code/src/com/suse/scc/client/SCCWebClient.java +++ b/java/code/src/com/suse/scc/client/SCCWebClient.java @@ -198,7 +198,7 @@ private List getList(String endpoint, Type resultType) futures.stream().map(CompletableFuture::join) ) .flatMap(p -> p.result.stream()) - .toList(); + .collect(Collectors.toList()); } private void addHeaders(AbstractHttpMessage request) { diff --git a/java/code/src/com/suse/scc/model/SCCVirtualizationHostJson.java b/java/code/src/com/suse/scc/model/SCCVirtualizationHostJson.java index 076930edb269..4db3e24585ba 100644 --- a/java/code/src/com/suse/scc/model/SCCVirtualizationHostJson.java +++ b/java/code/src/com/suse/scc/model/SCCVirtualizationHostJson.java @@ -19,6 +19,7 @@ import com.google.gson.annotations.SerializedName; import java.util.List; +import java.util.stream.Collectors; /** * SCCVirtualizationHostJson @@ -62,7 +63,7 @@ public SCCVirtualizationHostJson(String identifierIn, Server s) { systems = s.getGuests().stream() .filter(guest -> guest.isRegisteredGuest()) .map(guest -> new SCCVirtualizationHostSystemsJson(guest)) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/java/code/src/com/suse/scc/registration/SCCSystemRegistrationCreateUpdateSystems.java b/java/code/src/com/suse/scc/registration/SCCSystemRegistrationCreateUpdateSystems.java index fa3a52a4825d..b8defa845ed8 100644 --- a/java/code/src/com/suse/scc/registration/SCCSystemRegistrationCreateUpdateSystems.java +++ b/java/code/src/com/suse/scc/registration/SCCSystemRegistrationCreateUpdateSystems.java @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import java.util.stream.IntStream; /** @@ -67,6 +68,6 @@ public void handle(SCCSystemRegistrationContext context) { private List> splitListIntoBatches(List list, int batchSize) { return IntStream.range(0, (list.size() + batchSize - 1) / batchSize) .mapToObj(i -> list.subList(i * batchSize, Math.min((i + 1) * batchSize, list.size()))) - .toList(); + .collect(Collectors.toList()); } } diff --git a/java/code/src/com/suse/scc/registration/SCCSystemRegistrationSystemDataAcquisitor.java b/java/code/src/com/suse/scc/registration/SCCSystemRegistrationSystemDataAcquisitor.java index 83994477c642..e77b60363825 100644 --- a/java/code/src/com/suse/scc/registration/SCCSystemRegistrationSystemDataAcquisitor.java +++ b/java/code/src/com/suse/scc/registration/SCCSystemRegistrationSystemDataAcquisitor.java @@ -90,7 +90,7 @@ private Optional getPayload(SCCRegCacheItem rci) { }) .filter(Objects::nonNull) .map(SCCMinProductJson::new) - .toList(); + .collect(Collectors.toList()); SCCHwInfoJson hwInfo = new SCCHwInfoJson(); diff --git a/java/code/src/com/suse/scc/test/SCCSystemRegistrationManagerTest.java b/java/code/src/com/suse/scc/test/SCCSystemRegistrationManagerTest.java index 53ff9775928b..b3b5adf22f11 100644 --- a/java/code/src/com/suse/scc/test/SCCSystemRegistrationManagerTest.java +++ b/java/code/src/com/suse/scc/test/SCCSystemRegistrationManagerTest.java @@ -62,6 +62,7 @@ import java.util.Date; import java.util.List; import java.util.Random; +import java.util.stream.Collectors; /** * Tests for {@link SCCClient} methods. @@ -94,7 +95,7 @@ public SCCOrganizationSystemsUpdateResponse createUpdateSystems( .map(system -> new SCCSystemCredentialsJson(system.getLogin(), system.getPassword(), 12345L) ) - .toList() + .collect(Collectors.toList()) ); } @@ -111,7 +112,7 @@ public void deleteSystem(long id, String username, String password) { List allUnregistered = SCCCachingFactory.findSystemsToForwardRegistration(); List testSystems = allUnregistered.stream() .filter(i -> i.getOptServer().get().equals(testSystem)) - .toList(); + .collect(Collectors.toList()); SCCCredentials credentials = CredentialsFactory.createSCCCredentials("username", "password"); credentials.setUrl("https://scc.suse.com"); CredentialsFactory.storeCredentials(credentials); @@ -169,7 +170,7 @@ public void sccSystemRegistrationLifecycleForPAYGInstance() throws Exception { List allUnregistered = SCCCachingFactory.findSystemsToForwardRegistration(); List testSystems = allUnregistered.stream() .filter(i -> i.getOptServer().get().equals(testSystem)) - .toList(); + .collect(Collectors.toList()); SCCCredentials credentials = CredentialsFactory.createSCCCredentials("username", "password"); CredentialsFactory.storeCredentials(credentials); @@ -205,7 +206,7 @@ public SCCOrganizationSystemsUpdateResponse createUpdateSystems( .map(system -> new SCCSystemCredentialsJson(system.getLogin(), system.getPassword(), 12345L) ) - .toList() + .collect(Collectors.toList()) ); } @@ -229,7 +230,7 @@ public void updateBulkLastSeen(List systems, String usernam List allUnregistered = SCCCachingFactory.findSystemsToForwardRegistration(); List testSystems = allUnregistered.stream() .filter(i -> i.getOptServer().get().equals(testSystem)) - .toList(); + .collect(Collectors.toList()); SCCCredentials credentials = CredentialsFactory.createSCCCredentials("username", "password"); credentials.setUrl("https://scc.suse.com"); CredentialsFactory.storeCredentials(credentials); @@ -277,7 +278,7 @@ public SCCOrganizationSystemsUpdateResponse createUpdateSystems( .map(system -> new SCCSystemCredentialsJson(system.getLogin(), system.getPassword(), 12345L) ) - .toList() + .collect(Collectors.toList()) ); } @@ -299,7 +300,7 @@ public void updateBulkLastSeen(List systems, String usernam List allUnregistered = SCCCachingFactory.findSystemsToForwardRegistration(); List testSystems = allUnregistered.stream() .filter(i -> i.getOptServer().get().getServerInfo().getCheckin().equals(new Date(0))) - .toList(); + .collect(Collectors.toList()); SCCCredentials credentials = CredentialsFactory.createSCCCredentials("username", "password"); credentials.setUrl("https://scc.suse.com"); CredentialsFactory.storeCredentials(credentials); @@ -346,7 +347,7 @@ public SCCOrganizationSystemsUpdateResponse createUpdateSystems( system.getPassword(), new Random().nextLong()) ) - .toList() + .collect(Collectors.toList()) ); } @@ -430,7 +431,7 @@ public SCCOrganizationSystemsUpdateResponse createUpdateSystems( system.getPassword(), new Random().nextLong()) ) - .toList() + .collect(Collectors.toList()) ); } @@ -529,7 +530,7 @@ public SCCOrganizationSystemsUpdateResponse createUpdateSystems( system.getPassword(), new Random().nextLong()) ) - .toList() + .collect(Collectors.toList()) ); } diff --git a/java/code/src/com/suse/scc/test/SCCSystemRegistrationTest.java b/java/code/src/com/suse/scc/test/SCCSystemRegistrationTest.java index bf166d288662..910f6fdb80e0 100644 --- a/java/code/src/com/suse/scc/test/SCCSystemRegistrationTest.java +++ b/java/code/src/com/suse/scc/test/SCCSystemRegistrationTest.java @@ -46,6 +46,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * Tests {@link com.suse.scc.registration.SCCSystemRegistration}. @@ -95,7 +96,7 @@ private void setupSystems() throws Exception { List allUnregistered = SCCCachingFactory.findSystemsToForwardRegistration(); this.testSystems = allUnregistered.stream() .filter(i -> i.getOptServer().get().getServerInfo().getCheckin().equals(new Date(0))) - .toList(); + .collect(Collectors.toList()); } @@ -232,7 +233,7 @@ public SCCOrganizationSystemsUpdateResponse createUpdateSystems( .map(system -> new SCCSystemCredentialsJson(system.getLogin(), system.getPassword(), 12345L) ) - .toList() + .collect(Collectors.toList()) ); } @@ -348,7 +349,7 @@ public SCCOrganizationSystemsUpdateResponse createUpdateSystems( .map(system -> new SCCSystemCredentialsJson(system.getLogin(), system.getPassword(), 12345L) ) - .toList() + .collect(Collectors.toList()) ); } diff --git a/java/code/src/com/suse/scc/test/registration/AbstractSCCSystemRegistrationTest.java b/java/code/src/com/suse/scc/test/registration/AbstractSCCSystemRegistrationTest.java index 5662d738f2b4..fe92d814874d 100644 --- a/java/code/src/com/suse/scc/test/registration/AbstractSCCSystemRegistrationTest.java +++ b/java/code/src/com/suse/scc/test/registration/AbstractSCCSystemRegistrationTest.java @@ -30,6 +30,7 @@ import java.nio.file.Path; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; public class AbstractSCCSystemRegistrationTest extends BaseTestCaseWithUser { @@ -62,7 +63,7 @@ protected void setupSystems(int systemSize, int paygSystemSize) throws Exception List allUnregistered = SCCCachingFactory.findSystemsToForwardRegistration(); this.testSystems = allUnregistered.stream() .filter(i -> i.getOptServer().get().getServerInfo().getCheckin().equals(new Date(0))) - .toList(); + .collect(Collectors.toList()); } diff --git a/java/code/src/com/suse/scc/test/registration/SCCSystemRegistrationCreateUpdateSystemsTest.java b/java/code/src/com/suse/scc/test/registration/SCCSystemRegistrationCreateUpdateSystemsTest.java index 1bede0331bed..f70bc164c180 100644 --- a/java/code/src/com/suse/scc/test/registration/SCCSystemRegistrationCreateUpdateSystemsTest.java +++ b/java/code/src/com/suse/scc/test/registration/SCCSystemRegistrationCreateUpdateSystemsTest.java @@ -30,6 +30,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.List; +import java.util.stream.Collectors; /** * Tests {@link com.suse.scc.registration.SCCSystemRegistration}. @@ -216,7 +217,7 @@ public SCCOrganizationSystemsUpdateResponse createUpdateSystems( .map(system -> new SCCSystemCredentialsJson(system.getLogin(), system.getPassword(), 12345L) ) - .toList() + .collect(Collectors.toList()) ); } }; diff --git a/java/code/src/com/suse/scc/test/registration/SCCSystemRegistrationUpdateCachedItemsTest.java b/java/code/src/com/suse/scc/test/registration/SCCSystemRegistrationUpdateCachedItemsTest.java index 5b6c124abdfb..9f4c70980257 100644 --- a/java/code/src/com/suse/scc/test/registration/SCCSystemRegistrationUpdateCachedItemsTest.java +++ b/java/code/src/com/suse/scc/test/registration/SCCSystemRegistrationUpdateCachedItemsTest.java @@ -34,6 +34,7 @@ import java.nio.file.Path; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * Tests {@link com.suse.scc.registration.SCCSystemRegistration}. @@ -58,7 +59,7 @@ private void setupSystems(int systemSize) throws Exception { List allUnregistered = SCCCachingFactory.findSystemsToForwardRegistration(); this.testSystems = allUnregistered.stream() .filter(i -> i.getOptServer().get().getServerInfo().getCheckin().equals(new Date(0))) - .toList(); + .collect(Collectors.toList()); } diff --git a/java/spacewalk-java.changes.cbbayburt.immutability-issues-fix b/java/spacewalk-java.changes.cbbayburt.immutability-issues-fix new file mode 100644 index 000000000000..76471e71c89c --- /dev/null +++ b/java/spacewalk-java.changes.cbbayburt.immutability-issues-fix @@ -0,0 +1 @@ +- Fix several pages returning 500 status