From 2a1778a6675b019a3fca67b25dd30e07fe2109e0 Mon Sep 17 00:00:00 2001 From: Manuel Salvi Date: Thu, 22 Aug 2024 14:49:15 +0200 Subject: [PATCH 1/9] cleanup truncata --- .../src/com/redhat/rhn/manager/errata/ErrataManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 3a4616e71a96..c6c636ae684c 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -309,6 +309,14 @@ public static void truncateErrata(Set srcErrata, Channel tgtChannel, Use .collect(Collectors.toUnmodifiableSet()); removeErratumAndPackagesFromChannel(filteredErrata, srcErrata, tgtChannel, user); + + List emptyChannelErrata = srcErrata.stream().filter(t -> t.getChannels().isEmpty()).map(e -> { + OwnedErrata oErrata = new OwnedErrata(); + oErrata.setId(e.getId()); + oErrata.setAdvisory(e.getAdvisory()); + return oErrata; + }).collect(Collectors.toList()); + ErrataManager.deleteErrata(user, emptyChannelErrata); } private static Optional asCloned(Errata e) { From 49286ee0940bb9d12cba5739b2f80664e57a8941 Mon Sep 17 00:00:00 2001 From: Manuel Salvi Date: Tue, 27 Aug 2024 14:02:22 +0200 Subject: [PATCH 2/9] errata cleanup and ownederrata constructor --- .../src/com/redhat/rhn/frontend/dto/OwnedErrata.java | 10 ++++++++++ .../com/redhat/rhn/manager/errata/ErrataManager.java | 7 +------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java b/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java index 0454636631fc..4a8247dd0596 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java @@ -25,6 +25,16 @@ public class OwnedErrata extends ErrataOverview { private String locallyModified; private Integer published; + public OwnedErrata(){ + super(); + } + + public OwnedErrata(Long id, String advisory) { + super(); + setId(id); + setAdvisory(advisory); + } + /** * @param locallyModifiedIn The locallyModified to set. */ 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 c6c636ae684c..4d9e1fc42f5c 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -310,12 +310,7 @@ public static void truncateErrata(Set srcErrata, Channel tgtChannel, Use removeErratumAndPackagesFromChannel(filteredErrata, srcErrata, tgtChannel, user); - List emptyChannelErrata = srcErrata.stream().filter(t -> t.getChannels().isEmpty()).map(e -> { - OwnedErrata oErrata = new OwnedErrata(); - oErrata.setId(e.getId()); - oErrata.setAdvisory(e.getAdvisory()); - return oErrata; - }).collect(Collectors.toList()); + List emptyChannelErrata = srcErrata.stream().filter(t -> t.getChannels().isEmpty()).map(e -> new OwnedErrata(e.getId(), e.getAdvisory())).collect(Collectors.toList()); ErrataManager.deleteErrata(user, emptyChannelErrata); } From 6f37a445f5471735530079216572d128fa4fcc78 Mon Sep 17 00:00:00 2001 From: Manuel Salvi Date: Tue, 27 Aug 2024 14:06:43 +0200 Subject: [PATCH 3/9] checkstyle --- .../src/com/redhat/rhn/manager/errata/ErrataManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 4d9e1fc42f5c..1b226097cf38 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -307,10 +307,11 @@ public static void truncateErrata(Set srcErrata, Channel tgtChannel, Use Set filteredErrata = tgtErrata.stream().filter(e -> !(srcErrata.contains(e) || asCloned(e) .map(er -> srcErrata.contains(er.getOriginal())).orElse(false))) .collect(Collectors.toUnmodifiableSet()); - removeErratumAndPackagesFromChannel(filteredErrata, srcErrata, tgtChannel, user); - - List emptyChannelErrata = srcErrata.stream().filter(t -> t.getChannels().isEmpty()).map(e -> new OwnedErrata(e.getId(), e.getAdvisory())).collect(Collectors.toList()); + List emptyChannelErrata = srcErrata.stream() + .filter(t -> t.getChannels().isEmpty()) + .map(e -> new OwnedErrata(e.getId(), e.getAdvisory())) + .collect(Collectors.toList()); ErrataManager.deleteErrata(user, emptyChannelErrata); } From 8cad695e23489ffe8eb8760242520dc640c12e0f Mon Sep 17 00:00:00 2001 From: Manuel Salvi Date: Tue, 27 Aug 2024 14:10:30 +0200 Subject: [PATCH 4/9] checklog --- .../spacewalk-java.changes.serpico.7427-cleanup-truncata-errata | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 java/spacewalk-java.changes.serpico.7427-cleanup-truncata-errata diff --git a/java/spacewalk-java.changes.serpico.7427-cleanup-truncata-errata b/java/spacewalk-java.changes.serpico.7427-cleanup-truncata-errata new file mode 100644 index 000000000000..9903835b152e --- /dev/null +++ b/java/spacewalk-java.changes.serpico.7427-cleanup-truncata-errata @@ -0,0 +1,2 @@ +- ErrataManager.truncateErrata now tries to clean orphan erratas + at the end (erratas with no channel) From 81ac6f2227bffd7c98d286c675629c03dc67e9bc Mon Sep 17 00:00:00 2001 From: Manuel Salvi Date: Tue, 27 Aug 2024 14:20:02 +0200 Subject: [PATCH 5/9] checkstyle fix --- .../src/com/redhat/rhn/frontend/dto/OwnedErrata.java | 9 +++++---- .../src/com/redhat/rhn/manager/errata/ErrataManager.java | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java b/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java index 4a8247dd0596..4cdcc10058ae 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java @@ -25,10 +25,11 @@ public class OwnedErrata extends ErrataOverview { private String locallyModified; private Integer published; - public OwnedErrata(){ - super(); - } - + /** + * Constructor for OwnedErrata + * @param id the id + * @param advisory the advisory string + */ public OwnedErrata(Long id, String advisory) { super(); setId(id); 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 1b226097cf38..7ff7877239bd 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -641,9 +641,7 @@ private static void deleteErrata(User user, List erratas) { */ public static void deleteErratum(User user, Errata errata) { List eids = new ArrayList<>(); - OwnedErrata oErrata = new OwnedErrata(); - oErrata.setId(errata.getId()); - oErrata.setAdvisory(errata.getAdvisory()); + OwnedErrata oErrata = new OwnedErrata(errata.getId(), errata.getAdvisory()); eids.add(oErrata); deleteErrata(user, eids); } From c6d846e09403d740ce2a7c5362d0df63cf038b90 Mon Sep 17 00:00:00 2001 From: Manuel Salvi Date: Tue, 27 Aug 2024 16:36:27 +0200 Subject: [PATCH 6/9] refactoring with method for creating ownederrata (cleaner) --- .../src/com/redhat/rhn/frontend/dto/OwnedErrata.java | 11 ----------- .../com/redhat/rhn/manager/errata/ErrataManager.java | 11 +++++++++-- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java b/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java index 4cdcc10058ae..0454636631fc 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java @@ -25,17 +25,6 @@ public class OwnedErrata extends ErrataOverview { private String locallyModified; private Integer published; - /** - * Constructor for OwnedErrata - * @param id the id - * @param advisory the advisory string - */ - public OwnedErrata(Long id, String advisory) { - super(); - setId(id); - setAdvisory(advisory); - } - /** * @param locallyModifiedIn The locallyModified to set. */ 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 7ff7877239bd..7d9c22c6bf42 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -310,7 +310,7 @@ public static void truncateErrata(Set srcErrata, Channel tgtChannel, Use removeErratumAndPackagesFromChannel(filteredErrata, srcErrata, tgtChannel, user); List emptyChannelErrata = srcErrata.stream() .filter(t -> t.getChannels().isEmpty()) - .map(e -> new OwnedErrata(e.getId(), e.getAdvisory())) + .map(ErrataManager::buildOwnedErrataFromErrata) .collect(Collectors.toList()); ErrataManager.deleteErrata(user, emptyChannelErrata); } @@ -641,11 +641,18 @@ private static void deleteErrata(User user, List erratas) { */ public static void deleteErratum(User user, Errata errata) { List eids = new ArrayList<>(); - OwnedErrata oErrata = new OwnedErrata(errata.getId(), errata.getAdvisory()); + OwnedErrata oErrata = buildOwnedErrataFromErrata(errata); eids.add(oErrata); deleteErrata(user, eids); } + private static OwnedErrata buildOwnedErrataFromErrata(Errata errata) { + OwnedErrata oErrata = new OwnedErrata(); + oErrata.setId(errata.getId()); + oErrata.setAdvisory(errata.getAdvisory()); + return oErrata; + } + /** * Get a list of channel ids, and labels that a list of errata belongs to. * @param set the set of errata ids to retrieve channels for From a23336605ced1f96c409d5fd886e58b8d1852af3 Mon Sep 17 00:00:00 2001 From: Manuel Salvi Date: Tue, 27 Aug 2024 16:44:24 +0200 Subject: [PATCH 7/9] checkstyle fix --- java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7d9c22c6bf42..eb3a514ffe0d 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -650,7 +650,7 @@ private static OwnedErrata buildOwnedErrataFromErrata(Errata errata) { OwnedErrata oErrata = new OwnedErrata(); oErrata.setId(errata.getId()); oErrata.setAdvisory(errata.getAdvisory()); - return oErrata; + return oErrata; } /** From 1a1b898b1d56008da9dedf1cf999444ff0df3c95 Mon Sep 17 00:00:00 2001 From: Manuel Salvi Date: Wed, 28 Aug 2024 13:16:43 +0200 Subject: [PATCH 8/9] fix for deleting the filteredErrata --- java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 eb3a514ffe0d..3ac11aee3be5 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -308,7 +308,7 @@ public static void truncateErrata(Set srcErrata, Channel tgtChannel, Use .map(er -> srcErrata.contains(er.getOriginal())).orElse(false))) .collect(Collectors.toUnmodifiableSet()); removeErratumAndPackagesFromChannel(filteredErrata, srcErrata, tgtChannel, user); - List emptyChannelErrata = srcErrata.stream() + List emptyChannelErrata = filteredErrata.stream() .filter(t -> t.getChannels().isEmpty()) .map(ErrataManager::buildOwnedErrataFromErrata) .collect(Collectors.toList()); From f4a0625d752b245c6d2d12892b5f6514e575d879 Mon Sep 17 00:00:00 2001 From: Manuel Salvi Date: Fri, 13 Sep 2024 15:35:25 +0200 Subject: [PATCH 9/9] owned errata constructor from errata --- .../redhat/rhn/frontend/dto/OwnedErrata.java | 19 +++++++++++++++++++ .../rhn/manager/errata/ErrataManager.java | 11 ++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java b/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java index 0454636631fc..c8d9f68cc12f 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/OwnedErrata.java @@ -14,6 +14,8 @@ */ package com.redhat.rhn.frontend.dto; +import com.redhat.rhn.domain.errata.Errata; + import java.util.Date; /** @@ -25,6 +27,23 @@ public class OwnedErrata extends ErrataOverview { private String locallyModified; private Integer published; + /** + * Empty default Constructor + */ + public OwnedErrata() { + super(); + } + + /** + * Constructor from errata + * @param errataIn the errata + */ + public OwnedErrata(Errata errataIn) { + super(); + setId(errataIn.getId()); + setAdvisory(errataIn.getAdvisory()); + } + /** * @param locallyModifiedIn The locallyModified to set. */ 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 3ac11aee3be5..9e74d248fb2e 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -310,7 +310,7 @@ public static void truncateErrata(Set srcErrata, Channel tgtChannel, Use removeErratumAndPackagesFromChannel(filteredErrata, srcErrata, tgtChannel, user); List emptyChannelErrata = filteredErrata.stream() .filter(t -> t.getChannels().isEmpty()) - .map(ErrataManager::buildOwnedErrataFromErrata) + .map(OwnedErrata::new) .collect(Collectors.toList()); ErrataManager.deleteErrata(user, emptyChannelErrata); } @@ -641,18 +641,11 @@ private static void deleteErrata(User user, List erratas) { */ public static void deleteErratum(User user, Errata errata) { List eids = new ArrayList<>(); - OwnedErrata oErrata = buildOwnedErrataFromErrata(errata); + OwnedErrata oErrata = new OwnedErrata(errata); eids.add(oErrata); deleteErrata(user, eids); } - private static OwnedErrata buildOwnedErrataFromErrata(Errata errata) { - OwnedErrata oErrata = new OwnedErrata(); - oErrata.setId(errata.getId()); - oErrata.setAdvisory(errata.getAdvisory()); - return oErrata; - } - /** * Get a list of channel ids, and labels that a list of errata belongs to. * @param set the set of errata ids to retrieve channels for