diff --git a/java/code/src/com/suse/proxy/get/ProxyConfigGetFacadeImpl.java b/java/code/src/com/suse/proxy/get/ProxyConfigGetFacadeImpl.java
index 6a2c9a3b101..ffe4d628bd6 100644
--- a/java/code/src/com/suse/proxy/get/ProxyConfigGetFacadeImpl.java
+++ b/java/code/src/com/suse/proxy/get/ProxyConfigGetFacadeImpl.java
@@ -19,7 +19,6 @@
 import static com.suse.utils.Predicates.isAbsent;
 import static java.util.Arrays.asList;
 
-import com.redhat.rhn.common.conf.ConfigDefaults;
 import com.redhat.rhn.domain.server.Server;
 import com.redhat.rhn.domain.user.User;
 
@@ -79,7 +78,8 @@ public ProxyConfig getProxyConfig(Server server) {
      */
     @Override
     public Map<String, Object> getFormData(User user, Server server) {
-        ProxyConfigGetFormDataContext context = new ProxyConfigGetFormDataContext(user, server, this.getProxyConfig(server));
+        ProxyConfigGetFormDataContext context =
+                new ProxyConfigGetFormDataContext(user, server, this.getProxyConfig(server));
 
         for (ProxyConfigGetFormDataContextHandler handler : getFormDataContextHandlerChain) {
             handler.handle(context);
diff --git a/java/code/src/com/suse/proxy/get/formdata/ProxyConfigGetFormDataContext.java b/java/code/src/com/suse/proxy/get/formdata/ProxyConfigGetFormDataContext.java
index 4abca9aa859..9b5391496dd 100644
--- a/java/code/src/com/suse/proxy/get/formdata/ProxyConfigGetFormDataContext.java
+++ b/java/code/src/com/suse/proxy/get/formdata/ProxyConfigGetFormDataContext.java
@@ -90,4 +90,4 @@ public ProxyConfig getProxyConfig() {
     public String getInitFailMessage() {
         return initFailMessage;
     }
-}
\ No newline at end of file
+}
diff --git a/java/code/src/com/suse/proxy/test/ProxyConfigUpdateFacadeImplTest.java b/java/code/src/com/suse/proxy/test/ProxyConfigUpdateFacadeImplTest.java
index 19590822ae2..6c89a6e76cd 100644
--- a/java/code/src/com/suse/proxy/test/ProxyConfigUpdateFacadeImplTest.java
+++ b/java/code/src/com/suse/proxy/test/ProxyConfigUpdateFacadeImplTest.java
@@ -21,9 +21,9 @@
 import com.redhat.rhn.common.RhnGeneralException;
 import com.redhat.rhn.testing.MockObjectTestCase;
 
-import com.suse.proxy.update.ProxyConfigUpdateFacadeImpl;
 import com.suse.proxy.update.ProxyConfigUpdateContext;
 import com.suse.proxy.update.ProxyConfigUpdateContextHandler;
+import com.suse.proxy.update.ProxyConfigUpdateFacadeImpl;
 
 import org.jmock.junit5.JUnit5Mockery;
 import org.junit.Test;
@@ -127,8 +127,10 @@ public void handle(ProxyConfigUpdateContext context) {
      * @throws IllegalAccessException if the field cannot be accessed
      */
     @SuppressWarnings("squid:S3011")
-    private void replaceHandlers(ProxyConfigUpdateFacadeImpl proxyConfigUpdate, List<ProxyConfigUpdateContextHandler> handlers)
-            throws NoSuchFieldException, IllegalAccessException {
+    private void replaceHandlers(
+            ProxyConfigUpdateFacadeImpl proxyConfigUpdate,
+            List<ProxyConfigUpdateContextHandler> handlers
+    ) throws NoSuchFieldException, IllegalAccessException {
         Field field = ProxyConfigUpdateFacadeImpl.class.getDeclaredField("contextHandlerChain");
         field.setAccessible(true);
         field.set(proxyConfigUpdate, handlers);
diff --git a/java/code/src/com/suse/proxy/test/ProxyConfigUpdateRegistryPreConditionsTest.java b/java/code/src/com/suse/proxy/test/ProxyConfigUpdateRegistryPreConditionsTest.java
index bf691a7a27f..32b6c65ccaa 100644
--- a/java/code/src/com/suse/proxy/test/ProxyConfigUpdateRegistryPreConditionsTest.java
+++ b/java/code/src/com/suse/proxy/test/ProxyConfigUpdateRegistryPreConditionsTest.java
@@ -59,7 +59,8 @@ public class ProxyConfigUpdateRegistryPreConditionsTest extends MockObjectTestCa
      */
     @Test
     public void testSuccessWhenBlankRequest() {
-        ProxyConfigUpdateContext proxyConfigUpdateContext = new ProxyConfigUpdateContext(new ProxyConfigUpdateJson(), null, null, null);
+        ProxyConfigUpdateContext proxyConfigUpdateContext =
+                new ProxyConfigUpdateContext(new ProxyConfigUpdateJson(), null, null, null);
         new ProxyConfigUpdateRegistryPreConditions().handle(proxyConfigUpdateContext);
         assertFalse(proxyConfigUpdateContext.getErrorReport().hasErrors());
     }
diff --git a/schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql b/schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql
index d57d124aaf9..facd1264dc1 100644
--- a/schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql
+++ b/schema/spacewalk/common/data/rhnServerServerGroupArchCompat.sql
@@ -1094,11 +1094,11 @@ insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
 insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
 	values (lookup_server_arch('armv7l-debian-linux'),
             lookup_sg_type('proxy_entitled'));
-            
+
 insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
 	values (lookup_server_arch('cloud'),
-            lookup_sg_type('proxy_entitled
-            l_server'));
+            lookup_sg_type('proxy_entitled'));            
+
 insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
 	values (lookup_server_arch('arm64-debian-linux'),
             lookup_sg_type('proxy_entitled'));