From a6fe4bec4c10e9c72d5553e542874eca9e69530a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yeray=20Guti=C3=A9rrez=20Cedr=C3=A9s?=
 <yeray.gutierrez@suse.com>
Date: Thu, 5 Oct 2023 10:33:05 +0100
Subject: [PATCH] Apply new changelog format

---
 java/buildconf/ivy/ivy-suse.xml                              | 5 +++++
 .../src/com/redhat/rhn/domain/kickstart/KickstartData.java   | 5 ++---
 ...ewalk-java.changes.ycedres.fix-xml-rpc-createSystemRecord | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 java/spacewalk-java.changes.ycedres.fix-xml-rpc-createSystemRecord

diff --git a/java/buildconf/ivy/ivy-suse.xml b/java/buildconf/ivy/ivy-suse.xml
index 431edaf58ef7..78ad69a90f2d 100644
--- a/java/buildconf/ivy/ivy-suse.xml
+++ b/java/buildconf/ivy/ivy-suse.xml
@@ -148,5 +148,10 @@
         <dependency org="strutstest" name="strutstest" rev="0.0.1" transitive="false">
             <artifact name="strutstestcase" type="jar" url="https://github.com/hustodemon/strutstestcase-uyuni/releases/download/v.0.0.1-alpha/strutstest-uyuni-0.0.1.jar"/>
         </dependency>
+	<dependency org="org.mockito" name="mockito-core" rev="5.3.1" transitive="false" />
+	<dependency org="org.mockito" name="mockito-inline" rev="5.2.0" transitive="false" />
+	<dependency org="net.bytebuddy" name="byte-buddy" rev="1.14.4" transitive="false" />
+	<dependency org="org.objenesis" name="objenesis" rev="3.3" transitive="false" />
+	<dependency org="net.bytebuddy" name="byte-buddy-agent" rev="1.14.4" transitive="false" />
     </dependencies>
 </ivy-module>
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 5a0aac9bc2a9..db3367c7862c 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -38,7 +38,6 @@
 import org.cobbler.CobblerConnection;
 import org.cobbler.Profile;
 
-import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -1459,8 +1458,8 @@ public String getDefaultVirtBridge() {
      *              taskomatic.
      * @return the Profile associated to this ks data
      */
-    @Nullable
-    public Profile getCobblerObject(@Nullable User user) {
+
+    public Profile getCobblerObject(User user) {
         if (StringUtils.isBlank(getCobblerId())) {
             return null;
         }
diff --git a/java/spacewalk-java.changes.ycedres.fix-xml-rpc-createSystemRecord b/java/spacewalk-java.changes.ycedres.fix-xml-rpc-createSystemRecord
new file mode 100644
index 000000000000..163fe8ea578a
--- /dev/null
+++ b/java/spacewalk-java.changes.ycedres.fix-xml-rpc-createSystemRecord
@@ -0,0 +1 @@
+- Fixes createSystemRecord XML-RPC API call so the Cobbler UID is persisted